diff --git a/CMakeLists.txt b/CMakeLists.txt
index beb63957..fa82d1e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -310,7 +310,6 @@ if(WITH_TESTS)
 
   list(APPEND BINARY_TARGETS dwarfs_test dwarfs_compat_test dwarfs_badfs_test)
 
-
   gtest_discover_tests(dwarfs_test)
   gtest_discover_tests(dwarfs_compat_test)
   gtest_discover_tests(dwarfs_badfs_test)
@@ -329,14 +328,18 @@ if(WITH_BENCHMARKS)
   list(APPEND BINARY_TARGETS dwarfs_benchmark)
 endif()
 
-foreach(man dwarfs mkdwarfs dwarfsck dwarfsextract)
+foreach(man dwarfs.1 mkdwarfs.1 dwarfsck.1 dwarfsextract.1 dwarfs-format.5)
+  string(REGEX MATCH "^[^.]*" docname "${man}")
+  string(REGEX MATCH "[^.]*$" section "${man}")
+  set(mandir "man${section}")
+
   add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/man/${man}.1
-    COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/man
-    COMMAND ${RONN_EXE} <${CMAKE_CURRENT_SOURCE_DIR}/doc/${man}.md
-            >${CMAKE_CURRENT_BINARY_DIR}/man/${man}.1
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/doc/${man}.md)
-  list(APPEND MAN_PAGES ${CMAKE_CURRENT_BINARY_DIR}/man/${man}.1)
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${mandir}/${man}
+    COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${mandir}
+    COMMAND ${RONN_EXE} <${CMAKE_CURRENT_SOURCE_DIR}/doc/${docname}.md
+            >${CMAKE_CURRENT_BINARY_DIR}/${mandir}/${man}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/doc/${docname}.md)
+  list(APPEND MAN_PAGES ${CMAKE_CURRENT_BINARY_DIR}/${mandir}/${man})
 endforeach()
 
 add_custom_target(manpages DEPENDS ${MAN_PAGES})
