diff --git a/ChangeLog b/ChangeLog
index 46d95344c9..705bb07731 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-15  Wim Taymans  <wim.taymans@gmail.com>
+
+	Patch by: Tommi Myöhänen  <ext-tommi dot myohanen at nokia dot com>
+
+	* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_setup_streams):
+	Fix some more leaks. Fixes #497007.
+
 2007-11-15  Wim Taymans  <wim.taymans@gmail.com>
 
 	Patch by: Tommi Myöhänen  <ext-tommi dot myohanen at nokia dot com>
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index aa13ad1242..04df8abbc6 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -3690,6 +3690,9 @@ gst_rtspsrc_setup_streams (GstRTSPSrc * src)
     next:
       /* clean up our transport struct */
       gst_rtsp_transport_init (&transport);
+      /* clean up used RTSP messages */
+      gst_rtsp_message_unset (&request);
+      gst_rtsp_message_unset (&response);
     }
   }