diff --git a/ChangeLog b/ChangeLog
index 2b3ad54984..4eed52dc2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-13  Michael Smith  <msmith@fluendo.com>
+
+	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_submit_page):
+	  Improve a debug line slightly.
+
+	* ext/ogg/gstogmparse.c: (gst_ogm_parse_plugin_init):
+	  Call gst_riff_init() in plugin_init, to avoid getting errors from
+	  the debug system (unrelated changes to another plugin made this turn
+	  up; not sure why).
+
 2006-11-10  Tim-Philipp Müller  <tim at centricular dot net>
 
 	Patch by: Sergey Scobich  <sergery.scobich at gmail com>
diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 082b7d6b22..861d961543 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -1229,7 +1229,9 @@ choked:
   }
 could_not_submit:
   {
-    GST_WARNING_OBJECT (ogg, "could not submit packet, error: %d", result);
+    GST_WARNING_OBJECT (ogg,
+        "could not submit packet for stream %08x, error: %d", pad->serialno,
+        result);
     gst_ogg_pad_reset (pad);
     return result;
   }
diff --git a/ext/ogg/gstogmparse.c b/ext/ogg/gstogmparse.c
index a86ba1c0aa..fa5043c270 100644
--- a/ext/ogg/gstogmparse.c
+++ b/ext/ogg/gstogmparse.c
@@ -27,6 +27,7 @@
 #include <gst/gst.h>
 #include <gst/tag/tag.h>
 #include <gst/riff/riff-media.h>
+#include <gst/riff/riff-read.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_ogm_parse_debug);
 #define GST_CAT_DEFAULT gst_ogm_parse_debug
@@ -939,6 +940,8 @@ gst_ogm_parse_change_state (GstElement * element, GstStateChange transition)
 gboolean
 gst_ogm_parse_plugin_init (GstPlugin * plugin)
 {
+  gst_riff_init ();
+
   GST_DEBUG_CATEGORY_INIT (gst_ogm_parse_debug, "ogmparse", 0, "ogm parser");
 
   return gst_element_register (plugin, "ogmaudioparse", GST_RANK_PRIMARY,