diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index dc5c9ee1e..0d72da3cb 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-05  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler.h (fhandler_socket::wait): Reset default timeout to 10ms.
+
 2006-07-05  Corinna Vinschen  <corinna@vinschen.de>
 
 	* path.cc (path_conv::check): Ignore has_ea setting, it's always unset
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 54f00bc3b..313a655dd 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -425,7 +425,7 @@ class fhandler_socket: public fhandler_base
   } status;
 
   bool prepare (HANDLE &event, long event_mask);
-  int wait (HANDLE event, int flags, DWORD timeout = INFINITE);
+  int wait (HANDLE event, int flags, DWORD timeout = 10);
   void release (HANDLE event);
 
  public: