diff --git a/winsup/cygserver/transport.cc b/winsup/cygserver/transport.cc
index 2d81590db..01f044406 100644
--- a/winsup/cygserver/transport.cc
+++ b/winsup/cygserver/transport.cc
@@ -37,7 +37,7 @@ class transport_layer_base *create_server_transport()
   if (wincap.is_winnt ())
     temp = new transport_layer_pipes ();
   else
-    temp = new transport_layer_base ();
+    temp = new transport_layer_sockets ();
   return temp;
 }
 
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ff77d5042..613799b23 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-10  Robert Collins  <rbtcollins@hotmail.com>
+
+	* cygserver_transport.cc (create_server_transport): Finish the split
+	out of sockets code from transport_layer_base. Thanks to Nicholas
+	Wourms and Conrad Scott for catching this.
+
 2002-06-08  Christopher Faylor  <cgf@redhat.com>
 
 	* pinfo.cc (pinfo_dummy): Initialize to correct size.
diff --git a/winsup/cygwin/cygserver_transport.cc b/winsup/cygwin/cygserver_transport.cc
index 2d81590db..01f044406 100755
--- a/winsup/cygwin/cygserver_transport.cc
+++ b/winsup/cygwin/cygserver_transport.cc
@@ -37,7 +37,7 @@ class transport_layer_base *create_server_transport()
   if (wincap.is_winnt ())
     temp = new transport_layer_pipes ();
   else
-    temp = new transport_layer_base ();
+    temp = new transport_layer_sockets ();
   return temp;
 }