diff --git a/ChangeLog b/ChangeLog
index 84ffb081ae..1859ae36d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-08  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/matroska/matroska-demux.c:
+	(gst_matroska_demux_handle_src_query):
+	  Don't set DEFAULT, unsupported - makes length display incorrectly
+	  in some cases.
+
 2004-12-07  Christian Fredrik Kalager Schaller  <set EMAIL_ADDRESS environment variable>
 
 	Woooho Monoscope is now effectivly LGPL licensed
diff --git a/common b/common
index ded6dc5186..8404d8841f 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ded6dc5186cb7f8c64cb06a8591b9f787122c6f1
+Subproject commit 8404d8841f5fd58fe31de09090867115e97c5261
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 5bfcecf5eb..f46a3b1b3f 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -944,9 +944,6 @@ gst_matroska_demux_handle_src_query (GstPad * pad,
   switch (type) {
     case GST_QUERY_TOTAL:
       switch (*format) {
-        case GST_FORMAT_DEFAULT:
-          *format = GST_FORMAT_TIME;
-          /* fall through */
         case GST_FORMAT_TIME:
           *value = demux->duration;
           break;
@@ -958,9 +955,6 @@ gst_matroska_demux_handle_src_query (GstPad * pad,
 
     case GST_QUERY_POSITION:
       switch (*format) {
-        case GST_FORMAT_DEFAULT:
-          *format = GST_FORMAT_TIME;
-          /* fall through */
         case GST_FORMAT_TIME:
           *value = demux->pos;
           break;