diff --git a/doc/man/timew-cancel.1.in b/doc/man/timew-cancel.1.in
index c37854d6..cd2d076b 100644
--- a/doc/man/timew-cancel.1.in
+++ b/doc/man/timew-cancel.1.in
@@ -1,5 +1,8 @@
 .TH timew-cancel 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-cancel \- cancel time tracking
+
 .TP
 .B timew cancel
 If there is an open interval, it is abandoned.
diff --git a/doc/man/timew-config.1.in b/doc/man/timew-config.1.in
index 6823388b..dcb88902 100644
--- a/doc/man/timew-config.1.in
+++ b/doc/man/timew-config.1.in
@@ -1,5 +1,8 @@
 .TH timew-config 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-config \- get and set Timewarrior configuration
+
 .TP
 .B timew config [<name> [<value> | '']]
 Allows setting and removing configuration values, as an alternative to directly
diff --git a/doc/man/timew-continue.1.in b/doc/man/timew-continue.1.in
index bdc3b7dd..ac9fc069 100644
--- a/doc/man/timew-continue.1.in
+++ b/doc/man/timew-continue.1.in
@@ -1,5 +1,8 @@
 .TH timew-continue 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-continue \- resume tracking of existing interval
+
 .TP
 .B timew continue [@<id>] [<date>|<interval>]
 Resumes tracking of closed intervals. For example:
diff --git a/doc/man/timew-day.1.in b/doc/man/timew-day.1.in
index c8142987..35caba64 100644
--- a/doc/man/timew-day.1.in
+++ b/doc/man/timew-day.1.in
@@ -1,5 +1,8 @@
 .TH timew-day 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-day \- display day chart
+
 .TP
 .B timew day [<interval>] [<tag> ...]
 The day command shows a chart depicting a single day (today by default), with
diff --git a/doc/man/timew-delete.1.in b/doc/man/timew-delete.1.in
index b219c63a..70fff20d 100644
--- a/doc/man/timew-delete.1.in
+++ b/doc/man/timew-delete.1.in
@@ -1,5 +1,8 @@
 .TH timew-delete 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-delete \- delete intervals
+
 .TP
 .B timew delete @<id> [@<id> ...]
 Deletes an interval. Using the 'summary' command, and specifying the ':ids' hint
diff --git a/doc/man/timew-diagnostics.1.in b/doc/man/timew-diagnostics.1.in
index a84a61e4..ddde375e 100644
--- a/doc/man/timew-diagnostics.1.in
+++ b/doc/man/timew-diagnostics.1.in
@@ -1,5 +1,8 @@
 .TH timew-diagnostics 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-diagnostics \- show diagnostic information
+
 .TP
 .B timew diagnostics
 This command shows details about your version of Timewarrior, your platform, how
diff --git a/doc/man/timew-export.1.in b/doc/man/timew-export.1.in
index 9e69d018..2e1ef9e4 100644
--- a/doc/man/timew-export.1.in
+++ b/doc/man/timew-export.1.in
@@ -1,5 +1,8 @@
 .TH timew-export 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-export \- export tracked time in JSON
+
 .TP
 .B timew export [<interval>] [<tag> ...]
 Exports all the tracked time in JSON format. Supports filtering. For example:
diff --git a/doc/man/timew-extensions.1.in b/doc/man/timew-extensions.1.in
index c732120e..7be52e2c 100644
--- a/doc/man/timew-extensions.1.in
+++ b/doc/man/timew-extensions.1.in
@@ -1,5 +1,8 @@
 .TH timew-extensions 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-extension \- list available extensions
+
 .TP
 .B timew extensions
 Displays the directory containing the extension programs and a table showing
diff --git a/doc/man/timew-fill.1.in b/doc/man/timew-fill.1.in
index d6d7cb34..4b3bd4f3 100644
--- a/doc/man/timew-fill.1.in
+++ b/doc/man/timew-fill.1.in
@@ -1,5 +1,8 @@
 .TH timew-fill 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-fill \- adjust intervals to fill in surrounding gaps
+
 .TP
 .B timew fill @<id> [@<id> ...]
 
diff --git a/doc/man/timew-gaps.1.in b/doc/man/timew-gaps.1.in
index 4a19ca2f..1764a397 100644
--- a/doc/man/timew-gaps.1.in
+++ b/doc/man/timew-gaps.1.in
@@ -1,5 +1,8 @@
 .TH timew-gaps 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-gaps \- display time tracking gaps
