diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 01167e04..aa9519e2 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -27,7 +27,7 @@ if(BUILD_DOCS)
     )
     add_custom_target(conky.1
         ALL
-        COMMAND ${APP_PANDOC} -f markdown -t man ${CMAKE_CURRENT_BINARY_DIR}/man.md > ${CMAKE_CURRENT_BINARY_DIR}/conky.1
+        COMMAND ${APP_PANDOC} --standalone -f markdown -t man ${CMAKE_CURRENT_BINARY_DIR}/man.md > ${CMAKE_CURRENT_BINARY_DIR}/conky.1
         SOURCES config_settings.yaml variables.yaml lua.yaml man.md.j2
     )
     add_dependencies(conky.1 man.md)
diff --git a/doc/README.md b/doc/README.md
index 9c7a7bbb..63b5b776 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -30,7 +30,7 @@ process:
    ```
 2. Run `pandoc` to convert the markdown into a man page:
    ```console
-   $ pandoc -f markdown -t man.md > conky.1
+   $ pandoc --standalone -f markdown -t man man.md > conky.1
    ```
 
 These steps are also part of the CMake build, and can be executed by configuring
diff --git a/doc/man.md.j2 b/doc/man.md.j2
index 5df4a835..f69a6aec 100644
--- a/doc/man.md.j2
+++ b/doc/man.md.j2
@@ -1,12 +1,14 @@
+% conky(1)
+%
+% 2012-05-03
+
 # NAME
 
 conky - A system monitor for X
 
 # SYNOPSIS
 
-**conky**
-
-\[ *options* \]
+**conky** \[ *options* \]
 
 # DESCRIPTION