diff --git a/index.js b/index.js
index 0949162..cfdc45c 100644
--- a/index.js
+++ b/index.js
@@ -132,7 +132,7 @@ function writeShim_ (from, to, prog, args, variables, cb) {
   // basedir=`dirname "$0"`
   //
   // case `uname` in
-  //     *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+  //     *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
   // esac
   //
   // if [ -x "$basedir/node.exe" ]; then
@@ -150,7 +150,7 @@ function writeShim_ (from, to, prog, args, variables, cb) {
       + "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")\n"
       + "\n"
       + "case `uname` in\n"
-      + "    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;\n"
+      + "    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w \"$basedir\"`;;\n"
       + "esac\n"
       + "\n"
 
diff --git a/package.json b/package.json
index 94a1c49..7766f5b 100644
--- a/package.json
+++ b/package.json
@@ -18,4 +18,4 @@
     "rimraf": "~2.2.8",
     "tap": "^1.2.0"
   }
-}
\ No newline at end of file
+}
diff --git a/test/basic.js b/test/basic.js
index 8b8cdf0..001c2d0 100755
--- a/test/basic.js
+++ b/test/basic.js
@@ -17,7 +17,7 @@ test('no shebang', function (t) {
             "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")"+
             "\n"+
             "\ncase `uname` in"+
-            "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;"+
+            "\n    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w \"$basedir\"`;;"+
             "\nesac"+
             "\n"+
             "\n\"$basedir/from.exe\"   \"$@\"\nexit $?\n")
@@ -39,7 +39,7 @@ test('env shebang', function (t) {
             "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")" +
             "\n" +
             "\ncase `uname` in" +
-            "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;" +
+            "\n    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w \"$basedir\"`;;" +
             "\nesac" +
             "\n" +
             "\nif [ -x \"$basedir/node\" ]; then" +
@@ -80,7 +80,7 @@ test('env shebang with args', function (t) {
             "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")"+
             "\n"+
             "\ncase `uname` in"+
-            "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;"+
+            "\n    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w \"$basedir\"`;;"+
             "\nesac"+
             "\n"+
             "\nif [ -x \"$basedir/node\" ]; then"+
@@ -121,7 +121,7 @@ test('env shebang with variables', function (t) {
             "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")" +
             "\n"+
             "\ncase `uname` in"+
-            "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;"+
+            "\n    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w \"$basedir\"`;;"+
             "\nesac"+
             "\n"+
             "\nif [ -x \"$basedir/node\" ]; then"+
@@ -162,7 +162,7 @@ test('explicit shebang', function (t) {
             "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")" +
             "\n" +
             "\ncase `uname` in" +
-            "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;" +
+            "\n    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w \"$basedir\"`;;" +
             "\nesac" +
             "\n" +
             "\nif [ -x \"$basedir//usr/bin/sh\" ]; then" +
@@ -204,7 +204,7 @@ test('explicit shebang with args', function (t) {
             "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")" +
             "\n" +
             "\ncase `uname` in" +
-            "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;" +
+            "\n    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w \"$basedir\"`;;" +
             "\nesac" +
             "\n" +
             "\nif [ -x \"$basedir//usr/bin/sh\" ]; then" +