diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fe7d8bc91..56f45f419 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-21  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_socket.cc (fhandler_socket::wait): Reorder setting
+	WSAError to avoid spurious errors with WSAError set to 0.
+
 2006-04-21  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/asm/byteorder.h: Include stdint.h.  Per standard, change
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index 01e9870b6..462b70446 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -1057,12 +1057,12 @@ sa_restart:
 	  }
 	break;
       case WSA_WAIT_EVENT_0 + 1:
-	WSASetLastError (WSAEINTR);
 	if (_my_tls.call_signal_handler ())
 	  {
 	    sig_dispatch_pending ();
 	    goto sa_restart;
 	  }
+	WSASetLastError (WSAEINTR);
 	break;
       default:
 	WSASetLastError (WSAEFAULT);