diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6725ec64b..2feb2aeac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -837,17 +837,25 @@ if (APPLE)
 endif (APPLE)
 
 # Doxygen Target -- simply run 'make doc' or 'make doc_pages'
+# output directory for 'make doc'       is "${OpenMW_BINARY_DIR}/docs/Doxygen"
+# output directory for 'make doc_pages' is "${DOXYGEN_PAGES_OUTPUT_DIR}" if defined
+#                                       or "${OpenMW_BINARY_DIR}/docs/Pages" otherwise
 find_package(Doxygen)
-if(DOXYGEN_FOUND)
-    configure_file(${OpenMW_SOURCE_DIR}/docs/Doxyfile.in ${OpenMW_BINARY_DIR}/docs/Doxyfile @ONLY)
-    configure_file(${OpenMW_SOURCE_DIR}/docs/DoxyfilePages.in ${OpenMW_BINARY_DIR}/docs/DoxyfilePages @ONLY)
+if (DOXYGEN_FOUND)
+    # determine output directory for doc_pages
+    if (NOT DEFINED DOXYGEN_PAGES_OUTPUT_DIR)
+        set(DOXYGEN_PAGES_OUTPUT_DIR "${OpenMW_BINARY_DIR}/docs/Pages")
+    endif ()
+    configure_file(${OpenMW_SOURCE_DIR}/docs/Doxyfile.cmake ${OpenMW_BINARY_DIR}/docs/Doxyfile @ONLY)
+    configure_file(${OpenMW_SOURCE_DIR}/docs/DoxyfilePages.cmake ${OpenMW_BINARY_DIR}/docs/DoxyfilePages @ONLY)
     add_custom_target(doc
         ${DOXYGEN_EXECUTABLE} ${OpenMW_BINARY_DIR}/docs/Doxyfile
         WORKING_DIRECTORY ${OpenMW_BINARY_DIR}
-        COMMENT "Generating API documentation with Doxygen (from Doxyfile)" VERBATIM)
+        COMMENT "Generating Doxygen documentation at ${OpenMW_BINARY_DIR}/docs/Doxygen"
+        VERBATIM)
     add_custom_target(doc_pages
         ${DOXYGEN_EXECUTABLE} ${OpenMW_BINARY_DIR}/docs/DoxyfilePages
         WORKING_DIRECTORY ${OpenMW_BINARY_DIR}
-        COMMENT "Generating API documentation with Doxygen (from DoxyfilePages)" VERBATIM)
-endif(DOXYGEN_FOUND)
+        COMMENT "Generating documentation for the github-pages at ${DOXYGEN_PAGES_OUTPUT_DIR}" VERBATIM)
+endif ()
 
diff --git a/docs/Doxyfile.in b/docs/Doxyfile.cmake
similarity index 99%
rename from docs/Doxyfile.in
rename to docs/Doxyfile.cmake
index b5022ca8a..38ad84165 100644
--- a/docs/Doxyfile.in
+++ b/docs/Doxyfile.cmake
@@ -58,7 +58,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       = @OpenMW_SOURCE_DIR@/docs/Doxygen
+OUTPUT_DIRECTORY       = @OpenMW_BINARY_DIR@/docs/Doxygen
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -767,7 +767,7 @@ WARN_LOGFILE           =
 INPUT                  = @OpenMW_SOURCE_DIR@/apps \
                          @OpenMW_SOURCE_DIR@/components \
                          @OpenMW_SOURCE_DIR@/libs \
-                         @OpenMW_BINARY_DIR@/docs
+                         @OpenMW_BINARY_DIR@/docs/mainpage.hpp
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/docs/DoxyfilePages.in b/docs/DoxyfilePages.cmake
similarity index 99%
rename from docs/DoxyfilePages.in
rename to docs/DoxyfilePages.cmake
index cb9dc37d6..d50a043d6 100644
--- a/docs/DoxyfilePages.in
+++ b/docs/DoxyfilePages.cmake
@@ -38,7 +38,7 @@ PROJECT_NUMBER         =
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = @OpenMW_SOURCE_DIR@/doxygen
+OUTPUT_DIRECTORY       = @DOXYGEN_PAGES_OUTPUT_DIR@
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -576,7 +576,7 @@ WARN_LOGFILE           =
 INPUT                  = @OpenMW_SOURCE_DIR@/apps \
                          @OpenMW_SOURCE_DIR@/components \
                          @OpenMW_SOURCE_DIR@/libs \
-                         @OpenMW_BINARY_DIR@/docs
+                         @OpenMW_BINARY_DIR@/docs/mainpage.hpp
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is