diff --git a/ChangeLog b/ChangeLog
index b8350f3dc0..c5ca3f766d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-29  Wim Taymans  <wim@fluendo.com>
+
+	Patch by: Antoine Tremblay <hexa00 at gmail dot com>
+
+	* gst/udp/gstudpsrc.c: (gst_udpsrc_create):
+	Fix possible infinite loop when shutting down, a read can also return
+	0 to indicate no more messages are available. Fixes #358156.
+
 2006-09-25  Wim Taymans  <wim@fluendo.com>
 
 	* gst/autodetect/gstautoaudiosink.c:
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index 85ad7c680e..f7be0fd07a 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -328,7 +328,7 @@ gst_udpsrc_create (GstPushSrc * psrc, GstBuffer ** buf)
           int res;
 
           READ_COMMAND (udpsrc, command, res);
-          if (res < 0) {
+          if (res <= 0) {
             GST_LOG_OBJECT (udpsrc, "no more commands");
             /* no more commands */
             break;