diff --git a/cmake/BuildSteps/CreateDocsetDoxyfile.cmake b/cmake/BuildSteps/CreateDocsetDoxyfile.cmake
index 0d6dea2a41..3abb2a6179 100644
--- a/cmake/BuildSteps/CreateDocsetDoxyfile.cmake
+++ b/cmake/BuildSteps/CreateDocsetDoxyfile.cmake
@@ -36,7 +36,9 @@ endfunction()
 get_kicad_doc_version(KICAD_DOC_VERSION)
 
 # copy and modify the "normal" Doxyfile
-file(COPY ${SRC_DOXYFILE} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+cmake_path(GET DOCSET_DOXYFILE PARENT_PATH OUTPUT_DIR)
+file(MAKE_DIRECTORY ${OUTPUT_DIR})
+file(COPY_FILE ${SRC_DOXYFILE} ${DOCSET_DOXYFILE})
 file(APPEND ${DOCSET_DOXYFILE} "
 
 # Added for DocSet generation
diff --git a/doxygen/docset/CMakeLists.txt b/doxygen/docset/CMakeLists.txt
index 2dd31e68a4..8cad31822d 100644
--- a/doxygen/docset/CMakeLists.txt
+++ b/doxygen/docset/CMakeLists.txt
@@ -41,7 +41,7 @@ if(DOXYGEN_FOUND AND DOXYTAG2ZEALDB AND SED)
     set(SRC_DOXYFILE ${CMAKE_SOURCE_DIR}/doxygen/Doxyfile)
 
     # A new doxyfile with the original, plus some extra config
-    set(DOCSET_DOXYFILE ${CMAKE_CURRENT_BINARY_DIR}}/doxygen/Doxyfile)
+    set(DOCSET_DOXYFILE ${CMAKE_CURRENT_BINARY_DIR}/doxygen/Doxyfile)
 
     # Various pieces of the docset
     set(DOCSET_LOC ${CMAKE_CURRENT_BINARY_DIR}/doxygen/html/${DOCSET_BUNDLE_ID}.docset)
@@ -67,13 +67,14 @@ if(DOXYGEN_FOUND AND DOXYTAG2ZEALDB AND SED)
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
         OUTPUT ${DOCSET_DOXYFILE}
         DEPENDS version_header
+                ${SRC_DOXYFILE}
                 ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/CreateDocsetDoxyfile.cmake
         COMMENT "Modifying doxyfile for docset creation"
         )
 
     add_custom_command(
         COMMAND ${DOXYGEN_EXECUTABLE} ${DOCSET_DOXYFILE}
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/doxygen
         OUTPUT ${DOXY_TAG_FILE} ${DOXY_MAKEFILE}
         DEPENDS ${DOCSET_DOXYFILE}
         COMMENT "Generating Doxygen for DocSet"