diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 09ec6009c3f..23b50117c58 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -7507,6 +7507,15 @@ todo_wine
     ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError());
     ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned);
 
+    /* Try to call getsockname on the acceptor socket.
+     *
+     * On Windows, this requires setting SO_UPDATE_ACCEPT_CONTEXT. */
+    iret = setsockopt(acceptor, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char *)&listener, sizeof(SOCKET));
+    ok(!iret, "Failed to set accept context %d\n", GetLastError());
+    iret = getsockname(acceptor, (struct sockaddr *)&peerAddress, &remoteSize);
+    ok(!iret, "getsockname failed.\n");
+    ok(remoteSize == sizeof(struct sockaddr_in), "got remote size %u\n", remoteSize);
+
     closesocket(connector);
     connector = INVALID_SOCKET;
     closesocket(acceptor);
diff --git a/server/sock.c b/server/sock.c
index 650e67a2e0a..af756a45c42 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -1785,6 +1785,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock )
     }
 
     acceptsock->state = SOCK_CONNECTED;
+    acceptsock->bound = 1;
     acceptsock->pending_events = 0;
     acceptsock->reported_events = 0;
     acceptsock->proto   = sock->proto;