diff --git a/ChangeLog b/ChangeLog
index dfd5e8bf66..33dec66210 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-14  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	Patch by: Jonathan Matthew <notverysmart@gmail.com>
+	* gst/qtdemux/qtdemux.c: (qtdemux_video_caps):
+	Add mapping for 'tiff' => image/tiff
+	Fixes #552213
+
 2008-09-11  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index cb43553568..63ba038ed5 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -4750,6 +4750,10 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
       _codec ("Dirac");
       caps = gst_caps_from_string ("video/x-dirac");
       break;
+    case GST_MAKE_FOURCC ('t', 'i', 'f', 'f'):
+      _codec ("TIFF still images");
+      caps = gst_caps_from_string ("image/tiff");
+      break;
     case GST_MAKE_FOURCC ('k', 'p', 'c', 'd'):
     default:
     {