diff --git a/.gitignore b/.gitignore
index dbcc4784a6..54a1f92601 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ CMakeCache.txt
 CMakeFiles
 Makefile
 cmake_install.cmake
+cmake_uninstall.cmake
 .DS_Store
 *.so
 *.pyd
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9ab4fd2b6..6102ae4ebf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,13 +245,13 @@ if(PYBIND11_INSTALL)
     EXPORT "${PYBIND11_EXPORT_NAME}"
     NAMESPACE "pybind11::"
     DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
-endif()
 
-# Uninstall target
-if(PYBIND11_MASTER_PROJECT)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-                 "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
+  # Uninstall target
+  if(PYBIND11_MASTER_PROJECT)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake_uninstall.cmake.in"
+                   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
 
-  add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P
-                                      ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+    add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P
+                                        ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+  endif()
 endif()
diff --git a/cmake/cmake_uninstall.cmake.in b/tools/cmake_uninstall.cmake.in
similarity index 100%
rename from cmake/cmake_uninstall.cmake.in
rename to tools/cmake_uninstall.cmake.in