diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index df0abd02..8a65a9fa 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -183,9 +183,8 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.35.2",
-      "from": "https://github.com/CartoDB/Windshaft/tarball/master",
-      "resolved": "https://github.com/CartoDB/Windshaft/tarball/master",
+      "version": "0.36.0",
+      "from": "windshaft@~0.36.0",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
@@ -1636,9 +1635,9 @@
               "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz",
               "dependencies": {
                 "formidable": {
-                  "version": "1.0.16",
+                  "version": "1.0.17",
                   "from": "formidable@1.0.x",
-                  "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.16.tgz"
+                  "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"
                 }
               }
             },
diff --git a/package.json b/package.json
index 362ea17c..3c6fa48a 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
         "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/master",
+        "windshaft": "~0.36.0",
         "step": "~0.0.5",
         "queue-async": "~1.0.7",
         "request": "~2.9.203",