diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51e9f68e..be31b723 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+Version 2026.09.1~SNAPSHOT
+-----------------
+Released: 2026-09-??
+URL: https://codeberg.org/ChiPass/ChiPass/releases/tag/snapshot
+
+Bugfixes:
+ * Manpages are no longer installed in the wrong directory or in the wrong format.
+   [CHIPASS-122]
+
+
 Version 2026.09.0
 -----------------
 Released: 2026-09-11
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index ec348f86..a62ccbd4 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -14,7 +14,7 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 function (asciidoc_command src_file out_file)
-  cmake_parse_arguments(PARSE_ARGV 2 arg "" "INSTALL_TO" "DEPENDS")
+  cmake_parse_arguments(PARSE_ARGV 2 arg "" "INSTALL_TO;FORMAT" "DEPENDS")
 
   add_custom_command(
     OUTPUT ${out_file}
@@ -24,6 +24,7 @@ function (asciidoc_command src_file out_file)
       -D ${CMAKE_CURRENT_BINARY_DIR}
       -o ${out_file}
       -a revnumber=${CHIPASS_VERSION}
+      -b ${arg_FORMAT}
     VERBATIM
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   )
@@ -38,24 +39,29 @@ endfunction()
 
 file(GLOB manual_depends *.adoc topics/* styles/* images/*)
 asciidoc_command(GettingStarted.adoc GettingStarted.html
+  FORMAT html
   INSTALL_TO ${CHIPASS_INSTALL_DATADIR}/docs/
   DEPENDS ${manual_depends}
 )
 asciidoc_command(UserGuide.adoc UserGuide.html
+  FORMAT html
   INSTALL_TO ${CHIPASS_INSTALL_DATADIR}/docs/
   DEPENDS ${manual_depends}
 )
 asciidoc_command(topics/KeyboardShortcuts.adoc KeyboardShortcuts.html
+  FORMAT html
   INSTALL_TO ${CHIPASS_INSTALL_DATADIR}/docs/
   DEPENDS ${manual_depends}
 )
 
 if (UNIX)
   asciidoc_command(man/ChiPass.1.adoc ChiPass.1
-    INSTALL_TO ${CHIPASS_INSTALL_DATADIR}/man/man1/
+    FORMAT manpage
+    INSTALL_TO ${CMAKE_INSTALL_MANDIR}/man1/
   )
   asciidoc_command(man/ChiPass-cli.1.adoc ChiPass-cli.1
-    INSTALL_TO ${CHIPASS_INSTALL_DATADIR}/man/man1/
+    FORMAT manpage
+    INSTALL_TO ${CMAKE_INSTALL_MANDIR}/man1/
   )
 endif()