diff --git a/ChangeLog b/ChangeLog
index 4d15934bec..4058720f9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-23  Wim Taymans  <wim@fluendo.com>
+
+	* ext/ogg/README:
+	* ext/ogg/gstoggmux.c: (gst_ogg_mux_set_header_on_caps):
+	Buffer on caps is not boxed anymore.
+
 2005-06-22  Wim Taymans  <wim@fluendo.com>
 
 	* ext/theora/theoraenc.c: (theora_set_header_on_caps):
diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am
index b3f0e46c64..a47bdbc271 100644
--- a/ext/ogg/Makefile.am
+++ b/ext/ogg/Makefile.am
@@ -8,8 +8,9 @@ libgstogg_la_SOURCES = \
 	gstoggmux.c \
 	gstogmparse.c
 
-libgstogg_la_CFLAGS = $(GST_CFLAGS) $(OGG_CFLAGS)
+libgstogg_la_CFLAGS = $(GST_CFLAGS) $(OGG_CFLAGS) $(GST_PLUGINS_LIBS_CFLAGS)
 libgstogg_la_LIBADD = $(OGG_LIBS) \
-	$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la $(GST_BASE_LIBS)
-libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+	$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la $(GST_BASE_LIBS)  \
+	$(top_builddir)/gst-libs/gst/oggmapper/libgstoggmapper-@GST_MAJORMINOR@.la
+libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_PLUGINS_LIBS_LIBS) 
 
diff --git a/ext/ogg/README b/ext/ogg/README
index 7c76b3aaac..4a6ccf37d2 100644
--- a/ext/ogg/README
+++ b/ext/ogg/README
@@ -200,7 +200,8 @@ For Vorbis:
      - 1 page with 1 packet header identification
      - N pages with 2 packets comments and codebooks
   - granulepos is samplenumber of next page
-  - one packet can contain a variable number of samples
+  - one packet can contain a variable number of samples but one frame
+    that should be handed to the vorbis decoder.
   
 For Theora
      
@@ -211,7 +212,6 @@ For Theora
     is a combination of keyframe number and p frames since keyframe.
   - one packet contains 1 frame
   
-  
 
 
 
diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c
index e31e3b86cf..58791a2b6c 100644
--- a/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@ -684,7 +684,7 @@ gst_ogg_mux_set_header_on_caps (GstCaps * caps, GList * buffers)
     GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_IN_CAPS);
 
     g_value_init (&value, GST_TYPE_BUFFER);
-    g_value_set_boxed (&value, buf);
+    gst_value_set_buffer (&value, buf);
     gst_value_list_append_value (&list, &value);
     g_value_unset (&value);
   }