diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73f0c179df..33119ac3bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -843,6 +843,13 @@ add_definitions (-DHAVE_CONFIG_H)
 set (CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/common/config.h)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/common/config.h.cmake.in ${CONFIG_H})
 
+# The doxygen developer documentation
+find_program(DOXYGEN doxygen)
+if (NOT ${DOXYGEN} STREQUAL "DOXYGEN-NOTFOUND")
+  configure_file(doxygen.cfg.in doxygen.cfg)
+  add_custom_target(doc ${DOXYGEN} doxygen.cfg)
+endif()
+
 # The subdirectories
 add_subdirectory (borrowed)
 add_subdirectory (data)
@@ -884,7 +891,10 @@ endif()
 set(DIST_FILE "${PACKAGE_PREFIX}.tar")
 
 set(toplvl_DIST_local ${gnucash_DOCS}
-  CMakeLists.txt README)
+    doxygen.cfg.in
+    doxygen_main_page.c
+    CMakeLists.txt
+    README)
 
 
 set_local_dist(toplvl_DIST ${toplvl_DIST_local})
diff --git a/libgnucash/doc/doxygen.cfg.in b/doxygen.cfg.in
similarity index 99%
rename from libgnucash/doc/doxygen.cfg.in
rename to doxygen.cfg.in
index 156f491d61..9b90630d61 100644
--- a/libgnucash/doc/doxygen.cfg.in
+++ b/doxygen.cfg.in
@@ -68,7 +68,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       =
+OUTPUT_DIRECTORY       = doxygen
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
 # sub-directories (in 2 levels) under the output directory of each output format
diff --git a/libgnucash/doc/doxygen_main_page.c b/doxygen_main_page.c
similarity index 100%
rename from libgnucash/doc/doxygen_main_page.c
rename to doxygen_main_page.c
diff --git a/libgnucash/doc/CMakeLists.txt b/libgnucash/doc/CMakeLists.txt
index 4129533416..f816f92d1b 100644
--- a/libgnucash/doc/CMakeLists.txt
+++ b/libgnucash/doc/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(doc_FILES
         constderv.html
-        doxygen.cfg.in
-        doxygen_main_page.c
         finderv.html
         finutil.html
         README
@@ -9,9 +7,3 @@ set(doc_FILES
 
 set_local_dist(doc_DIST_local CMakeLists.txt ${doc_FILES})
 set(doc_DIST ${doc_DIST_local} ${doc_design_DIST} PARENT_SCOPE)
-
-find_program(DOXYGEN doxygen)
-if (NOT ${DOXYGEN} STREQUAL "DOXYGEN-NOTFOUND")
-  configure_file(doxygen.cfg.in doxygen.cfg)
-  add_custom_target(doc ${DOXYGEN} doxygen.cfg)
-endif()
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9338bf7022..7b65ce41ce 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -621,7 +621,6 @@ libgnucash/core-utils/gnc-locale-utils.cpp
 libgnucash/core-utils/gnc-path.c
 libgnucash/core-utils/gnc-prefs.c
 libgnucash/core-utils/gnc-version.c
-libgnucash/doc/doxygen_main_page.c
 libgnucash/engine/Account.cpp
 libgnucash/engine/cap-gains.cpp
 libgnucash/engine/cashobjects.cpp