diff --git a/ChangeLog b/ChangeLog
index 3821bd8541..03ebde60d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-20  Edward Hervey  <edward@fluendo.com>
+
+	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
+	(gst_ffmpeg_get_codecid_longname):
+	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
+	Seems like the ffmpeg folks finally understood that VC9 does not
+	exist, and that it's in fact VC1 (aka WMV9 or WMV3, but that's yet
+	another debate).
+
 2006-09-17  Stefan Kost  <ensonic@users.sf.net>
 
 	* ext/ffmpeg/gstffmpegdec.c:
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index e98a1d54cf..c56676019d 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -550,7 +550,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
       break;
 
     case CODEC_ID_WMV3:
-    case CODEC_ID_VC9:
+    case CODEC_ID_VC1:
       caps = gst_ff_vid_caps_new (context, "video/x-wmv",
           "wmvversion", G_TYPE_INT, 3, NULL);
       break;
@@ -2253,7 +2253,7 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
     case CODEC_ID_WMV3:
       name = "Windows Media Video v9";
       break;
-    case CODEC_ID_VC9:
+    case CODEC_ID_VC1:
       name = "Microsoft Video Codec v1";
       break;
     case CODEC_ID_H263P:
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 668ef5af77..3a83aaecbe 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -2135,7 +2135,7 @@ gst_ffmpegdec_register (GstPlugin * plugin)
         rank = GST_RANK_MARGINAL;
         break;
       case CODEC_ID_WMV3:
-      case CODEC_ID_VC9:
+      case CODEC_ID_VC1:
         /* what's that? */
       case CODEC_ID_SP5X:
         /* MP3 and MPEG2 have better alternatives and