diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9df9f007d..a389f0327 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ SET(FBVF "FISH-BUILD-VERSION-FILE")
 
 
 # Set up config.h
-INCLUDE(CMakeFiles/ConfigureChecks.cmake)
+INCLUDE(cmake/ConfigureChecks.cmake)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config_cmake.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
@@ -73,13 +73,13 @@ ADD_DEFINITIONS(-D_UNICODE=1
                 -DDOCDIR=L"${CMAKE_INSTALL_FULL_DOCDIR}")
 
 # Set up PCRE2
-INCLUDE(CMakeFiles/PCRE2.cmake)
+INCLUDE(cmake/PCRE2.cmake)
 
 # Set up muparser.
 INCLUDE(muparser-2.2.5/CMakeLists.txt)
 
 # Set up the docs.
-INCLUDE(CMakeFiles/Docs.cmake)
+INCLUDE(cmake/Docs.cmake)
 
 # Define a function to link dependencies.
 FUNCTION(FISH_LINK_DEPS target)
@@ -108,7 +108,7 @@ ADD_EXECUTABLE(fish_key_reader
 FISH_LINK_DEPS(fish_key_reader)
 
 # Set up tests.
-INCLUDE(CMakeFiles/Tests.cmake)
+INCLUDE(cmake/Tests.cmake)
 
 # Set up install.
-INCLUDE(CMakeFiles/Install.cmake)
+INCLUDE(cmake/Install.cmake)
diff --git a/CMakeFiles/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
similarity index 100%
rename from CMakeFiles/ConfigureChecks.cmake
rename to cmake/ConfigureChecks.cmake
diff --git a/CMakeFiles/Docs.cmake b/cmake/Docs.cmake
similarity index 100%
rename from CMakeFiles/Docs.cmake
rename to cmake/Docs.cmake
diff --git a/CMakeFiles/Install.cmake b/cmake/Install.cmake
similarity index 100%
rename from CMakeFiles/Install.cmake
rename to cmake/Install.cmake
diff --git a/CMakeFiles/PCRE2.cmake b/cmake/PCRE2.cmake
similarity index 100%
rename from CMakeFiles/PCRE2.cmake
rename to cmake/PCRE2.cmake
diff --git a/CMakeFiles/Tests.cmake b/cmake/Tests.cmake
similarity index 100%
rename from CMakeFiles/Tests.cmake
rename to cmake/Tests.cmake