diff -ur xkcdpass-1.17.6/xkcdpass.1 xkcdpass-1.17.6.new/xkcdpass.1
--- xkcdpass-1.17.6/xkcdpass.1	2021-02-26 12:58:59.441739487 -0600
+++ xkcdpass-1.17.6.new/xkcdpass.1	2021-02-26 13:11:21.195161091 -0600
@@ -1,40 +1,14 @@
-.SH xkcdpass
-.SS generate memorable, secure multiword passphrases
-.TP
-.B Author
-|authorname| |authoremail|
-.RS
-.RE
-.TP
-.B Date
-2015\-01\-17
-.RS
-.RE
-.TP
-.B Copyright
-BSD license, attribution and disclaimer required, no endorsement
-allowed.
-.RS
-.RE
-.TP
-.B Manual section
-1
-.RS
-.RE
-.TP
-.B Manual group
-Admin
-.RS
-.RE
-.SS SYNOPSIS
-.PP
-\f[B]xkcdpass\f[] [ option ...
-]
-.PD 0
-.P
-.PD
-\f[B]xkcdpass\f[] \f[B]\-\-help\f[]
-.SS DESCRIPTION
+.TH xkcdpass 1
+.SH NAME
+xkcdpass - generate memorable, secure multiword passphrases
+.SH SYNOPSIS
+.PP
+.B xkcdpass
+[ options ]
+.br
+.B xkcdpass
+--help
+.SH DESCRIPTION
 .PP
 A flexible and scriptable password generator which generates strong
 passphrases, inspired by XKCD 936:
@@ -45,7 +19,7 @@
 >\ correct\ horse\ battery\ staple
 \f[]
 .fi
-.SS OPTIONS
+.SH OPTIONS
 .PP
 \f[B]\-\-help\f[]
 .RS
@@ -156,22 +130,14 @@
 \f[]
 .fi
 .RE
-.SS HISTORY
+.SH HISTORY
 .PP
 The \f[B]xkcdpass\f[] command invokes the Python program
 \f[C]xkcd_password.py\f[].
 .PP
-The inspiration for the program\[aq]s purpose is the XKCD 936_ “Password
+The inspiration for the program\[aq]s purpose is the XKCD 936 “Password
 Strength” cartoon.
 .PP
 The application is maintained by Steven Tobin <<steven@steventob.in>>.
 .PP
 This manual page was written by |authorname| |authoremail|.
-.SS 
-.RS
-.PP
-Local variables: mode: rst coding: utf\-8 time\-stamp\-format:
-"%:y\-%02m\-%02d" time\-stamp\-start: "^:Date:[ ]+" time\-stamp\-end:
-"$" time\-stamp\-line\-limit: 20 End: vim: filetype=rst
-fileencoding=utf\-8 :
-.RE