diff --git a/lib/http.js b/lib/http.js
index d54abc9d5e..a3f7118b8e 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -1471,6 +1471,11 @@ ClientRequest.prototype.setSocketKeepAlive = function() {
   this._deferToConnect('setKeepAlive', arguments);
 };
 
+ClientRequest.prototype.clearTimeout = function() {
+  var args = Array.prototype.slice.call(arguments, 0);
+  args.unshift(0);
+  this._deferToConnect('setTimeout', args);
+};
 
 exports.request = function(options, cb) {
   if (options.protocol && options.protocol !== 'http:') {
diff --git a/lib/net.js b/lib/net.js
index df29bd2908..6c2e86e832 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -173,6 +173,9 @@ Socket.prototype.setTimeout = function(msecs, callback) {
     }
   } else if (msecs === 0) {
     timers.unenroll(this);
+    if (callback) {
+      this.removeListener('timeout', callback);
+    }
   }
 };
 
diff --git a/test/simple/test-http-timeout.js b/test/simple/test-http-timeout.js
new file mode 100644
index 0000000000..5170d795aa
--- /dev/null
+++ b/test/simple/test-http-timeout.js
@@ -0,0 +1,63 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+var common = require('../common');
+var assert = require('assert');
+
+var http = require('http');
+
+var port = 12345;
+var server = http.createServer(function(req, res) {
+      res.writeHead(200, {'Content-Type': 'text/plain'});
+      res.end('OK');
+});
+
+var agent = new http.Agent({maxSockets: 1});
+
+server.listen(port, function() {
+
+  for (var i = 0; i < 11; ++i) {
+    createRequest().end();
+  }
+
+  function callback(){}
+
+  var count = 0;
+
+  function createRequest() {
+    var req = http.request({port: port, path: '/', agent: agent}, function(res) {
+
+      req.clearTimeout(callback);
+
+      res.on('end', function() {
+        count++;
+
+        if (count == 11) {
+          server.close();
+        }
+      })
+    });
+
+    req.setTimeout(1000, callback);
+    return req;
+  }
+});