diff --git a/cmake-d/CMakeDetermineDCompiler.cmake b/cmake-d/CMakeDetermineDCompiler.cmake
index bb97ef9..9a5c768 100644
--- a/cmake-d/CMakeDetermineDCompiler.cmake
+++ b/cmake-d/CMakeDetermineDCompiler.cmake
@@ -154,7 +154,7 @@ if(MSVC_D_ARCHITECTURE_ID)
 endif(MSVC_D_ARCHITECTURE_ID)
 # configure variables set in this file for fast reload later on
 find_file(CMAKE_D_COMPILER_CMAKE_IN CMakeDCompiler.cmake.in
-  PATHS ${CMAKE_ROOT} ${CMAKE_MODULE_PATH})
+  PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH})
 configure_file(${CMAKE_D_COMPILER_CMAKE_IN}
   ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake
   @ONLY IMMEDIATE # IMMEDIATE must be here for compatibility mode <= 2.0
diff --git a/cmake-d/CMakeLists.txt b/cmake-d/CMakeLists.txt
index 8428ca4..d66d895 100644
--- a/cmake-d/CMakeLists.txt
+++ b/cmake-d/CMakeLists.txt
@@ -25,6 +25,7 @@ SET (MOD_SRCS
 	dependencies.cmake
 	UseDUnittest.cmake
 	FindPhobos.cmake
+	CMakePlatformId.di.in
 )
 
 SET (PLAT_SRCS