diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c2d95236b..77e0497c8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-04  Corinna Vinschen  <corinna@vinschen.de>
+
+	* net.cc (fdsock): Raise default SO_RCVBUF/SO_SNDBUF buffer sizes to
+	the same values as on Linux.
+
 2006-04-03  Christopher Faylor  <cgf@timesys.com>
 
 	* child_info.h (CURR_CHILD_INFO_MAGIC): Update.
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index 91d18fd65..baf0c0c95 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -557,6 +557,15 @@ fdsock (cygheap_fdmanip& fd, const device *dev, SOCKET soc)
   fd->uninterruptible_io (true);
   cygheap->fdtab.inc_need_fixup_before ();
   debug_printf ("fd %d, name '%s', soc %p", (int) fd, dev->name, soc);
+
+  /* Same default buffer sizes as on Linux (instead of WinSock default 8K). */
+  int rmem = dev == tcp_dev ? 87380 : 120832;
+  int wmem = dev == tcp_dev ? 16384 : 120832;
+  if (::setsockopt (soc, SOL_SOCKET, SO_RCVBUF, (char *) &rmem, sizeof (int)))
+    debug_printf ("setsockopt(SO_RCVBUF) failed, %lu", WSAGetLastError ());
+  if (::setsockopt (soc, SOL_SOCKET, SO_SNDBUF, (char *) &wmem, sizeof (int)))
+    debug_printf ("setsockopt(SO_SNDBUF) failed, %lu", WSAGetLastError ());
+
   return true;
 }