diff --git a/ChangeLog b/ChangeLog
index 179cd709bf..49fa489a90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-18  Edward Hervey  <edward@fluendo.com>
+
+	* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_send_subbuffer): 
+	tss tss... always set caps on outgoing buffer.
+
 2006-01-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:
diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c
index ceeb38454a..042a4eb523 100644
--- a/gst/mpegstream/gstmpegdemux.c
+++ b/gst/mpegstream/gstmpegdemux.c
@@ -900,6 +900,7 @@ gst_mpeg_demux_send_subbuffer (GstMPEGDemux * mpeg_demux,
     GST_DEBUG_OBJECT (mpeg_demux, "Creating subbuffer size %d", size);
   }
   outbuf = gst_buffer_create_sub (buffer, offset, size);
+  gst_buffer_set_caps (outbuf, GST_PAD_CAPS (outstream->pad));
 
   GST_BUFFER_TIMESTAMP (outbuf) = timestamp;
   GST_BUFFER_OFFSET (outbuf) = GST_BUFFER_OFFSET (buffer) + offset;