diff --git a/ChangeLog b/ChangeLog
index 975c819949..0f8c48c782 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-21  Wim Taymans  <wim@fluendo.com>
+
+	* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_parse_rtpmap),
+	(gst_rtspsrc_media_to_caps), (gst_rtspsrc_stream_setup_rtp),
+	(gst_rtspsrc_send):
+	Strip spaces for key/value pairs.
+
 2005-09-21  Wim Taymans  <wim@fluendo.com>
 
 	* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_parse_rtpmap),
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index b36813b7b5..da6e79bf27 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -449,14 +449,16 @@ gst_rtspsrc_media_to_caps (SDPMedia * media)
 
         keyval = g_strsplit (pairs[i], "=", 0);
         if (keyval[0]) {
-          gchar *val;
+          gchar *val, *key;
 
           if (keyval[1])
-            val = keyval[1];
+            val = g_strstrip (keyval[1]);
           else
             val = "1";
 
-          gst_structure_set (s, keyval[0], G_TYPE_STRING, val, NULL);
+          key = g_strstrip (keyval[0]);
+
+          gst_structure_set (s, key, G_TYPE_STRING, val, NULL);
         }
         g_strfreev (keyval);
       }