diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 9753dad29..53e2cbe8b 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -51,11 +51,11 @@ install(FILES
 # Build Man Pages on Linux and macOS
 if(APPLE OR UNIX)
     add_custom_command(OUTPUT keepassxc.1
-        COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${DOC_DIR}/man/keepassxc.1.adoc
+        COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage -a revnumber=${KEEPASSXC_VERSION} ${DOC_DIR}/man/keepassxc.1.adoc
         DEPENDS ${DOC_DIR}/man/keepassxc.1.adoc
         VERBATIM)
     add_custom_command(OUTPUT keepassxc-cli.1
-        COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${DOC_DIR}/man/keepassxc-cli.1.adoc
+        COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage -a revnumber=${KEEPASSXC_VERSION} ${DOC_DIR}/man/keepassxc-cli.1.adoc
         DEPENDS ${DOC_DIR}/man/keepassxc-cli.1.adoc
         VERBATIM)
     add_custom_target(manpages ALL DEPENDS keepassxc.1 keepassxc-cli.1)
diff --git a/docs/man/section-copyright.adoc b/docs/man/includes/section-copyright.adoc
similarity index 79%
rename from docs/man/section-copyright.adoc
rename to docs/man/includes/section-copyright.adoc
index ae35017c1..8c397c0f0 100644
--- a/docs/man/section-copyright.adoc
+++ b/docs/man/includes/section-copyright.adoc
@@ -16,4 +16,5 @@
 == COPYRIGHT
 Copyright \(C) 2016-2020 KeePassXC Team <team@keepassxc.org>
 
-*KeePassXC* code is licensed under GPL-2 or GPL-3.
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License, either version 2 or version 3.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/docs/man/section-notes.adoc b/docs/man/includes/section-notes.adoc
similarity index 100%
rename from docs/man/section-notes.adoc
rename to docs/man/includes/section-notes.adoc
diff --git a/docs/man/section-reporting-bugs.adoc b/docs/man/includes/section-reporting-bugs.adoc
similarity index 100%
rename from docs/man/section-reporting-bugs.adoc
rename to docs/man/includes/section-reporting-bugs.adoc
diff --git a/docs/man/keepassxc-cli.1.adoc b/docs/man/keepassxc-cli.1.adoc
index d36e00014..e5d0745a6 100644
--- a/docs/man/keepassxc-cli.1.adoc
+++ b/docs/man/keepassxc-cli.1.adoc
@@ -15,9 +15,8 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 = keepassxc-cli(1)
-:docdate: 2020-07-10
+:docdate: 2020-08-31
 :doctype: manpage
-:revnumber: 2.6.0
 :mansource: KeePassXC {revnumber}
 :manmanual: General Commands Manual
 
@@ -292,11 +291,11 @@ The same password generation options as documented for the generate command can
   Include characters from every selected group.
   [Default: Disabled]
 
-include::section-notes.adoc[]
+include::includes/section-notes.adoc[]
 
 == AUTHOR
 This manual page was originally written by Manolis Agkopian <m.agkopian@gmail.com>.
 
-include::section-reporting-bugs.adoc[]
+include::includes/section-reporting-bugs.adoc[]
 
-include::section-copyright.adoc[]
+include::includes/section-copyright.adoc[]
diff --git a/docs/man/keepassxc.1.adoc b/docs/man/keepassxc.1.adoc
index eb1a44480..a5e64def6 100644
--- a/docs/man/keepassxc.1.adoc
+++ b/docs/man/keepassxc.1.adoc
@@ -15,9 +15,8 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 = keepassxc(1)
-:docdate: 2020-07-10
+:docdate: 2020-08-31
 :doctype: manpage
-:revnumber: 2.6.0
 :mansource: KeePassXC {revnumber}
 :manmanual: General Commands Manual
 
@@ -55,11 +54,11 @@ Your wallet works offline and requires no Internet connection.
 *--debug-info*::
   Displays debugging information.
 
-include::section-notes.adoc[]
+include::includes/section-notes.adoc[]
 
 == AUTHOR
 This manual page was originally written by Janek Bevendorff <janek@jbev.net>.
 
-include::section-reporting-bugs.adoc[]
+include::includes/section-reporting-bugs.adoc[]
 
-include::section-copyright.adoc[]
+include::includes/section-copyright.adoc[]