diff --git a/ChangeLog b/ChangeLog
index 0311124429..0d10905efc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-24  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst-libs/gst/rtsp/gstrtspconnection.c:
+	(gst_rtsp_connection_connect), (gst_rtsp_connection_write),
+	(gst_rtsp_connection_read_internal), (gst_rtsp_connection_poll):
+	Don't error when poll_wait returns EAGAIN.
+
 2008-03-24  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/playback/gstqueue2.c: (gst_queue_is_filled):
diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c
index 1530371ac1..cd70c8f5fd 100644
--- a/gst-libs/gst/rtsp/gstrtspconnection.c
+++ b/gst-libs/gst/rtsp/gstrtspconnection.c
@@ -275,7 +275,7 @@ gst_rtsp_connection_connect (GstRTSPConnection * conn, GTimeVal * timeout)
 
   do {
     retval = gst_poll_wait (conn->fdset, to);
-  } while (retval == -1 && errno == EINTR);
+  } while (retval == -1 && (errno == EINTR || errno == EAGAIN));
 
   if (retval == 0)
     goto timeout;
@@ -408,7 +408,7 @@ gst_rtsp_connection_write (GstRTSPConnection * conn, const guint8 * data,
 
     do {
       retval = gst_poll_wait (conn->fdset, to);
-    } while (retval == -1 && errno == EINTR);
+    } while (retval == -1 && (errno == EINTR || errno == EAGAIN));
 
     if (retval == 0)
       goto timeout;
@@ -819,7 +819,7 @@ gst_rtsp_connection_read_internal (GstRTSPConnection * conn, guint8 * data,
 
     do {
       retval = gst_poll_wait (conn->fdset, to);
-    } while (retval == -1 && errno == EINTR);
+    } while (retval == -1 && (errno == EINTR || errno == EAGAIN));
 
     if (retval == -1) {
       if (errno == EBUSY)
@@ -1191,7 +1191,7 @@ gst_rtsp_connection_poll (GstRTSPConnection * conn, GstRTSPEvent events,
 
   do {
     retval = gst_poll_wait (conn->fdset, to);
-  } while (retval == -1 && errno == EINTR);
+  } while (retval == -1 && (errno == EINTR || errno == EAGAIN));
 
   if (retval == 0)
     goto select_timeout;