diff --git a/ChangeLog b/ChangeLog
index 4de56c2381..f3f1ce8634 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-23  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/matroska/matroska-demux.c:
+	(gst_matroska_demux_parse_blockgroup):
+	  Save position, so that queries give proper return values. Don't
+	  know how this could ever have worked before...
+
 2004-12-23  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 23d099d9bc..ed243e7a62 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -1979,6 +1979,7 @@ gst_matroska_demux_parse_blockgroup (GstMatroskaDemux * demux,
           GST_BUFFER_TIMESTAMP (sub) = cluster_time;
         else
           GST_BUFFER_TIMESTAMP (sub) = cluster_time + time;
+        demux->pos = GST_BUFFER_TIMESTAMP (sub);
       }
 
       /* do all laces have the same lenght? */