diff --git a/ChangeLog b/ChangeLog
index 80f45cde03..39b3f7f9eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-26  Wim Taymans  <wim@fluendo.com>
+
+	Patch by: Mark Nauwelaerts <manauw@skynet.be>
+
+	* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):
+	register yuv4mpegpipe demuxer with MARGINAL rank to
+	make it also typically available for auto-plugging. Fixes #399108.
+
 2007-01-22  Tim-Philipp Müller  <tim at centricular dot net>
 
 	Patch by: Martin Szulecki  <gnomebugzilla at sukimashita com>
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 03f26624af..2fc78fdc58 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1506,7 +1506,9 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
         !strcmp (in_plugin->name, "ea") ||
         !strcmp (in_plugin->name, "daud") ||
         !strcmp (in_plugin->name, "avs") ||
-        !strcmp (in_plugin->name, "aiff") || !strcmp (in_plugin->name, "4xm"))
+        !strcmp (in_plugin->name, "aiff") || 
+	!strcmp (in_plugin->name, "4xm") || 
+	!strcmp(in_plugin->name, "yuv4mpegpipe"))
       rank = GST_RANK_MARGINAL;
     else
       rank = GST_RANK_NONE;