diff --git a/ChangeLog b/ChangeLog
index 91fa4017f7..30244c2e69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-27  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	Patch by: 이문형 <iwings at gmail dot com>
+
+	* gst-libs/gst/rtsp/gstrtspconnection.c:
+	(gst_rtsp_connection_connect):
+	A successful gst_poll_wait() doesn't always mean successful connect() on
+	Windows.  We should check errors by calling gst_poll_fd_has_error().
+	See #561924.
+
 2008-11-25  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst-libs/gst/rtp/gstrtcpbuffer.c:
diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c
index 855dac688f..58013d2668 100644
--- a/gst-libs/gst/rtsp/gstrtspconnection.c
+++ b/gst-libs/gst/rtsp/gstrtspconnection.c
@@ -287,6 +287,10 @@ gst_rtsp_connection_connect (GstRTSPConnection * conn, GTimeVal * timeout)
   else if (retval == -1)
     goto sys_error;
 
+  /* we can still have an error connecting on windows */
+  if (gst_poll_fd_has_error (conn->fdset, &conn->fd))
+    goto sys_error;
+
   gst_poll_fd_ignored (conn->fdset, &conn->fd);
 
 done: