diff --git a/ChangeLog b/ChangeLog
index 16e6526641..42a6333b4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-21  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/matroska/matroska-demux.c: (gst_matroska_demux_sync_streams):
+	  Filler events are gone for now, comment out section generating
+	  them.
+
 2005-11-21  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* ext/aalib/gstaasink.c: (gst_aasink_fixate):
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index b5e1f39a11..8200ab2712 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -1931,6 +1931,8 @@ gst_matroska_ebmlnum_sint (guint8 * data, guint size, gint64 * num)
 static void
 gst_matroska_demux_sync_streams (GstMatroskaDemux * demux)
 {
+  /* FIXME: add filler events or buffers back */
+#if 0
   gint stream_nr;
   GstMatroskaTrackContext *context;
 
@@ -1971,6 +1973,7 @@ gst_matroska_demux_sync_streams (GstMatroskaDemux * demux)
       gst_pad_push_event (context->pad, event);
     }
   }
+#endif
 }
 
 static gboolean