diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 601ac2585..387eca3b6 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 19 20:46:33 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* select.cc (socket_cleanup): Shutdown I/O on dummy sockets prior to
+	closing them.
+
 Mon Jun 19 19:35:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
 	* dcrt0.cc: Add load statements for `GetSidIdentifierAuthority'
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index 08fba1256..d3c607a7e 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -1273,10 +1273,12 @@ socket_cleanup (select_record *, select_stuff *stuff)
 	  select_printf ("connect failed");
 	  /* FIXME: now what? */
 	}
+      shutdown (s, 2);
       closesocket (s);
 
       /* Wait for thread to go away */
       WaitForSingleObject (si->thread, INFINITE);
+      shutdown (si->exitsock, 2);
       closesocket (si->exitsock);
       CloseHandle (si->thread);
       stuff->device_specific[FHDEVN(FH_SOCKET)] = NULL;