diff --git a/.gitignore b/.gitignore
index 0711d9b17..e91dcab3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ docs/changelogs/
 docs/html/
 docs/pdf/
 docs/pseudoxml/
+docs/tags/
 docs/text/
 docs/tools/
 docs/xml/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a793bcfbb..d8d90b007 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -473,7 +473,16 @@ if(BUILD_DOCS)
     )
 
     set(SPHINX_OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/docs/html/.buildinfo")
-    set_source_files_properties(${SPHINX_OUTPUT} PROPERTIES GENERATED TRUE)
+    set_property(
+        DIRECTORY PROPERTY ADDITIONAL_CLEAN_FILES TRUE
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/changelogs"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/html"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/tags"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/text"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/tools"
+        "${CMAKE_BINARY_DIR}/docs/html"
+        "${CMAKE_BINARY_DIR}/docs/text"
+    ) 
     add_custom_command(OUTPUT ${SPHINX_OUTPUT}
         COMMAND ${SPHINX_EXECUTABLE}
             -E -q -b html -d "${CMAKE_BINARY_DIR}/docs/html"
diff --git a/docs/changelogs/.gitignore b/docs/changelogs/.gitignore
deleted file mode 100644
index 90de5c70d..000000000
--- a/docs/changelogs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.txt
-*.rst
diff --git a/docs/sphinx_extensions/dfhack/changelog.py b/docs/sphinx_extensions/dfhack/changelog.py
index 629d6b6de..2f27590fd 100644
--- a/docs/sphinx_extensions/dfhack/changelog.py
+++ b/docs/sphinx_extensions/dfhack/changelog.py
@@ -238,6 +238,8 @@ def generate_changelog(all=False):
     consolidate_changelog(stable_entries)
     consolidate_changelog(dev_entries)
 
+    os.makedirs(os.path.join(DOCS_ROOT, 'changelogs'), mode=0o755, exist_ok=True)
+
     print_changelog(versions, stable_entries, os.path.join(DOCS_ROOT, 'changelogs/news.rst'))
     print_changelog(versions, dev_entries, os.path.join(DOCS_ROOT, 'changelogs/news-dev.rst'))