@@ -578,7 +581,8 @@ install(
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib)
-install(FILES ${MAN_PAGES} DESTINATION share/man/man1)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man1
+                  ${CMAKE_CURRENT_BINARY_DIR}/man5 DESTINATION share/man)
 
 if(NOT STATIC_BUILD_DO_NOT_USE)
   install(
diff --git a/doc/dwarfs-format.md b/doc/dwarfs-format.md
index 54bf6e19..3c3ed4a5 100644
--- a/doc/dwarfs-format.md
+++ b/doc/dwarfs-format.md
@@ -1,6 +1,12 @@
-# DwarFS File System Format v2.3
+dwarfs-format(5) -- DwarFS File System Format v2.3
+==================================================
 
-## File Structure
+## DESCRIPTION
+
+This document describes the DwarFS file system format, version 2.3.
+
+
+## FILE STRUCTURE
 
 A DwarFS file system image is just a sequence of blocks. Each block has the
 following format:
@@ -64,24 +70,22 @@ A couple of notes:
 
 There are currently 3 different section types.
 
-#### `BLOCK` (0)
+  * `BLOCK` (0):
+    A block of data. This is where all file data is stored. There can be
+    an arbitrary number of blocks of this type.
 
-A block of data. This is where all file data is stored. There can be
-an arbitrary number of blocks of this type.
+  * `METADATA_V2_SCHEMA` (7):
+    The schema used to layout the `METADATA_V2` block contents. This is
+    stored in "compact" thrift encoding.
 
-#### `METADATA_V2_SCHEMA` (7)
+  * `METADATA_V2` (8):
+    This section contains the bulk of the metadata. It's essentially just
+    a collection of bit-packed arrays and structures. The exact layout of
+    each list and structure depends on the actual data and is stored
+    separately in `METADATA_V2_SCHEMA`.
 
-The schema used to layout the `METADATA_V2` block contents. This is
-stored in "compact" thrift encoding.
 
-#### `METADATA_V2` (8)
-
-This section contains the bulk of the metadata. It's essentially just
-a collection of bit-packed arrays and structures. The exact layout of
-each list and structure depends on the actual data and is stored
-separately in `METADATA_V2_SCHEMA`.
-
-## Metadata Format
+## METADATA FORMAT
 
 Here is a high-level overview of how all the bits and pieces relate
 to each other:
@@ -252,17 +256,17 @@ can index into `devices`:
 
     device_id = devices[inode_num - device_inode_offset]
 
-### Optionally Packed Structures
+## OPTIONALLY PACKED STRUCTURES
 
 The overview above assumes metadata without any additional packing,
 which can be produced using:
 
-    mkdwarfs --pack-metadata=none --plain-string-tables
+    mkdwarfs --pack-metadata=none,plain
 
 However, this isn't the default, and parts of the metadata are
 likely stored in a packed format. These are mostly easy to unpack.
 
-#### Shared Files Table Packing
+### Shared Files Table Packing
 
 The `shared_files_table` can be stored in a packed format that
 only encodes the number of shared links to a `chunk_table` index.
@@ -279,7 +283,7 @@ would unpack to:
 The packed format is used when `options.packed_shared_files_table`
 is true.
 
-#### Directories Packing
+### Directories Packing
 
 The `directories` table, when stored in packed format, omits
 all `parent_entry` fields and uses delta compression for the
@@ -296,7 +300,7 @@ only about 50 milliseconds.
 The packed format is used when `options.packed_directories`
 is true.
 
-#### Chunk Table Packing
+### Chunk Table Packing
 
 The `chunk_table` can also be stored delta-compressed and
 must be unpacked accordingly.
@@ -304,7 +308,7 @@ must be unpacked accordingly.
 The packed format is used when `options.packed_chunk_table`
 is true.
 
-#### Names and Symlinks String Table Packing
+### Names and Symlinks String Table Packing
 
 Both the `names` and `symlinks` tables can be stored in a
 packed format in `compact_names` and `compact_symlinks`.
@@ -328,3 +332,15 @@ and is typically able to reduce the overall size of the
 string tables by 50%, using a dictionary that is only a few
 hundred bytes long. If a `symtab` is set for the string table,
 this compression is used.
+
+## AUTHOR
+
+Written by Marcus Holland-Moritz.
+
+## COPYRIGHT
+
+Copyright (C) Marcus Holland-Moritz.
+
+## SEE ALSO
+
+mkdwarfs(1), dwarfs(1), dwarfsextract(1), dwarfsck(1)
diff --git a/doc/dwarfs.md b/doc/dwarfs.md
index 1594fc44..1755dc91 100644
--- a/doc/dwarfs.md
+++ b/doc/dwarfs.md
@@ -207,4 +207,4 @@ Copyright (C) Marcus Holland-Moritz.
 
 ## SEE ALSO
 
-mkdwarfs(1), dwarfsextract(1), dwarfsck(1)
+mkdwarfs(1), dwarfsextract(1), dwarfsck(1), dwarfs-format(5)
diff --git a/doc/dwarfsck.md b/doc/dwarfsck.md
index 80beb858..092b4142 100644
--- a/doc/dwarfsck.md
+++ b/doc/dwarfsck.md
@@ -63,4 +63,4 @@ Copyright (C) Marcus Holland-Moritz.
 
 ## SEE ALSO
 
-mkdwarfs(1), dwarfs(1), dwarfsextract(1)
+mkdwarfs(1), dwarfs(1), dwarfsextract(1), dwarfs-format(5)
diff --git a/doc/dwarfsextract.md b/doc/dwarfsextract.md
index 5921cb49..f7739483 100644
--- a/doc/dwarfsextract.md
+++ b/doc/dwarfsextract.md
@@ -84,4 +84,4 @@ Copyright (C) Marcus Holland-Moritz.
 
 ## SEE ALSO
 
-mkdwarfs(1), dwarfs(1), dwarfsck(1), libarchive-formats(5)
+mkdwarfs(1), dwarfs(1), dwarfsck(1), dwarfs-format(5), libarchive-formats(5)
diff --git a/doc/mkdwarfs.md b/doc/mkdwarfs.md
index ec4582eb..a4692def 100644
--- a/doc/mkdwarfs.md
+++ b/doc/mkdwarfs.md
@@ -491,4 +491,4 @@ Copyright (C) Marcus Holland-Moritz.
 
 ## SEE ALSO
 
-dwarfs(1), dwarfsextract(1), dwarfsck(1)
+dwarfs(1), dwarfsextract(1), dwarfsck(1), dwarfs-format(5)