diff --git a/ChangeLog b/ChangeLog
index 64effff232..cd7be7ad6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-22  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/asfdemux/gstasf.c: (plugin_init):
+	  Call gst_riff_init() so the riff debug category gets set up
+	  before it is being used.
+
 2006-05-19  Michael Smith  <msmith@fluendo.com>
 
 	* gst/iec958/ac3_padder.c: (ac3p_parse):
diff --git a/gst/asfdemux/gstasf.c b/gst/asfdemux/gstasf.c
index 9b59a0eca6..fda5181237 100644
--- a/gst/asfdemux/gstasf.c
+++ b/gst/asfdemux/gstasf.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <gst/gst.h>
+#include <gst/riff/riff-media.h>
 
 #include "gstasfdemux.h"
 /* #include "gstasfmux.h" */
@@ -29,11 +30,16 @@
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_element_register (plugin, "asfdemux", GST_RANK_SECONDARY, GST_TYPE_ASF_DEMUX))       /*
-                                                                                                   || !gst_element_register (plugin, "asfmux", GST_RANK_NONE,
-                                                                                                   GST_TYPE_ASFMUX))
-                                                                                                 */
+  gst_riff_init ();
+
+  if (!gst_element_register (plugin, "asfdemux", GST_RANK_SECONDARY,
+          GST_TYPE_ASF_DEMUX)) {
     return FALSE;
+  }
+/*
+  if (!gst_element_register (plugin, "asfmux", GST_RANK_NONE, GST_TYPE_ASFMUX))
+    return FALSE;
+*/
 
   return TRUE;
 }