diff --git a/ChangeLog b/ChangeLog
index 978a44b587..d0294cdd1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-20  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* gst/matroska/ebml-write.c: (gst_ebml_write_element_push):
+	  Ensure that we set correct caps on buffers that are transferred
+	  direct from the input.
+
 2006-03-20  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* gst/goom/filters.c: (zoomFilterDestroy):
diff --git a/gst/matroska/ebml-write.c b/gst/matroska/ebml-write.c
index a834f8fc11..e6817e46fd 100644
--- a/gst/matroska/ebml-write.c
+++ b/gst/matroska/ebml-write.c
@@ -367,6 +367,8 @@ gst_ebml_write_element_push (GstEbmlWrite * ebml, GstBuffer * buf)
       if (gst_pad_push_event (ebml->srcpad, ev))
         ebml->need_newsegment = FALSE;
     }
+    buf = gst_buffer_make_metadata_writable (buf);
+    gst_buffer_set_caps (buf, GST_PAD_CAPS (ebml->srcpad));
     ebml->last_write_result = gst_pad_push (ebml->srcpad, buf);
   }
 }