diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake
index b5739dc95..d2c3fd07e 100644
--- a/cmake/Modules/FindFLANN.cmake
+++ b/cmake/Modules/FindFLANN.cmake
@@ -10,8 +10,8 @@
 # look for shared ones
 
 if(FLANN_USE_STATIC)
-  set(FLANN_RELEASE_NAME flann_cpp_s)
-  set(FLANN_DEBUG_NAME flann_cpp_s-gd)
+  set(FLANN_RELEASE_NAME flann_cpp)
+  set(FLANN_DEBUG_NAME flann_cpp-gd)
 else(FLANN_USE_STATIC)
   set(FLANN_RELEASE_NAME flann_cpp)
   set(FLANN_DEBUG_NAME flann_cpp-gd)
@@ -41,7 +41,7 @@ find_library(FLANN_LIBRARY_DEBUG
              NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME}
 	     HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
 	     PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" 
-	     PATH_SUFFIXES lib)
+	     PATH_SUFFIXES lib debug/lib)
 
 if(NOT FLANN_LIBRARY_DEBUG)
   set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY})