diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1512949c8..2099cc3dd 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-07  Conrad Scott  <conrad.scott@dsl.pipex.com>
+
+	* fhandler_socket.cc (fhandler_socket::accept): Fix FIONBIO call.
+
 2002-08-06  Christopher Faylor  <cgf@redhat.com>
 
 	* cygheap.cc (_csbrk): Avoid !cygheap considerations.
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index 6e76a6523..01a9f738e 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -523,8 +523,9 @@ fhandler_socket::accept (struct sockaddr *peer, int *len)
 
           /* Unset events for listening socket and
              switch back to blocking mode */
-          WSAEventSelect (get_socket (), ev[0], 0 );
-          ioctlsocket (get_socket (), FIONBIO, 0);
+          WSAEventSelect (get_socket (), ev[0], 0);
+	  unsigned long nonblocking = 0;
+          ioctlsocket (get_socket (), FIONBIO, &nonblocking);
 
           switch (wait_result)
             {