diff --git a/doc/man/timew-config.7.in b/doc/man/timew-config.7.in
index 2ce703f8..7561f687 100644
--- a/doc/man/timew-config.7.in
+++ b/doc/man/timew-config.7.in
@@ -1,4 +1,12 @@
-.SH CONFIGURATION FILE AND OVERRIDE OPTIONS
+.TH timew-config 7 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
+.
+.SH NAME
+timew-config \- Timewarrior configuration file an override options
+.
+.SH SYNOPSIS
+.B timew rc.<name>=<value> <command>
+.
+.SH DESCRIPTION
 Timewarrior stores its configuration in a file in the user's home directory:
 ~/.timewarrior/timewarrior.cfg.
 .
diff --git a/doc/man/timew-dates.7.in b/doc/man/timew-dates.7.in
index 9dc59411..2280e523 100644
--- a/doc/man/timew-dates.7.in
+++ b/doc/man/timew-dates.7.in
@@ -1,4 +1,11 @@
-.SH DATES
+.TH timew-dates 7 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
+.
+.SH NAME
+timew-dates \- date formats supported by Timewarrior
+.
+.SH SYNOPSIS
+.
+.SH DESCRIPTION
 Timewarrior supports the following date formats based on ISO-8601:
 .
   <extended-date> [T <extended-time>]   Extended date, optional extended time
diff --git a/doc/man/timew-dom.7.in b/doc/man/timew-dom.7.in
index 04602b3f..de0e767f 100644
--- a/doc/man/timew-dom.7.in
+++ b/doc/man/timew-dom.7.in
@@ -1,4 +1,11 @@
-.SH DOM
+.TH timew-dom 7 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
+.
+.SH NAME
+timew-dom \- Timewarrior DOM
+.
+.SH SYNOPSIS
+.
+.SH DESCRIPTION
 Supported DOM references are:
 .
   dom.tag.count             Count of all tags
diff --git a/doc/man/timew-duration.7.in b/doc/man/timew-duration.7.in
index 424db45c..966195ff 100644
--- a/doc/man/timew-duration.7.in
+++ b/doc/man/timew-duration.7.in
@@ -1,4 +1,11 @@
-.SH DURATIONS
+.TH timew-durations 7 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
+.
+.SH NAME
+timew-durations \- duration formats supported by Timewarrior
+.
+.SH SYNOPSIS
+.
+.SH DESCRIPTION
 Timewarrior supports the following duration formats based on ISO-8601:
 .
   'P' [nn 'Y'] [nn 'M'] [nn 'D'] ['T' [nn 'H'] [nn 'M'] [nn 'S']]
diff --git a/doc/man/timew-hints.7.in b/doc/man/timew-hints.7.in
index 3d675133..f59f4c8d 100644
--- a/doc/man/timew-hints.7.in
+++ b/doc/man/timew-hints.7.in
@@ -1,4 +1,11 @@
-.SH HINTS
+.TH timew-hints 7 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
+.
+.SH NAME
+timew-hints \- Timewarrior hints
+.
+.SH SYNOPSIS
+.
+.SH DESCRIPTION
 Timewarrior supports hints, which are single-word command line features that start with a colon like this:
 .
   :week
diff --git a/doc/man/timew-intervals.7.in b/doc/man/timew-intervals.7.in
index af6f3078..56dcdb16 100644
--- a/doc/man/timew-intervals.7.in
+++ b/doc/man/timew-intervals.7.in
@@ -1,4 +1,10 @@
-``.SH INTERVAL
+.TH timew-intervals 7 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
+.
+.SH NAME
+timew-intervals \- date and time ranges supported by Timewarrior
+.SH SYNOPSIS
+.
+.SH DESCRIPTION
 An interval defines a block of time that is tracked.
 The syntax for specifying an interval is flexible, and may be one of:
 .