diff --git a/ChangeLog b/ChangeLog
index bb579066c2..1636b175cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 22 23:17:28 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect): workaround for the setup of
+	  Cygwin socket.
+
 Fri Jun 22 23:11:17 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
 	
 	* lib/irb/locale.rb: fix for require "kconv" problem
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index f104d4eb4e..586fb9230b 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -743,6 +743,14 @@ ruby_connect(fd, sockaddr, len, socks)
 	      case EAGAIN:
 #ifdef EINPROGRESS
 	      case EINPROGRESS:
+#if defined __CYGWIN__
+		{
+		    struct timeval tv;
+		    tv.tv_sec = 0;
+		    tv.tv_usec = 100000;
+		    rb_thread_wait_for(&tv);
+		}
+#endif
 #endif
 		thread_write_select(fd);
 		continue;