diff --git a/ChangeLog b/ChangeLog
index 96edad2a0c..296fc02f76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2005-08-19  Wim Taymans  <wim@fluendo.com>
+
+	* ext/amrnb/amrnbdec.c:
+	* ext/amrnb/amrnbenc.c: (gst_amrnbenc_setcaps):
+	* ext/amrnb/amrnbparse.c:
+	Update caps with audio/AMR.
+	
+	* gst/rtp/gstrtpamrdec.c: (gst_rtpamrdec_init),
+	(gst_rtpamrdec_sink_setcaps), (gst_rtpamrdec_chain),
+	(gst_rtpamrdec_change_state):
+	* gst/rtp/gstrtpamrdec.h:
+	* gst/rtp/gstrtpamrenc.c: (gst_rtpamrenc_class_init),
+	(gst_rtpamrenc_init), (gst_rtpamrenc_chain):
+	Dont set FT headers twice, it was already in the encoded
+	bitstream.
+	
+	* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_send), (gst_rtspsrc_open),
+	(gst_rtspsrc_close), (gst_rtspsrc_play):
+	* gst/rtsp/rtspconnection.c: (parse_line):
+	Cleanups
+	
+	* gst/udp/gstudpsrc.c: (gst_udpsrc_class_init),
+	(gst_udpsrc_create), (gst_udpsrc_set_property),
+	(gst_udpsrc_get_property):
+	* gst/udp/gstudpsrc.h:
+	Added caps property, we need this soon to type the buffers.
+
 2005-08-18  Wim Taymans  <wim@fluendo.com>
 
 	* gst/rtp/gstrtpamrdec.c: (gst_rtpamrdec_init),
diff --git a/ext/amrnb/amrnbdec.c b/ext/amrnb/amrnbdec.c
index 9e8b9a37ee..7bf02849b9 100644
--- a/ext/amrnb/amrnbdec.c
+++ b/ext/amrnb/amrnbdec.c
@@ -26,8 +26,7 @@
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-amr-nb, "
-        "rate = (int) 8000, " "channels = (int) 1")
+    GST_STATIC_CAPS ("audio/AMR, " "rate = (int) 8000, " "channels = (int) 1")
     );
 
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
diff --git a/ext/amrnb/amrnbenc.c b/ext/amrnb/amrnbenc.c
index 6266fe70a3..40632557f1 100644
--- a/ext/amrnb/amrnbenc.c
+++ b/ext/amrnb/amrnbenc.c
@@ -37,8 +37,7 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-amr-nb, "
-        "rate = (int) 8000, " "channels = (int) 1")
+    GST_STATIC_CAPS ("audio/AMR, " "rate = (int) 8000, " "channels = (int) 1")
     );
 
 static void gst_amrnbenc_base_init (GstAmrnbEncClass * klass);
@@ -174,7 +173,7 @@ gst_amrnbenc_setcaps (GstPad * pad, GstCaps * caps)
   }
 
   /* create reverse caps */
-  copy = gst_caps_new_simple ("audio/x-amr-nb",
+  copy = gst_caps_new_simple ("audio/AMR",
       "channels", G_TYPE_INT, amrnbenc->channels,
       "rate", G_TYPE_INT, amrnbenc->rate, NULL);
 
diff --git a/ext/amrnb/amrnbparse.c b/ext/amrnb/amrnbparse.c
index 0c0254a064..41cdfca0d9 100644
--- a/ext/amrnb/amrnbparse.c
+++ b/ext/amrnb/amrnbparse.c
@@ -31,8 +31,7 @@ GST_DEBUG_CATEGORY_STATIC (amrnbparse_debug);
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-amr-nb, "
-        "rate = (int) 8000, " "channels = (int) 1")
+    GST_STATIC_CAPS ("audio/AMR, " "rate = (int) 8000, " "channels = (int) 1")
     );
 
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",