diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef234db1b6..003568727e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -837,6 +837,8 @@ endif()
 #================================================
 # Add the documentation
 #================================================
+find_package( Doxygen )
+
 add_subdirectory( Documentation )
 
 # Generate config.h.
diff --git a/Documentation/CMakeLists.txt b/Documentation/CMakeLists.txt
index 43fab294c5..38bf6c2c8d 100644
--- a/Documentation/CMakeLists.txt
+++ b/Documentation/CMakeLists.txt
@@ -21,8 +21,6 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 
-find_package( Doxygen )
-
 if( DOXYGEN_FOUND )
     add_custom_target( doxygen-docs
         ${CMAKE_COMMAND} -E remove_directory Documentation/doxygen
diff --git a/Documentation/docset/CMakeLists.txt b/Documentation/docset/CMakeLists.txt
index 0e399a38e2..e6b732ebf4 100644
--- a/Documentation/docset/CMakeLists.txt
+++ b/Documentation/docset/CMakeLists.txt
@@ -66,6 +66,7 @@ if(DOXYGEN_FOUND AND DOXYTAG2ZEALDB AND SED)
             -P ${CMAKE_MODULE_PATH}/CreateDocsetDoxyfile.cmake
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
         OUTPUT ${DOCSET_DOXYFILE}
+        DEPENDS ${CMAKE_BINARY_DIR}/kicad_build_version.h
         COMMENT "Modifying doxyfile for docset creation"
         )