diff --git a/FindOpenThreads.cmake b/CMake/FindOpenThreads.cmake
similarity index 100%
rename from FindOpenThreads.cmake
rename to CMake/FindOpenThreads.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a2401590a26530e58cb0f3fa63f7662e49aad71..5ee3c9e30cf0dc3602426d378adfe497c3389f96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,11 @@ ENDIF(COMMAND CMAKE_POLICY)
 
 PROJECT(OTB)
 
+# Path to additional CMake modules
+SET(CMAKE_MODULE_PATH
+    ${CMAKE_SOURCE_DIR}/CMake
+    ${CMAKE_MODULE_PATH})
+
 INCLUDE_REGULAR_EXPRESSION("^(otb|itk|vtk|vnl|vcl|vxl|f2c|netlib|ce|itpack|DICOM|meta|png|dbh|tif|jpeg|zlib).*$")
 SOURCE_GROUP("XML Files" REGULAR_EXPRESSION "[.]xml$")