diff --git a/lib/node-http-proxy/http-proxy.js b/lib/node-http-proxy/http-proxy.js
index 7724ddb1a..1c7842cb6 100644
--- a/lib/node-http-proxy/http-proxy.js
+++ b/lib/node-http-proxy/http-proxy.js
@@ -213,6 +213,15 @@ HttpProxy.prototype.proxyRequest = function (req, res, buffer) {
       delete response.headers['transfer-encoding'];
     }
 
+    if ((response.statusCode === 301) || (response.statusCode === 302)) {
+      if (self.source.https && !self.target.https) {
+        response.headers.location = response.headers.location.replace(/^http\:/, 'https:');
+      }
+      if (self.target.https && !self.source.https) {
+        response.headers.location = response.headers.location.replace(/^https\:/, 'http:');
+      }
+    }
+
     // Set the headers of the client response
     res.writeHead(response.statusCode, response.headers);
 
diff --git a/lib/node-http-proxy/routing-proxy.js b/lib/node-http-proxy/routing-proxy.js
index 77b4a8d24..4e4fc32a5 100644
--- a/lib/node-http-proxy/routing-proxy.js
+++ b/lib/node-http-proxy/routing-proxy.js
@@ -180,8 +180,8 @@ RoutingProxy.prototype.proxyRequest = function (req, res, options) {
     options.host = location.host;
   }
   
-  var key = options.host + ':' + options.port,
-      proxy;
+  var key = this._getKey(options),
+    proxy;
   
   if (!this.proxies[key]) {
     this.add(options);
@@ -218,8 +218,8 @@ RoutingProxy.prototype.proxyWebSocketRequest = function (req, socket, head, opti
     options.host = location.host;
   }
   
-  var key = options.host + ':' + options.port,
-      proxy;
+  var key = this._getKey(options),
+    proxy;
 
   if (!this.proxies[key]) {
     this.add(options);