diff --git a/lib/socket.io.js b/lib/socket.io.js
index 342de20bd9..95b332ef77 100644
--- a/lib/socket.io.js
+++ b/lib/socket.io.js
@@ -1,4 +1,3 @@
-
 /*!
  * socket.io-node
  * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
@@ -64,7 +63,10 @@ exports.listen = function (server, options, fn) {
       res.end('Welcome to socket.io.');
     });
 
-    server.listen(port, fn);
+    if(options && options.hostname)
+      server.listen(port, options.hostname, fn);
+    else
+      server.listen(port, fn);
   }
 
   // otherwise assume a http/s server