diff --git a/ChangeLog b/ChangeLog
index b4d45b873c..00fcfee4be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-18  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/matroska/matroska-demux.c: (gst_matroska_ebmlnum_sint):
+	  That was very stupid.
+
 2004-12-18  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/matroska/matroska-demux.c:
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index e4353c4aeb..23d099d9bc 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -1732,12 +1732,10 @@ gst_matroska_ebmlnum_sint (guint8 * data, guint size, gint64 * num)
     return -1;
 
   /* make signed */
-  if (unum == G_MAXUINT64 && res > 1)
+  if (unum == G_MAXUINT64)
     *num = G_MAXINT64;
-  else if (unum != 0)
-    *num = unum - ((1 << ((7 * res) - 1)) - 1);
   else
-    *num = 0;
+    *num = unum - ((1 << ((7 * res) - 1)) - 1);
 
   return res;
 }