diff --git a/ChangeLog b/ChangeLog
index 5150abd463..b7692e2b72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-22  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst/videorate/gstvideorate.c:
+	Add jpeg and png image media types to the caps. Fixes #561436.
+
 2008-11-22  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/playback/gstplaysink.c: (gen_audio_chain):
diff --git a/gst/videorate/gstvideorate.c b/gst/videorate/gstvideorate.c
index f38d8d0d76..8d221860e0 100644
--- a/gst/videorate/gstvideorate.c
+++ b/gst/videorate/gstvideorate.c
@@ -109,14 +109,14 @@ static GstStaticPadTemplate gst_video_rate_src_template =
     GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb")
+    GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb; image/jpeg; image/png")
     );
 
 static GstStaticPadTemplate gst_video_rate_sink_template =
     GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb")
+    GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb; image/jpeg; image/png")
     );
 
 static void gst_video_rate_swap_prev (GstVideoRate * videorate,