diff --git a/ChangeLog b/ChangeLog
index 806cd6a45a..18707718e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-13  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	Patch by: Yotam <sh dot yotam at gmail dot com>
+
+	* gst/rtp/gstrtpmp4vpay.c: (gst_rtp_mp4v_pay_event):
+	Flush the remaining frames on EOS. Fixes #560641.
+
 2008-11-12  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* gst/rtp/gstrtpg729pay.c: (gst_rtp_g729_pay_handle_buffer):
diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c
index 61f4a57566..e4add1e79f 100644
--- a/gst/rtp/gstrtpmp4vpay.c
+++ b/gst/rtp/gstrtpmp4vpay.c
@@ -1,5 +1,5 @@
 /* GStreamer
- * Copyright (C) <2005> Wim Taymans <wim@fluendo.com>
+ * Copyright (C) <2005> Wim Taymans <wim.taymans@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -35,7 +35,7 @@ static const GstElementDetails gst_rtp_mp4vpay_details =
 GST_ELEMENT_DETAILS ("RTP MPEG-4 Video packet payloader",
     "Codec/Payloader/Network",
     "Payload MPEG-4 video as RTP packets (RFC 3016)",
-    "Wim Taymans <wim@fluendo.com>");
+    "Wim Taymans <wim.taymans@gmail.com>");
 
 static GstStaticPadTemplate gst_rtp_mp4v_pay_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
@@ -495,6 +495,9 @@ gst_rtp_mp4v_pay_event (GstPad * pad, GstEvent * event)
 
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_NEWSEGMENT:
+    case GST_EVENT_EOS:
+      /* This flush call makes sure that the last buffer is always pushed
+       * to the base payloader */
       gst_rtp_mp4v_pay_flush (rtpmp4vpay);
       break;
     case GST_EVENT_FLUSH_STOP: