diff --git a/lib/net.js b/lib/net.js
index 655a51f6fdc..6d0566418ad 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -335,6 +335,11 @@ Socket.prototype.connect = function () {
 };
 
 
+Socket.prototype.address = function () {
+  return getsockname(this.fd);
+};
+
+
 Socket.prototype.forceClose = function (exception) {
   if (this.fd) {
     this.readable = false;
@@ -471,8 +476,8 @@ Server.prototype.listen = function () {
 };
 
 
-Server.prototype.sockName = function () {
-  return getsockname(self.fd);
+Server.prototype.address = function () {
+  return getsockname(this.fd);
 };
 
 
diff --git a/test-net-server.js b/test-net-server.js
index 8b3ce9d14cd..721a7627208 100644
--- a/test-net-server.js
+++ b/test-net-server.js
@@ -28,7 +28,7 @@ var server = new net.Server(function (socket) {
     sys.puts("server-side socket drain");
   });
 });
-server.listen(8000, "localhost");
+server.listen(8000);
 sys.puts("server fd: " + server.fd);