diff --git a/ChangeLog b/ChangeLog
index fc53a78431..dda3d04e26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-15  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps),
+	(gst_riff_create_video_template_caps):
+	Add mappping for the KMVC (Karl Morton's Video) Codec.
+
 2008-10-15  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* gst/typefind/gsttypefindfunctions.c: (flac_type_find):
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 97d0cc7a34..0dd29e6b60 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -632,6 +632,12 @@ gst_riff_create_video_caps (guint32 codec_fcc,
         *codec_name = g_strdup ("FFmpeg lossless video codec");
       break;
 
+    case GST_MAKE_FOURCC ('K', 'M', 'V', 'C'):
+      caps = gst_caps_new_simple ("video/x-kmvc", NULL);
+      if (codec_name)
+        *codec_name = g_strdup ("Karl Morton's video codec");
+      break;
+
     default:
       GST_WARNING ("Unknown video fourcc %" GST_FOURCC_FORMAT,
           GST_FOURCC_ARGS (codec_fcc));
@@ -1524,8 +1530,9 @@ gst_riff_create_video_template_caps (void)
     GST_MAKE_FOURCC ('m', 's', 'v', 'c'),
     GST_MAKE_FOURCC ('x', '2', '6', '3'),
     GST_MAKE_FOURCC ('d', 'r', 'a', 'c'),
-    GST_MAKE_FOURCC ('F', 'F', 'V', '1')
-        /* FILL ME */
+    GST_MAKE_FOURCC ('F', 'F', 'V', '1'),
+    GST_MAKE_FOURCC ('K', 'M', 'V', 'C'),
+    /* FILL ME */
   };
   guint i;
   GstCaps *caps, *one;