diff --git a/ChangeLog b/ChangeLog
index 9338dd4985..bf01807aa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-14  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+	* gst/mpegtsparse/gstmpegdesc.c:
+	* gst/mpegtsparse/gstmpegdesc.h:
+	* gst/mpegtsparse/mpegtsparse.c:
+	Make sure the gstmpegdesc debug lines do not critical
+	when GST_DEBUG is enabled and also actually output.
+	Thanks to Alessandro Decina for spotting.
+	Fixes #516448
+
 2008-02-13  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* gst-libs/gst/Makefile.am:
diff --git a/gst/mpegtsparse/gstmpegdesc.c b/gst/mpegtsparse/gstmpegdesc.c
index 9a4e119582..727b3e8af5 100644
--- a/gst/mpegtsparse/gstmpegdesc.c
+++ b/gst/mpegtsparse/gstmpegdesc.c
@@ -35,8 +35,8 @@
 
 #include "gstmpegdesc.h"
 
-GST_DEBUG_CATEGORY (gstflumpegdesc_debug);
-#define GST_CAT_DEFAULT (gstflumpegdesc_debug)
+GST_DEBUG_CATEGORY (gstmpegtsdesc_debug);
+#define GST_CAT_DEFAULT (gstmpegtsdesc_debug)
 
 void
 gst_mpeg_descriptor_free (GstMPEGDescriptor * desc)
@@ -196,3 +196,10 @@ gst_mpeg_descriptor_nth (GstMPEGDescriptor * desc, guint i)
   }
   return NULL;
 }
+
+void
+gst_mpegtsdesc_init_debug ()
+{
+  GST_DEBUG_CATEGORY_INIT (gstmpegtsdesc_debug, "mpegtsdesc", 0,
+      "MPEG transport stream parser (descriptor)");
+}
diff --git a/gst/mpegtsparse/gstmpegdesc.h b/gst/mpegtsparse/gstmpegdesc.h
index b75f6eb7b1..1003c80160 100644
--- a/gst/mpegtsparse/gstmpegdesc.h
+++ b/gst/mpegtsparse/gstmpegdesc.h
@@ -292,6 +292,7 @@ typedef struct {
   guint8  *data;
 } GstMPEGDescriptor;
 
+void gst_mpegtsdesc_init_debug ();
 GstMPEGDescriptor* 	gst_mpeg_descriptor_parse 	(guint8 *data, guint size);
 void		 	gst_mpeg_descriptor_free 	(GstMPEGDescriptor *desc);
 
diff --git a/gst/mpegtsparse/mpegtsparse.c b/gst/mpegtsparse/mpegtsparse.c
index 6b79d9f6db..e625e7bab3 100644
--- a/gst/mpegtsparse/mpegtsparse.c
+++ b/gst/mpegtsparse/mpegtsparse.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 
 #include "mpegtsparse.h"
+#include "gstmpegdesc.h"
 
 /* latency in mseconds */
 #define TS_LATENCY 700
@@ -1202,6 +1203,7 @@ plugin_init (GstPlugin * plugin)
       "MPEG transport stream parser");
 
   mpegts_packetizer_init_debug ();
+  gst_mpegtsdesc_init_debug ();
 
   return gst_element_register (plugin, "mpegtsparse",
       GST_RANK_NONE, GST_TYPE_MPEGTS_PARSE);