diff --git a/ninja b/ninja
index a337045..33ef701 100755
--- a/ninja
+++ b/ninja
@@ -35,8 +35,8 @@
     esac
     ;;
   Darwin)    exec "${THIS_DIR}/ninja-mac" "$@";;
-  CYGWIN*)   exec cmd.exe /c $(cygpath -t windows $0).exe "$@";;
-  MINGW32*)  cmd.exe //c $0.exe "$@";;
+  CYGWIN*)   exec cmd.exe /c $(cygpath -t windows $0-win).exe "$@";;
+  MINGW32*)  cmd.exe //c $0-win.exe "$@";;
   *)         echo "Unsupported OS ${OS}"
              print_help
              exit 1;;
diff --git a/ninja.exe b/ninja-win.exe
similarity index 100%
rename from ninja.exe
rename to ninja-win.exe
Binary files differ
diff --git a/ninja.bat b/ninja.bat
new file mode 100644
index 0000000..8dc49d2
--- /dev/null
+++ b/ninja.bat
@@ -0,0 +1,5 @@
+@echo off
+setlocal
+:: This is required with cygwin only.
+PATH=%~dp0;%PATH%
+"%~dp0ninja-win.exe" %*