diff --git a/docs/man_intro.rst b/docs/man_intro.rst
index 9bb20eb1a..05ef44015 100644
--- a/docs/man_intro.rst
+++ b/docs/man_intro.rst
@@ -1,16 +1,3 @@
-====
-borg
-====
-
-----------------------------------------
-deduplicating and encrypting backup tool
-----------------------------------------
-
-:Author: The Borg Collective
-:Date: 2017-02-05
-:Manual section: 1
-:Manual group: borg backup tool
-
 SYNOPSIS
 --------
 
@@ -65,4 +52,4 @@ SEE ALSO
 * Releases https://github.com/borgbackup/borg/releases
 * Changelog https://github.com/borgbackup/borg/blob/master/docs/changes.rst
 * GitHub https://github.com/borgbackup/borg
-* Security contact https://borgbackup.readthedocs.io/en/latest/support.html#security-contact
\ No newline at end of file
+* Security contact https://borgbackup.readthedocs.io/en/latest/support.html#security-contact
diff --git a/setup_docs.py b/setup_docs.py
index ec84a7d0a..eb44b608e 100644
--- a/setup_docs.py
+++ b/setup_docs.py
@@ -424,10 +424,15 @@ def build_topic_pages(self, Archiver):
             self.gen_man_page(man_title, doc.getvalue())
 
     def build_intro_page(self):
+        doc, write = self.new_doc()
+        man_title = 'borg'
         print('building man page borg(1)', file=sys.stderr)
+
         with open('docs/man_intro.rst') as fd:
             man_intro = fd.read()
-        self.gen_man_page('borg', self.rst_prelude + man_intro)
+
+        self.write_man_header(write, man_title, "deduplicating and encrypting backup tool")
+        self.gen_man_page(man_title, doc.getvalue() + man_intro)
 
     def new_doc(self):
         doc = io.StringIO(self.rst_prelude)