diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b6f7e23aa36..db88090621c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-30  Mohan Embar  <gnustuff@thisiscool.com>
+
+	PR libgcj/11521:
+	* gnu/java/net/natPlainSocketImplWin32.cc
+	(bind): Don't use SO_REUSEADDR
+
 2003-10-30  Mohan Embar  <gnustuff@thisiscool.com>
 
 	PR libgcj/6652:
diff --git a/libjava/gnu/java/net/natPlainSocketImplWin32.cc b/libjava/gnu/java/net/natPlainSocketImplWin32.cc
index 411acfa023a..96373811936 100644
--- a/libjava/gnu/java/net/natPlainSocketImplWin32.cc
+++ b/libjava/gnu/java/net/natPlainSocketImplWin32.cc
@@ -67,7 +67,6 @@ gnu::java::net::PlainSocketImpl::bind (::java::net::InetAddress *host, jint lpor
   jbyteArray haddress = host->addr;
   jbyte *bytes = elements (haddress);
   int len = haddress->length;
-  int i = 1;
 
   if (len == 4)
     {
@@ -93,9 +92,6 @@ gnu::java::net::PlainSocketImpl::bind (::java::net::InetAddress *host, jint lpor
   else
     throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
 
-  // Enable SO_REUSEADDR, so that servers can reuse ports left in TIME_WAIT.
-  ::setsockopt(native_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &i, sizeof(i));
-
   if (::bind (native_fd, ptr, len) != SOCKET_ERROR)
     {
       address = host;