diff --git a/ChangeLog b/ChangeLog
index c5ca3f766d..8c7c45bb3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-29  Wim Taymans  <wim@fluendo.com>
+
+	* gst/rtsp/gstrtspsrc.c: (gst_rtsp_proto_get_type):
+	Fix flag registration.
+
+	* gst/rtsp/rtspconnection.c: (rtsp_connection_read):
+	Reading 0 also means 'no more commands'
+
 2006-09-29  Wim Taymans  <wim@fluendo.com>
 
 	Patch by: Antoine Tremblay <hexa00 at gmail dot com>
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 506e563b6c..0631bbed8b 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -140,9 +140,9 @@ gst_rtsp_proto_get_type (void)
 {
   static GType rtsp_proto_type = 0;
   static const GFlagsValue rtsp_proto[] = {
-    {GST_RTSP_PROTO_UDP_UNICAST, "UDP Unicast", "UDP unicast mode"},
-    {GST_RTSP_PROTO_UDP_MULTICAST, "UDP Multicast", "UDP Multicast mode"},
-    {GST_RTSP_PROTO_TCP, "TCP", "TCP interleaved mode"},
+    {GST_RTSP_PROTO_UDP_UNICAST, "UDP Unicast Mode", "udp-unicast"},
+    {GST_RTSP_PROTO_UDP_MULTICAST, "UDP Multicast Mode", "udp-multicast"},
+    {GST_RTSP_PROTO_TCP, "TCP interleaved mode", "tcp"},
     {0, NULL, NULL},
   };
 
diff --git a/gst/rtsp/rtspconnection.c b/gst/rtsp/rtspconnection.c
index 019fdfeb40..e939a55d08 100644
--- a/gst/rtsp/rtspconnection.c
+++ b/gst/rtsp/rtspconnection.c
@@ -522,7 +522,7 @@ rtsp_connection_read (RTSPConnection * conn, gpointer data, guint size)
         int res;
 
         READ_COMMAND (conn, command, res);
-        if (res < 0) {
+        if (res <= 0) {
           /* no more commands */
           break;
         }