diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb5b770b..d15494bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,6 +109,11 @@ ELSE()
     ADD_DEFINITIONS(-DNDEBUG)
 ENDIF()
 
+# hack for ninja in msys2
+IF(WIN32 AND CMAKE_GENERATOR STREQUAL Ninja AND (NOT $ENV{MSYSTEM} STREQUAL ""))
+    SET(MSYS ON)
+ENDIF()
+
 # Add support for Homebrew, MacPorts and Fink on OS X
 IF(APPLE)
     INCLUDE(MacPackageManagers)
diff --git a/README.md b/README.md
index 3b66489b..90c84d35 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,8 @@ make -j10
 `./installdeps` is supported on MSys2, Linux (Debian/Ubuntu, Fedora or Arch
 Linux) and Mac OS X (homebrew, macports or fink.)
 
+The Ninja cmake generator is also now supported, including on msys2.
+
 If your OS is not supported, you will need the following:
 
 - c++ compiler and binutils