diff --git a/ChangeLog b/ChangeLog
index 717a6389f5..2b8ff577c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-26  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):
+	Set flv demuxer to rank NONE, we have a better, working demuxer in -bad
+	and we don't want any bug reports about this one. Fixes #534783.
+
 2008-05-26  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_vid_caps_new),
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index a7d5003b0e..fa42c3a027 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1581,8 +1581,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
     /* Set the rank of demuxers know to work to MARGINAL.
      * Set demuxers for which we already have another implementation to NONE
      * Set All others to NONE*/
-    if (!strcmp (in_plugin->name, "flv") ||
-        !strcmp (in_plugin->name, "wsvqa") ||
+    if (!strcmp (in_plugin->name, "wsvqa") ||
         !strcmp (in_plugin->name, "wsaud") ||
         !strcmp (in_plugin->name, "wc3movie") ||
         !strcmp (in_plugin->name, "voc") ||