diff --git a/build/build-local.sh b/build/build-local.sh
index 4f85a5f2..20779115 100755
--- a/build/build-local.sh
+++ b/build/build-local.sh
@@ -19,6 +19,7 @@ case "$uname" in
     FreeBSD\ *) os=freebsd ;;
     CYGWIN*) os=windows ;;
     MINGW*) os=windows ;;
+    MSYS_NT*) os=windows ;;
 esac
 case "$uname" in
     *x86_64*) arch=x64 ;;
diff --git a/build/build-standalone.sh b/build/build-standalone.sh
index bda190f1..59a058d2 100755
--- a/build/build-standalone.sh
+++ b/build/build-standalone.sh
@@ -19,6 +19,7 @@ case "$uname" in
     FreeBSD\ *) os=freebsd ;;
     CYGWIN*) os=windows ;;
     MINGW*) os=windows ;;
+    MSYS_NT*) os=windows ;;
 esac
 case "$uname" in
     *x86_64*) arch=x64 ;;
diff --git a/local/server.js b/local/server.js
index 707e8137..d0ab15d1 100644
--- a/local/server.js
+++ b/local/server.js
@@ -9,7 +9,7 @@ if (process.platform == "win32") {
     if (!process.env.HOME)
         process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH;
     // add cloud9 cygwin to path
-    var msysBin = join(process.execPath, "/../../msys/bin");
+    var msysBin = join(process.env.HOME, ".c9", "msys/bin");
     process.env.Path = msysBin + ";" + process.env.path;
     process.env.C9_BASH_BIN = msysBin + "/bash.exe";
     process.env.CYGWIN = "nodosfilewarning " + (process.env.CYGWIN || "");
diff --git a/scripts/install-sdk.sh b/scripts/install-sdk.sh
index 2a7fda84..dddc8d03 100755
--- a/scripts/install-sdk.sh
+++ b/scripts/install-sdk.sh
@@ -13,6 +13,7 @@ case "$uname" in
     FreeBSD\ *) os=freebsd ;;
     CYGWIN*) os=windows ;;
     MINGW*) os=windows ;;
+    MSYS_NT*) os=windows ;;
 esac
 case "$uname" in
     *x86_64*) arch=x64 ;;
diff --git a/scripts/setup-local-dev.sh b/scripts/setup-local-dev.sh
index 64eec9d7..8a8ed448 100755
--- a/scripts/setup-local-dev.sh
+++ b/scripts/setup-local-dev.sh
@@ -19,6 +19,7 @@ case "$uname" in
     FreeBSD\ *) os=freebsd ;;
     CYGWIN*) os=windows ;;
     MINGW*) os=windows ;;
+    MSYS_NT*) os=windows ;;
 esac
 case "$uname" in
     *x86_64*) arch=x64 ;;
@@ -69,24 +70,30 @@ if [ "$os" == "darwin" ]; then
 fi
 
 if [ "$os" == "windows" ]; then
-    NODE_VERSION=v0.10.25
-    NW_VERSION=v0.9.2
+    NODE_VERSION=v0.12.2
+    NW_VERSION=v0.12.1
     
     pushd build
-    if [ ! -f node.exe ]; then
+    if [ ! -f "$HOME/.c9/"node.exe ]; then
         echo "downloading node"
+        pushd "$HOME/.c9/"
         curl -OL http://nodejs.org/dist/$NODE_VERSION/node.exe
+        popd
     fi
-    if [ ! -f node-webkit-$NW_VERSION-win-ia32.zip ]; then
+    
+    NW_FILE_NAME=nwjs-$NW_VERSION-win-ia32
+    if [ ! -f $NW_FILE_NAME.zip ]; then
         echo "downloading node-webkit"
-        curl -OL http://dl.node-webkit.org/$NW_VERSION/node-webkit-$NW_VERSION-win-ia32.zip
+        curl -OL http://dl.nwjs.io/$NW_VERSION/$NW_FILE_NAME.zip
     fi
     
     dest=win32-dev/bin
     mkdir -p $dest
     
-    unzip node-webkit-$NW_VERSION-win-ia32.zip -d $dest
-    cp node.exe $dest
+    unzip -uo $NW_FILE_NAME.zip -d win32-dev
+    rm -rf $dest
+    mv win32-dev/$NW_FILE_NAME $dest
+    # cp node.exe $dest
     mv $dest/nw.exe $dest/Cloud9.exe
     
     cp win32/icon.png $dest