diff --git a/admin/ktutil.8 b/admin/ktutil.8
index 5d4671f8c..46d0380fe 100644
--- a/admin/ktutil.8
+++ b/admin/ktutil.8
@@ -64,8 +64,9 @@ to
 .Op Fl p Ar admin principal
 .Op Fl -principal= Ns Ar admin principal
 .Oo Fl e Ar enctype \*(Ba Xo
-.Fl -enctypes= Ns Ar enctype Oc
+.Fl -enctypes= Ns Ar enctype
 .Xc
+.Oc
 .Op Fl r Ar realm
 .Op Fl -realm= Ns Ar realm
 .Op Fl a Ar admin server
diff --git a/kdc/hprop.8 b/kdc/hprop.8
index 9e2680cf3..416799bd9 100644
--- a/kdc/hprop.8
+++ b/kdc/hprop.8
@@ -9,27 +9,33 @@
 .Sh SYNOPSIS
 .Nm
 .Oo Fl m Ar file \*(Ba Xo
-.Fl -master-key= Ns Pa file Oc
+.Fl -master-key= Ns Pa file
 .Xc
+.Oc
 .Oo Fl d Ar file \*(Ba Xo
-.Fl -database= Ns Pa file Oc
+.Fl -database= Ns Pa file
 .Xc
+.Oc
 .Op Fl -source= Ns Ar heimdal|mit-dump|krb4-db|krb4-dump
 .Op Fl 4 | Fl -v4-db
 .Op Fl K | Fl -ka-db
 .Oo Fl c Ar cell \*(Ba Xo
-.Fl -cell= Ns Ar cell Oc
+.Fl -cell= Ns Ar cell
 .Xc
+.Oc
 .Op Fl S | Fl -kaspecials
 .Oo Fl r Ar string \*(Ba Xo
-.Fl -v4-realm= Ns Ar string Oc
+.Fl -v4-realm= Ns Ar string
 .Xc
+.Oc
 .Oo Fl k Ar keytab \*(Ba Xo
-.Fl -keytab= Ns Ar keytab Oc
+.Fl -keytab= Ns Ar keytab
 .Xc
+.Oc
 .Oo Fl R Ar string \*(Ba Xo
-.Fl -v5-realm= Ns Ar string Oc
+.Fl -v5-realm= Ns Ar string
 .Xc
+.Oc
 .Op Fl D | Fl -decrypt
 .Op Fl E | Fl -encrypt
 .Op Fl n | Fl -stdout
diff --git a/kdc/hpropd.8 b/kdc/hpropd.8
index 276977c63..54f0ba84a 100644
--- a/kdc/hpropd.8
+++ b/kdc/hpropd.8
@@ -9,14 +9,16 @@
 .Sh SYNOPSIS
 .Nm
 .Oo Fl d Ar file \*(Ba Xo
-.Fl -database= Ns Ar file Oc
+.Fl -database= Ns Ar file
 .Xc
+.Oc
 .Op Fl n | Fl -stdin
 .Op Fl -print
 .Op Fl i | Fl -no-inetd
 .Oo Fl k Ar keytab \*(Ba Xo
-.Fl -keytab= Ns Ar keytab Oc
+.Fl -keytab= Ns Ar keytab
 .Xc
+.Oc
 .Op Fl 4 | Fl -v4dump
 .Sh DESCRIPTION
 .Nm
diff --git a/kdc/kdc.8 b/kdc/kdc.8
index 523f72005..a8b43ed00 100644
--- a/kdc/kdc.8
+++ b/kdc/kdc.8
@@ -9,20 +9,23 @@
 .Sh SYNOPSIS
 .Nm
 .Oo Fl c Ar file \*(Ba Xo
-.Fl -config-file= Ns Ar file Oc
+.Fl -config-file= Ns Ar file
 .Xc
+.Oc
 .Op Fl p | Fl -no-require-preauth
 .Op Fl -max-request= Ns Ar size
 .Op Fl H | Fl -enable-http
 .Oo Fl r Ar string \*(Ba Xo
-.Fl -v4-realm= Ns Ar string Oc
+.Fl -v4-realm= Ns Ar string
 .Xc
+.Oc
 .Op Fl K | Fl -no-kaserver
 .Op Fl r Ar realm
 .Op Fl -v4-realm= Ns Ar realm
 .Oo Fl P Ar string \*(Ba Xo
-.Fl -ports= Ns Ar string Oc
+.Fl -ports= Ns Ar string
 .Xc
+.Oc
 .Op Fl -addresses= Ns Ar list of addresses
 .Sh DESCRIPTION
 .Nm
diff --git a/kdc/kstash.8 b/kdc/kstash.8
index 809440b5c..ef2d6845b 100644
--- a/kdc/kstash.8
+++ b/kdc/kstash.8
@@ -9,11 +9,13 @@
 .Sh SYNOPSIS
 .Nm
 .Oo Fl e Ar string \*(Ba Xo
-.Fl -enctype= Ns Ar string Oc
+.Fl -enctype= Ns Ar string
 .Xc
+.Oc
 .Oo Fl k Ar file \*(Ba Xo
-.Fl -key-file= Ns Ar file Oc
+.Fl -key-file= Ns Ar file
 .Xc
+.Oc
 .Op Fl -convert-file
 .Op Fl -master-key-fd= Ns Ar fd
 .Op Fl h | Fl -help
diff --git a/kdc/string2key.8 b/kdc/string2key.8
index 5f6658a3a..a0eb1dbd9 100644
--- a/kdc/string2key.8
+++ b/kdc/string2key.8
@@ -12,17 +12,21 @@
 .Op Fl 4 | Fl -version4
 .Op Fl a | Fl -afs
 .Oo Fl c Ar cell \*(Ba Xo
-.Fl -cell= Ns Ar cell Oc
+.Fl -cell= Ns Ar cell
 .Xc
+.Oc
 .Oo Fl w Ar password \*(Ba Xo
-.Fl -password= Ns Ar password Oc
+.Fl -password= Ns Ar password
 .Xc
+.Oc
 .Oo Fl p Ar principal \*(Ba Xo
-.Fl -principal= Ns Ar principal Oc
+.Fl -principal= Ns Ar principal
 .Xc
+.Oc
 .Oo Fl k Ar string \*(Ba Xo
-.Fl -keytype= Ns Ar string Oc
+.Fl -keytype= Ns Ar string
 .Xc
+.Oc
 .Ar password
 .Sh DESCRIPTION
 .Nm
diff --git a/kpasswd/kpasswdd.8 b/kpasswd/kpasswdd.8
index f0027001c..5b505985e 100644
--- a/kpasswd/kpasswdd.8
+++ b/kpasswd/kpasswdd.8
@@ -11,14 +11,17 @@
 .Op Fl -check-library= Ns Ar library
 .Op Fl -check-function= Ns Ar function
 .Oo Fl k Ar kspec \*(Ba Xo
-.Fl -keytab= Ns Ar kspec Oc
+.Fl -keytab= Ns Ar kspec
 .Xc
+.Oc
 .Oo Fl r Ar realm \*(Ba Xo
-.Fl -realm= Ns Ar realm Oc
+.Fl -realm= Ns Ar realm
 .Xc
+.Oc
 .Oo Fl p Ar string \*(Ba Xo
-.Fl -port= Ns Ar string Oc
+.Fl -port= Ns Ar string
 .Xc
+.Oc
 .Op Fl -version
 .Op Fl -help
 .Sh DESCRIPTION
diff --git a/kuser/kinit.1 b/kuser/kinit.1
index 16fdadc8e..14613cd8c 100644
--- a/kuser/kinit.1
+++ b/kuser/kinit.1
@@ -12,32 +12,39 @@
 .Op Fl 4 | Fl -524init
 .Op Fl -afslog
 .Oo Fl c Ar cachename \*(Ba Xo
-.Fl -cache= Ns Ar cachename Oc
+.Fl -cache= Ns Ar cachename
 .Xc
+.Oc
 .Op Fl f | Fl -forwardable
 .Oo Fl t Ar keytabname \*(Ba Xo
-.Fl -keytab= Ns Ar keytabname Oc
+.Fl -keytab= Ns Ar keytabname
 .Xc
+.Oc
 .Oo Fl l Ar time \*(Ba Xo
-.Fl -lifetime= Ns Ar time Oc
+.Fl -lifetime= Ns Ar time
 .Xc
+.Oc
 .Op Fl p | Fl -proxiable
 .Op Fl R | Fl -renew
 .Op Fl -renewable
 .Oo Fl r Ar time \*(Ba Xo
-.Fl -renewable-life= Ns Ar time Oc
+.Fl -renewable-life= Ns Ar time
 .Xc
+.Oc
 .Oo Fl S Ar principal \*(Ba Xo
-.Fl -server= Ns Ar principal Oc
+.Fl -server= Ns Ar principal
 .Xc
+.Oc
 .Oo Fl s Ar time \*(Ba Xo
-.Fl -start-time= Ns Ar time Oc
+.Fl -start-time= Ns Ar time
 .Xc
+.Oc
 .Op Fl k | Fl -use-keytab
 .Op Fl v | Fl -validate
 .Oo Fl e Ar enctype \*(Ba Xo
-.Fl -enctypes= Ns Ar enctype Oc
+.Fl -enctypes= Ns Ar enctype
 .Xc
+.Oc
 .Op Fl -fcache-version= Ns Ar integer
 .Op Fl -no-addresses
 .Op Fl -anonymous
diff --git a/kuser/klist.1 b/kuser/klist.1
index 81a121c24..a7eb59f34 100644
--- a/kuser/klist.1
+++ b/kuser/klist.1
@@ -9,8 +9,9 @@
 .Sh SYNOPSIS
 .Nm
 .Oo Fl c Ar cache \*(Ba Xo
-.Fl -cache= Ns Ar cache Oc
+.Fl -cache= Ns Ar cache
 .Xc
+.Oc
 .Op Fl s | Fl t | Fl -test
 .Op Fl 4 | Fl -v4
 .Op Fl T | Fl -tokens