diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1577b9f3e..bf6b5d74d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,7 +127,7 @@ endif ()
 
 
 # Add local cmake modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/builds)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/builds/cmake)
 
 
 if (BUILD_FRAMEWORK)
diff --git a/ChangeLog b/ChangeLog
index 63fad5331..1a1f20124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-11-27  Werner Lemberg  <wl@gnu.org>
+
+	[cmake] Collect files specific to cmake in `builds/cmake'.
+
+	* builds/FindHarfBuzz.cmake: Move to ...
+	* builds/cmake/FindHarfBuzz.cmake: ... this place.
+
+	* CMakeLists.txt (CMAKE_MODULE_PATH): Updated.
+
 2015-11-27  Alexander Bock  <alexander.j.bock@nasa.gov>
 
 	CMakeLists.txt: Honour new command line flag `FREETYPE_NO_DIST'.
diff --git a/builds/FindHarfBuzz.cmake b/builds/cmake/FindHarfBuzz.cmake
similarity index 100%
rename from builds/FindHarfBuzz.cmake
rename to builds/cmake/FindHarfBuzz.cmake