+
 .TP
 .B timew gaps [<interval>] [<tag> ...]
 Displays a summary of time that is neither tracked nor excluded from tracking.
diff --git a/doc/man/timew-get.1.in b/doc/man/timew-get.1.in
index 2b5d99ca..0dbd14f8 100644
--- a/doc/man/timew-get.1.in
+++ b/doc/man/timew-get.1.in
@@ -1,5 +1,8 @@
 .TH timew-get 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-get \- display DOM values
+
 .TP
 .B timew get <DOM> [<DOM> ...]
 Validates the DOM reference, then obtains the value and displays it. For example:
diff --git a/doc/man/timew-help.1.in b/doc/man/timew-help.1.in
index f29e1b1e..28830b43 100644
--- a/doc/man/timew-help.1.in
+++ b/doc/man/timew-help.1.in
@@ -1,5 +1,8 @@
 .TH timew-help 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-help \- display help
+
 .TP
 .B timew help [<command> | interval | hints | date | duration]
 The help command shows detailed descriptions and examples of commands,
diff --git a/doc/man/timew-join.1.in b/doc/man/timew-join.1.in
index ebf18956..efae76d4 100644
--- a/doc/man/timew-join.1.in
+++ b/doc/man/timew-join.1.in
@@ -1,5 +1,8 @@
 .TH timew-join 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-join \- join intervals
+
 .TP
 .B timew join @<id> @<id>
 Joins two intervals, by using the earlier of the two start times, and the later
diff --git a/doc/man/timew-lengthen.1.in b/doc/man/timew-lengthen.1.in
index fa34bba4..96ac1f99 100644
--- a/doc/man/timew-lengthen.1.in
+++ b/doc/man/timew-lengthen.1.in
@@ -1,5 +1,8 @@
 .TH timew-lengthen 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-lengthen \- lengthen intervals
+
 .TP
 .B timew lengthen @<id> [@<id> ...] <duration>
 The 'lengthen' command is used to defer the end date of a closed interval.
diff --git a/doc/man/timew-month.1.in b/doc/man/timew-month.1.in
index d1c6df67..9303787b 100644
--- a/doc/man/timew-month.1.in
+++ b/doc/man/timew-month.1.in
@@ -1,5 +1,8 @@
 .TH timew-month 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-month \- display month chart
