diff --git a/.gitmodules b/.gitmodules
index 592c5b8863e8c68633c14976d7103274829f84ea..7d85724fadf9688055e5b7b9009885fad793dbd1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "ThirdParty/SwmmInterface"]
 	path = ThirdParty/SwmmInterface
 	url = https://github.com/ufz/SwmmInterface.git
+[submodule "ThirdParty/cmake-modules"]
+	path = ThirdParty/cmake-modules
+	url = https://github.com/bilke/cmake-modules.git
diff --git a/ThirdParty/cmake-modules b/ThirdParty/cmake-modules
new file mode 160000
index 0000000000000000000000000000000000000000..af334f92548b7349a1bb038d56ce91fc7b3d3d00
--- /dev/null
+++ b/ThirdParty/cmake-modules
@@ -0,0 +1 @@
+Subproject commit af334f92548b7349a1bb038d56ce91fc7b3d3d00
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index 0aaa3cdd79b3533e60e61c77c8e680386e674850..8423dec0d92d1c2ce29daf0f74b773e797216b4c 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -1,6 +1,5 @@
 # Set additional CMake modules path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
-  "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/cmake"
   "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake"
   "${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/cmake-modules")