diff --git a/ChangeLog b/ChangeLog
index 5475220d28..3dbbf7a41d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-28  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/asfdemux/gstasf.c: (plugin_init):
+	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_base_init):
+	* gst/asfdemux/gstasfdemux.h:
+	  Init debug category before using it.
+
 2007-04-27  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_pull_data),
diff --git a/gst/asfdemux/gstasf.c b/gst/asfdemux/gstasf.c
index 3eedbd8d0d..9bb3c66d9b 100644
--- a/gst/asfdemux/gstasf.c
+++ b/gst/asfdemux/gstasf.c
@@ -31,6 +31,8 @@
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
+  GST_DEBUG_CATEGORY_INIT (asfdemux_dbg, "asfdemux", 0, "asf demuxer element");
+
 #ifdef ENABLE_NLS
   GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
       LOCALEDIR);
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 7740f1e115..258469d027 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -77,7 +77,7 @@ GST_STATIC_PAD_TEMPLATE ("video_%02d",
   (flow == ASF_FLOW_NEED_MORE_DATA) ?  \
   "need-more-data" : gst_flow_get_name (flow)
 
-GST_DEBUG_CATEGORY (asf_debug);
+GST_DEBUG_CATEGORY (asfdemux_dbg);
 
 static GstStateChangeReturn gst_asf_demux_change_state (GstElement * element,
     GstStateChange transition);
@@ -128,8 +128,6 @@ gst_asf_demux_base_init (gpointer g_class)
       gst_static_pad_template_get (&gst_asf_demux_sink_template));
 
   gst_element_class_set_details (element_class, &gst_asf_demux_details);
-
-  GST_DEBUG_CATEGORY_INIT (asf_debug, "asfdemux", 0, "asf demuxer element");
 }
 
 static void
diff --git a/gst/asfdemux/gstasfdemux.h b/gst/asfdemux/gstasfdemux.h
index d98c712388..458f8c2b41 100644
--- a/gst/asfdemux/gstasfdemux.h
+++ b/gst/asfdemux/gstasfdemux.h
@@ -37,8 +37,8 @@ G_BEGIN_DECLS
 #define GST_IS_ASF_DEMUX_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ASF_DEMUX))
 
-GST_DEBUG_CATEGORY_EXTERN (asf_debug);
-#define GST_CAT_DEFAULT asf_debug
+GST_DEBUG_CATEGORY_EXTERN (asfdemux_dbg);
+#define GST_CAT_DEFAULT asfdemux_dbg
 
 typedef struct _GstASFDemux GstASFDemux;
 typedef struct _GstASFDemuxClass GstASFDemuxClass;