diff --git a/lib/server.js b/lib/server.js
index <HASH>..<HASH> 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -185,6 +185,7 @@ function Server(options) {
     this.routes = {};
     this.secure = false;
     this.versions = options.versions || options.version || [];
+    this.socketio = options.socketio || false;
 
     var fmt = mergeFormatters(options.formatters);
     this.acceptable = fmt.acceptable;
@@ -248,6 +249,8 @@ function Server(options) {
 
     this.server.on('request', function onRequest(req, res) {
         self.emit('request', req, res);
+        if ( options.socketio && /^\/socket\.io.*/.test(req.url))
+             return;
 
         self._setupRequest(req, res);
         self._handle(req, res);
Re-added socket.io client download support with configurable option. Defaults to false. See <URL>