+
 .TP
 .B timew month [<interval>] [<tag> ...]
 The month command shows a chart depicting a single month (current month by
diff --git a/doc/man/timew-move.1.in b/doc/man/timew-move.1.in
index 895b0745..72f8bfdb 100644
--- a/doc/man/timew-move.1.in
+++ b/doc/man/timew-move.1.in
@@ -1,5 +1,8 @@
 .TH timew-move 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-move \- change interval start-time
+
 .TP
 .B timew move @<id> <date>
 The 'move' command is used to reposition an interval at a new start time.
diff --git a/doc/man/timew-report.1.in b/doc/man/timew-report.1.in
index 39456fa3..297ae18c 100644
--- a/doc/man/timew-report.1.in
+++ b/doc/man/timew-report.1.in
@@ -1,5 +1,8 @@
 .TH timew-report 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-report \- run an extension report
+
 .TP
 .B timew [report] <report> [<interval>] [<tag> ...]
 Runs an extension report, and supports filtering data.
diff --git a/doc/man/timew-resize.1.in b/doc/man/timew-resize.1.in
index ec57f6ce..1a9844fa 100644
--- a/doc/man/timew-resize.1.in
+++ b/doc/man/timew-resize.1.in
@@ -1,5 +1,8 @@
 .TH timew-resize 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-resize \- set interval duration
+
 .TP
 .B timew resize @<id> [@<id> ...] <duration>
 The 'resize' command is used to change the duration of a closed interval.
diff --git a/doc/man/timew-shorten.1.in b/doc/man/timew-shorten.1.in
index c0087104..baaca9bc 100644
--- a/doc/man/timew-shorten.1.in
+++ b/doc/man/timew-shorten.1.in
@@ -1,5 +1,8 @@
 .TH timew-shorten 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-shorten \- shorten intervals
+
 .TP
 .B timew shorten @<id> [@<id> ...] <duration>
 The 'shorten' command is used to advance the end date of a closed interval.
diff --git a/doc/man/timew-show.1.in b/doc/man/timew-show.1.in
index 15639708..e9427218 100644
--- a/doc/man/timew-show.1.in
+++ b/doc/man/timew-show.1.in
@@ -1,5 +1,8 @@
 .TH timew-show 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-show \- display configuration
+
 .TP
 .B timew show
 Displays the effective configuration in hierarchical form.
diff --git a/doc/man/timew-split.1.in b/doc/man/timew-split.1.in
index 3c2b990b..8df1e00c 100644
--- a/doc/man/timew-split.1.in
+++ b/doc/man/timew-split.1.in
@@ -1,5 +1,8 @@
 .TH timew-split 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-split \- split intervals
+
 .TP
 .B timew split @<id> [@<id> ...]
 Ѕplits an interval into two equally sized adjacent intervals, having the same
diff --git a/doc/man/timew-start.1.in b/doc/man/timew-start.1.in
index 9b71b2bc..29777e0f 100644
--- a/doc/man/timew-start.1.in
+++ b/doc/man/timew-start.1.in
@@ -1,5 +1,8 @@
 .TH timew-start 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-start \- start time tracking
+
 .TP
 .B timew start [<date>] [<tag> ...]
 Begins tracking using the current time with any specified set of tags.
diff --git a/doc/man/timew-stop.1.in b/doc/man/timew-stop.1.in
index bb7cd339..7687b40e 100644
--- a/doc/man/timew-stop.1.in
+++ b/doc/man/timew-stop.1.in
@@ -1,5 +1,8 @@
 .TH timew-stop 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-stop \- stop time tracking
+
 .TP
 .B timew stop [<tag> ...]
 Stops tracking time. If tags are specified, then they are no longer tracked.
diff --git a/doc/man/timew-summary.1.in b/doc/man/timew-summary.1.in
index 05755365..fd471888 100644
--- a/doc/man/timew-summary.1.in
+++ b/doc/man/timew-summary.1.in
@@ -1,5 +1,8 @@
 .TH timew-summary 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-summary \- display a time-tracking summary
+
 .TP
 .B timew summary [<interval>] [<tag> ...]
 Displays a report summarizing tracked and untracked time for the current day by
diff --git a/doc/man/timew-tag.1.in b/doc/man/timew-tag.1.in
index d9eaaddc..e9b004a1 100644
--- a/doc/man/timew-tag.1.in
+++ b/doc/man/timew-tag.1.in
@@ -1,5 +1,8 @@
 .TH timew-tag 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-tag \- add tags to intervals
+
 .TP
 .B timew tag [@<id> ...] <tag> ...
 The 'tag' command is used to add a tag to an interval. Using the 'summary'
diff --git a/doc/man/timew-tags.1.in b/doc/man/timew-tags.1.in
index 0c69d44d..96a99cd6 100644
--- a/doc/man/timew-tags.1.in
+++ b/doc/man/timew-tags.1.in
@@ -1,5 +1,8 @@
 .TH timew-tags 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-tags \- display a list of tags
+
 .TP
 .B timew tags [<interval>] [<tag> ...]
 Displays all the tags that have been used by default. When a filter is specified,
diff --git a/doc/man/timew-track.1.in b/doc/man/timew-track.1.in
index 63b0b46b..d58c3840 100644
--- a/doc/man/timew-track.1.in
+++ b/doc/man/timew-track.1.in
@@ -1,5 +1,8 @@
 .TH timew-track 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-track \- add intervals to the database
+
 .TP
 .B timew track <interval> [<tag> ...]
 The track command is used to add tracked time in the past. Perhaps you forgot
diff --git a/doc/man/timew-untag.1.in b/doc/man/timew-untag.1.in
index 81fef466..9738e16b 100644
--- a/doc/man/timew-untag.1.in
+++ b/doc/man/timew-untag.1.in
@@ -1,5 +1,8 @@
 .TH timew-untag 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-untag \- remove tags from intervals
+
 .TP
 .B timew untag [@<id> ...] <tag> ...
 The 'untag' command is used to remove a tag from an interval. Using the 'summary'
diff --git a/doc/man/timew-week.1.in b/doc/man/timew-week.1.in
index 0f403115..1e562916 100644
--- a/doc/man/timew-week.1.in
+++ b/doc/man/timew-week.1.in
@@ -1,5 +1,8 @@
 .TH timew-week 1 2018-02-03 "${PACKAGE_STRING}" "User Manuals"
 
+.SH NAME
+timew-week \- display week chart
+
 .TP
 .B timew week [<interval>] [<tag> ...]
 The week command shows a chart depicting a single week (current week by