diff --git a/ChangeLog b/ChangeLog
index 83f6c0b791..c1f1f37ded 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-07  Edward Hervey  <edward@fluendo.com>
+
+	* gst/qtdemux/qtdemux.c:
+	* gst/qtdemux/qtdemux.h:
+	Share qtdemux debug category across all files, otherwise all debugging
+	in files other than qtdemux.c would end up in the default category.
+
 2007-03-07  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/spectrum/gstspectrum.c: (gst_spectrum_start),
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index ba731580d1..3b527facef 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -64,9 +64,7 @@
 # include <zlib.h>
 #endif
 
-GST_DEBUG_CATEGORY_STATIC (qtdemux_debug);
-#define GST_CAT_DEFAULT qtdemux_debug
-
+GST_DEBUG_CATEGORY (qtdemux_debug);
 
 #if 0
 #define qtdemux_dump_mem(a,b)  gst_util_dump_mem(a,b)
diff --git a/gst/qtdemux/qtdemux.h b/gst/qtdemux/qtdemux.h
index 4f6afcdd32..984f26dcb9 100644
--- a/gst/qtdemux/qtdemux.h
+++ b/gst/qtdemux/qtdemux.h
@@ -26,6 +26,9 @@
 
 G_BEGIN_DECLS
 
+GST_DEBUG_CATEGORY_EXTERN (qtdemux_debug);
+#define GST_CAT_DEFAULT qtdemux_debug
+
 #define GST_TYPE_QTDEMUX \
   (gst_qtdemux_get_type())
 #define GST_QTDEMUX(obj) \