diff --git a/docs/changes.txt b/docs/changes.txt
index e71268c6a4..4cdf1bf0eb 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -574,6 +574,10 @@ Major new features in this release
 3.0.1: (released 2014-xx-xx)
 ----------------------------
 
+All:
+
+- Fix wxSocket::WaitForAccept() in non-main thread (Hajo Kirchhoff).
+
 All (GUI):
 
 - Fix crash when setting invalid label ending with "&" (ZaneUJi).
diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index a793e3520d..bcb331fcc3 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1357,7 +1357,25 @@ wxSocketEventFlags wxSocketImpl::Select(wxSocketEventFlags flags,
 
     wxSocketEventFlags detected = 0;
     if ( preadfds && wxFD_ISSET(m_fd, preadfds) )
-        detected |= wxSOCKET_INPUT_FLAG;
+    {
+        // check for the case of a server socket waiting for connection
+        if ( m_server && (flags & wxSOCKET_CONNECTION_FLAG) )
+        {
+            int error;
+            SOCKOPTLEN_T len = sizeof(error);
+            m_establishing = false;
+            getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
+
+            if ( error )
+                detected = wxSOCKET_LOST_FLAG;
+            else
+                detected |= wxSOCKET_CONNECTION_FLAG;
+        }
+        else // not called to get non-blocking accept() status
+        {
+            detected |= wxSOCKET_INPUT_FLAG;
+        }
+    }
 
     if ( pwritefds && wxFD_ISSET(m_fd, pwritefds) )
     {