diff --git a/docs/changes.txt b/docs/changes.txt
index dfa0ecf2aa..88695fde25 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -186,6 +186,7 @@ All:
 - Spanish translations updated (Javier San Jose)
 - fixed DLL build of db.cpp with some OpenWatcom (ABX)
 - fixed wxZlibOutputStream to properly close zlib stream
+- removed SO_REUSEADDR from wxSocket
 
 All (GUI):
 
diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index fa9fb9875d..a248f1def2 100644
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -669,11 +669,6 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
   ioctl(sck->m_fd, FIONBIO, &arg);
   _GSocket_Enable_Events(sck);
 
-  /* allow a socket to re-bind if the socket is in the TIME_WAIT
-     state after being previously closed.
-   */
-  setsockopt(sck->m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
-
   /* Bind to the local address,
    * and retrieve the actual address bound.
    */