diff --git a/CMakeLists.txt b/CMakeLists.txt
index efaa283..045f920 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,10 +3,14 @@ cmake_minimum_required (VERSION 2.8.4)
 set(project_name juci)
 #set(module juci_to_python_api)
 
-#### TODO WINDOWS SUPPORT ####
-set(bin_install_path "/usr/local/bin")
+if(MSYS)
+  string(TOLOWER "/$ENV{MSYSTEM}" MSYS_PATH)
+  set(bin_install_path "${MSYS_PATH}/bin")
+else()
+  set(bin_install_path "/usr/local/bin")
+endif()
+
 #set(lib_install_path "/usr/local/lib/python2.7/dist-packages/")
-#####
 
 project (${project_name})
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3118301..5a53998 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,10 +8,6 @@ if(APPLE)
   set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig")
 endif()
 
-if(CYGWIN)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows")
-endif()
-
 INCLUDE(FindPkgConfig)
 
 set(validation true)
@@ -43,6 +39,10 @@ validate(${LCL_FOUND} "clangmm" "clangmm" "clangmm")
 find_package(LibClang)
 validate(${LIBCLANG_FOUND} "clang" "libclang-dev" "llvm")
 
+if(MSYS)
+  set(LIBCLANG_LIBRARIES "${MSYS_PATH}/bin/clang.dll")
+endif()
+
 #find_package(PythonLibs 2.7)
 #validate(${PYTHONLIBS_FOUND} "python" "libpython-dev" "python") 
 
diff --git a/src/cmake/Modules/FindLibClangmm.cmake b/src/cmake/Modules/FindLibClangmm.cmake
index c8e7f65..9ba851d 100644
--- a/src/cmake/Modules/FindLibClangmm.cmake
+++ b/src/cmake/Modules/FindLibClangmm.cmake
@@ -4,20 +4,22 @@
 
 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
-  HINTS /usr/local/include/libclangmm
+  PATHS /usr/local/include/libclangmm ${MSYS_INCLUDE_PATH}
 )
 
-
-if(CYGWIN)
-  set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} "cyg")
-  set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} ".dll")
-endif()
-
 find_library(LCL_LIBRARY NAMES clangmm
-  PATHS /usr/local/lib /usr/local/bin
+  PATHS /usr/local/lib ${MSYS_BIN_PATH}
 )
 
+message("${LCL_INCLUDE_DIR}")
+
 set(LCL_LIBRARIES ${LCL_LIBRARY} )
 set(LCL_INCLUDE_DIRS ${LCL_INCLUDE_DIR} )