diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85a2f90..aaf6706 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(
 	mde
 )
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/mdecmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/mdecmake/cmake)
 
 include(CheckIncludeFiles)
 
@@ -18,6 +18,7 @@ add_subdirectory(external/milsko)
 
 include_directories(external)
 
+add_subdirectory(mdecmake)
 add_subdirectory(mdelibs)
 add_subdirectory(mdebase)
 add_subdirectory(mdeutils)
diff --git a/mdebase b/mdebase
index 1f5eb42..6ff2d27 160000
--- a/mdebase
+++ b/mdebase
@@ -1 +1 @@
-Subproject commit 1f5eb4255d07d0a076c7ea1673fb898eb984ea1d
+Subproject commit 6ff2d27e31b995b71fd66407e3c5d3f74ce9ea75
diff --git a/mdecmake b/mdecmake
index a590b2b..84c4110 160000
--- a/mdecmake
+++ b/mdecmake
@@ -1 +1 @@
-Subproject commit a590b2bd4d811f98e4843a7fcac50904eb4b94bb
+Subproject commit 84c4110bfeebcf23c9256ca3d163f4efd5f35bff
diff --git a/mdeutils b/mdeutils
index f91f504..75fde75 160000
--- a/mdeutils
+++ b/mdeutils
@@ -1 +1 @@
-Subproject commit f91f5042cba0567d5505315d8b6c2c09efb88146
+Subproject commit 75fde75982acdecbd23445d0b98166ae947d96e1