diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a3508d38c..1ba6827e6 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-20  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+	* select.cc (serial_cleanup): Make sure that device_specific_pipe is
+	always deleted regardless of whether it has a unique thread associated
+	with it
+	(socket_cleanup): Ditto.
+	(mailslot_cleanup): Ditto.
+
 2011-04-20  Corinna Vinschen  <corinna@vinschen.de>
 
 	* devices.h: Renumber internal devices so that FH_PROCESS is part of
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index e63567700..eb1728f51 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -1150,13 +1150,15 @@ static void
 serial_cleanup (select_record *, select_stuff *stuff)
 {
   select_serial_info *si = (select_serial_info *) stuff->device_specific_serial;
-  if (si && si->thread)
+  if (!si)
+    return;
+  if (si->thread)
     {
       si->stop_thread = true;
       si->thread->detach ();
-      delete si;
-      stuff->device_specific_serial = NULL;
     }
+  delete si;
+  stuff->device_specific_serial = NULL;
 }
 
 select_record *
@@ -1465,15 +1467,17 @@ socket_cleanup (select_record *, select_stuff *stuff)
 {
   select_socket_info *si = (select_socket_info *) stuff->device_specific_socket;
   select_printf ("si %p si->thread %p", si, si ? si->thread : NULL);
-  if (si && si->thread)
+  if (!si)
+    return;
+  if (si->thread)
     {
       SetEvent (si->w4[0]);
       /* Wait for thread to go away */
       si->thread->detach ();
       ResetEvent (si->w4[0]);
-      stuff->device_specific_socket = NULL;
-      delete si;
     }
+  delete si;
+  stuff->device_specific_socket = NULL;
   select_printf ("returning");
 }
 
@@ -1703,13 +1707,15 @@ static void
 mailslot_cleanup (select_record *, select_stuff *stuff)
 {
   select_mailslot_info *mi = (select_mailslot_info *) stuff->device_specific_mailslot;
-  if (mi && mi->thread)
+  if (!mi)
+    return;
+  if (mi->thread)
     {
       mi->stop_thread = true;
       mi->thread->detach ();
-      delete mi;
-      stuff->device_specific_mailslot = NULL;
     }
+  delete mi;
+  stuff->device_specific_mailslot = NULL;
 }
 
 select_record *