diff --git a/client.js b/client.js
index ef4b3d8..1deb59f 100644
--- a/client.js
+++ b/client.js
@@ -13,6 +13,7 @@ module.exports = function (addr, opts) {
 
   const stream = duplex(socket, opts)
   stream.remoteAddress = url
+  stream.socket = socket
   stream.close = () => new Promise((resolve, reject) => {
     socket.addEventListener('close', resolve)
     socket.close()
diff --git a/server.js b/server.js
index 17ac6d3..52a44be 100644
--- a/server.js
+++ b/server.js
@@ -41,6 +41,9 @@ module.exports = !WebSocket.Server ? null : function (opts, onConnection) {
   wsServer.on('connection', function (socket, req) {
     var stream = ws(socket)
     stream.remoteAddress = req.socket.remoteAddress
+    stream.remotePort = req.socket.remotePort
+    stream.close = () => emitter.close()
+
     emitter.emit('connection', stream, req)
   })