diff --git a/ChangeLog b/ChangeLog
index 59a95f367a..87580b0c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-26  Stephane Loeuillet  <stephane.loeuillet@tiscali.fr>
+
+	* ext/ogg/gstogg.c:
+	* ext/ogg/gstogmparse.c:
+	  fix ogm[audio/video]parse plugin registration
+	  (riff won't load if bytestream is already loaded)
+
 2004-12-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/audioconvert/gstchannelmix.c:
diff --git a/ext/ogg/gstogg.c b/ext/ogg/gstogg.c
index d581c0df68..b4ddf00f45 100644
--- a/ext/ogg/gstogg.c
+++ b/ext/ogg/gstogg.c
@@ -32,7 +32,7 @@ GST_DEBUG_CATEGORY (vorbisdec_debug);
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_library_load ("gstbytestream"))
+  if (!gst_library_load ("riff"))
     return FALSE;
 
   gst_ogg_demux_plugin_init (plugin);
diff --git a/ext/ogg/gstogmparse.c b/ext/ogg/gstogmparse.c
index 8badf66d3c..44dddc8ea3 100644
--- a/ext/ogg/gstogmparse.c
+++ b/ext/ogg/gstogmparse.c
@@ -547,9 +547,8 @@ gst_ogm_parse_plugin_init (GstPlugin * plugin)
 {
   GST_DEBUG_CATEGORY_INIT (gst_ogm_parse_debug, "ogmparse", 0, "ogm parser");
 
-  return gst_library_load ("riff") &&
-      gst_element_register (plugin, "ogmaudioparse", GST_RANK_PRIMARY,
-      GST_TYPE_OGM_AUDIO_PARSE) &&
-      gst_element_register (plugin, "ogmvideoparse", GST_RANK_PRIMARY,
+  return gst_element_register (plugin, "ogmaudioparse", GST_RANK_PRIMARY,
+      GST_TYPE_OGM_AUDIO_PARSE)
+      && gst_element_register (plugin, "ogmvideoparse", GST_RANK_PRIMARY,
       GST_TYPE_OGM_VIDEO_PARSE);
 }