diff --git a/rpyc/utils/server.py b/rpyc/utils/server.py
index 56c95bfb..8bb6a938 100644
--- a/rpyc/utils/server.py
+++ b/rpyc/utils/server.py
@@ -464,7 +464,8 @@ def _authenticate_and_build_connection(self, sock):
             credentials = None
         # build a connection
         h, p = sock.getpeername()
-        config = dict(self.protocol_config, credentials=credentials, connid="%s:%d"%(h, p))
+        config = dict(self.protocol_config, credentials=credentials, connid="%s:%d"%(h, p),
+                      endpoints=(sock.getsockname(), (h, p)))
         return Connection(self.service, Channel(SocketStream(sock)), config=config)
 
     def _accept_method(self, sock):