diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index a57d6a98667b..483b673773a7 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -19,8 +19,9 @@ MACRO_ENSURE_OUT_OF_SOURCE_BUILD(
  "${PROJECT_NAME} requires an out of source build. Please create a separate build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there."
  )
 
-INCLUDE( ConfigureChecks.cmake )
-CONFIGURE_FILE( config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
+INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/ConfigureChecks.cmake )
+CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/config.h.cmake
+                ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 
 INCLUDE_DIRECTORIES(
  ${CMAKE_CURRENT_BINARY_DIR}
@@ -46,7 +47,7 @@ IF( BUILD_BLOCKS_RUNTIME )
 ELSE( BUILD_BLOCKS_RUNTIME )
   MESSAGE(STATUS "No suitable atomic operation routines detected, skipping Blocks Runtime")
 ENDIF( BUILD_BLOCKS_RUNTIME )
- 
+
 ADD_SUBDIRECTORY( lib )
 
 # Enable Test Suit:
diff --git a/compiler-rt/ConfigureChecks.cmake b/compiler-rt/cmake/ConfigureChecks.cmake
similarity index 100%
rename from compiler-rt/ConfigureChecks.cmake
rename to compiler-rt/cmake/ConfigureChecks.cmake
diff --git a/compiler-rt/config.h.cmake b/compiler-rt/cmake/config.h.cmake
similarity index 100%
rename from compiler-rt/config.h.cmake
rename to compiler-rt/cmake/config.h.cmake