diff --git a/docs/install.md b/docs/install.md
index 8ddcac3..ef2d95c 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -28,12 +28,6 @@ make install
 ```
 
 ##Windows with MSYS2 (https://msys2.github.io/)
-Please wait until the following TODOs are resolved:
-* Newlines are saved properly
-* Windows implementation of creating processes
-* libclang(mm) finds header-files
-* fix make install, and install to mingw[32/64]/bin
-
 Install dependencies(replace [arch] with i686 or x86_64 depending on your MSYS2 install):
 ```sh
 pacman -S patch autoconf automake-wrapper mingw-w64-[arch]-gtkmm3 mingw-w64-[arch]-boost mingw-w64-[arch]-aspell mingw-w64-[arch]-aspell-en
diff --git a/src/cmake/Modules/FindLibClangmm.cmake b/src/cmake/Modules/FindLibClangmm.cmake
index ff7c8cb..05b4ffe 100644
--- a/src/cmake/Modules/FindLibClangmm.cmake
+++ b/src/cmake/Modules/FindLibClangmm.cmake
@@ -4,19 +4,9 @@
 
 find_package(PkgConfig)
 
-if(MSYS)
-  string(TOLOWER "/$ENV{MSYSTEM}" MSYS_PATH)
-  set(MSYS_INCLUDE_PATH "${MSYS_PATH}/include/libclangmm")
-  set(MSYS_BIN_PATH "${MSYS_PATH}/bin")
-endif()
+find_path(LCL_INCLUDE_DIR clangmm.h)
 
-find_path(LCL_INCLUDE_DIR clangmm.h
-  PATHS /usr/local/include/libclangmm ${MSYS_INCLUDE_PATH}
-)
-
-find_library(LCL_LIBRARY NAMES clangmm
-  PATHS /usr/local/lib ${MSYS_BIN_PATH}
-)
+find_library(LCL_LIBRARY NAMES clangmm)
 
 set(LCL_LIBRARIES ${LCL_LIBRARY} )
 set(LCL_INCLUDE_DIRS ${LCL_INCLUDE_DIR} )