diff --git a/node_modules/c9/ssh.js b/node_modules/c9/ssh.js
index 46692835..af30da0c 100644
--- a/node_modules/c9/ssh.js
+++ b/node_modules/c9/ssh.js
@@ -22,8 +22,10 @@ function addProxyCommand(args, proxy) {
         return;
     var proxyHost = m[1];
     var proxyPort = parseInt(m[2], 10) || 22;
+    var proxyCmd = "ProxyCommand=ssh -W %h:%p " + args.map(quote).join(" ");
+    proxyCmd += " -p " + proxyPort + " " + quote(proxyHost);
     args.push(
-        "-o", "ProxyCommand=ssh -W %h:%p -p " + proxyPort + " " + quote(proxyHost)
+        "-o", proxyCmd
     );
 }