diff --git a/ChangeLog b/ChangeLog
index 0c1ef4716c..3b5e292c70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-05  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	Patch by: Sjoerd Simons <sjoerd at luon dot net>
+
+	* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_init), (gst_rtspsrc_open):
+	Don't leak file descriptors on error. Fixes #531532.
+
 2008-05-03  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* ext/gconf/gstgconfaudiosrc.c: (gst_gconf_audio_src_reset),
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 069b6d3778..6c53138dcc 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -4064,6 +4064,10 @@ setup_failed:
   }
 cleanup_error:
   {
+    if (src->connection) {
+      gst_rtsp_connection_free (src->connection);
+      src->connection = NULL;
+    }
     GST_RTSP_STATE_UNLOCK (src);
     gst_rtsp_message_unset (&request);
     gst_rtsp_message_unset (&response);