diff --git a/ChangeLog b/ChangeLog
index 4c6d7094d5..4dccd1f82f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-08  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	Patch by: Sjoerd Simons <sjoerd at luon dot net>
+
+	* gst/rtpmanager/gstrtpsession.c:
+	(gst_rtp_session_event_send_rtp_sink):
+	Send RTP BYE command on EOS. Fixes bug #531955.
+
 2008-05-07  Ole André Vadla Ravnås  <ole.andre.ravnas at tandberg com>
 
 	* win32/common/config.h.in:
diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c
index 19b11569ba..49a54fec8a 100644
--- a/gst/rtpmanager/gstrtpsession.c
+++ b/gst/rtpmanager/gstrtpsession.c
@@ -1582,6 +1582,7 @@ gst_rtp_session_event_send_rtp_sink (GstPad * pad, GstEvent * event)
     }
     case GST_EVENT_EOS:
       ret = gst_pad_push_event (rtpsession->send_rtp_src, event);
+      rtp_session_send_bye (rtpsession->priv->session, "End of stream");
       break;
     default:
       ret = gst_pad_push_event (rtpsession->send_rtp_src, event);