diff --git a/ChangeLog b/ChangeLog
index 2dcd4935ea..7c1f1c396a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-04  Wim Taymans  <wim@fluendo.com>
+
+	* ext/vorbis/vorbisenc.c: (gst_vorbisenc_chain):
+	Set caps on output buffer.
+
 2005-07-04  Andy Wingo  <wingo@pobox.com>
 
 	* ext/gnomevfs/gstgnomevfssrc.c
diff --git a/ext/vorbis/vorbisenc.c b/ext/vorbis/vorbisenc.c
index 846d7c1c73..c5778f478a 100644
--- a/ext/vorbis/vorbisenc.c
+++ b/ext/vorbis/vorbisenc.c
@@ -906,6 +906,10 @@ gst_vorbisenc_chain (GstPad * pad, GstBuffer * buffer)
       GST_DEBUG ("here are the caps: %" GST_PTR_FORMAT, caps);
       gst_pad_set_caps (vorbisenc->srcpad, caps);
 
+      gst_buffer_set_caps (buf1, caps);
+      gst_buffer_set_caps (buf2, caps);
+      gst_buffer_set_caps (buf3, caps);
+
       /* push out buffers */
       gst_vorbisenc_push_buffer (vorbisenc, buf1);
       gst_vorbisenc_push_buffer (vorbisenc, buf2);