From 4419606c9d2a52536a6dd0882ac0c7068ac27f30 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Fri, 22 May 2020 15:44:27 +0200
Subject: [PATCH] Revise installation locations for BIND binaries

Move BIND binaries which are neither daemons nor administrative programs
to $bindir.  This results in only the following binaries being left in
$sbindir:

  - ddns-confgen
  - named
  - rndc
  - rndc-confgen
  - tsig-confgen
---
 bin/check/Makefile.am                         |  8 ++---
 bin/confgen/Makefile.am                       |  2 +-
 bin/dnssec/Makefile.am                        |  2 +-
 bin/tools/Makefile.am                         |  8 ++---
 contrib/scripts/zone-edit.sh.in               |  3 +-
 doc/man/Makefile.am                           | 36 +++++++++----------
 doc/man/conf.py                               | 36 +++++++++----------
 doc/man/{dnssec-cds.8in => dnssec-cds.1in}    |  2 +-
 ...sec-dsfromkey.8in => dnssec-dsfromkey.1in} |  2 +-
 ...sec-importkey.8in => dnssec-importkey.1in} |  2 +-
 ...yfromlabel.8in => dnssec-keyfromlabel.1in} |  2 +-
 .../{dnssec-keygen.8in => dnssec-keygen.1in}  |  2 +-
 .../{dnssec-revoke.8in => dnssec-revoke.1in}  |  2 +-
 ...{dnssec-settime.8in => dnssec-settime.1in} |  2 +-
 ...nssec-signzone.8in => dnssec-signzone.1in} |  2 +-
 .../{dnssec-verify.8in => dnssec-verify.1in}  |  2 +-
 ...amed-checkconf.8in => named-checkconf.1in} |  2 +-
 ...amed-checkzone.8in => named-checkzone.1in} |  2 +-
 ...ournalprint.8in => named-journalprint.1in} |  2 +-
 .../{named-nzd2nzf.8in => named-nzd2nzf.1in}  |  2 +-
 doc/man/{nsec3hash.8in => nsec3hash.1in}      |  2 +-
 ...{pkcs11-destroy.8in => pkcs11-destroy.1in} |  2 +-
 .../{pkcs11-keygen.8in => pkcs11-keygen.1in}  |  2 +-
 doc/man/{pkcs11-list.8in => pkcs11-list.1in}  |  2 +-
 .../{pkcs11-tokens.8in => pkcs11-tokens.1in}  |  2 +-
 25 files changed, 64 insertions(+), 67 deletions(-)
 rename doc/man/{dnssec-cds.8in => dnssec-cds.1in} (99%)
 rename doc/man/{dnssec-dsfromkey.8in => dnssec-dsfromkey.1in} (98%)
 rename doc/man/{dnssec-importkey.8in => dnssec-importkey.1in} (98%)
 rename doc/man/{dnssec-keyfromlabel.8in => dnssec-keyfromlabel.1in} (99%)
 rename doc/man/{dnssec-keygen.8in => dnssec-keygen.1in} (99%)
 rename doc/man/{dnssec-revoke.8in => dnssec-revoke.1in} (97%)
 rename doc/man/{dnssec-settime.8in => dnssec-settime.1in} (99%)
 rename doc/man/{dnssec-signzone.8in => dnssec-signzone.1in} (99%)
 rename doc/man/{dnssec-verify.8in => dnssec-verify.1in} (98%)
 rename doc/man/{named-checkconf.8in => named-checkconf.1in} (98%)
 rename doc/man/{named-checkzone.8in => named-checkzone.1in} (99%)
 rename doc/man/{named-journalprint.8in => named-journalprint.1in} (96%)
 rename doc/man/{named-nzd2nzf.8in => named-nzd2nzf.1in} (95%)
 rename doc/man/{nsec3hash.8in => nsec3hash.1in} (97%)
 rename doc/man/{pkcs11-destroy.8in => pkcs11-destroy.1in} (97%)
 rename doc/man/{pkcs11-keygen.8in => pkcs11-keygen.1in} (97%)
 rename doc/man/{pkcs11-list.8in => pkcs11-list.1in} (96%)
 rename doc/man/{pkcs11-tokens.8in => pkcs11-tokens.1in} (95%)

diff --git a/bin/check/Makefile.am b/bin/check/Makefile.am
index dc0d52554d..fd8e51ba65 100644
--- a/bin/check/Makefile.am
+++ b/bin/check/Makefile.am
@@ -24,11 +24,11 @@ LDADD =				\
 	$(LIBISCCFG_LIBS)	\
 	$(LIBBIND9_LIBS)
 
-sbin_PROGRAMS = named-checkconf named-checkzone
+bin_PROGRAMS = named-checkconf named-checkzone
 
 install-exec-hook:
-	ln -f $(DESTDIR)$(sbindir)/named-checkzone \
-	      $(DESTDIR)$(sbindir)/named-compilezone
+	ln -f $(DESTDIR)$(bindir)/named-checkzone \
+	      $(DESTDIR)$(bindir)/named-compilezone
 
 uninstall-hook:
-	-rm -f $(DESTDIR)$(sbindir)/named-compilezone
+	-rm -f $(DESTDIR)$(bindir)/named-compilezone
diff --git a/bin/confgen/Makefile.am b/bin/confgen/Makefile.am
index d9e917bb10..7d0f41dc37 100644
--- a/bin/confgen/Makefile.am
+++ b/bin/confgen/Makefile.am
@@ -20,7 +20,7 @@ libconfgen_la_SOURCES =		\
 	util.c			\
 	unix/os.c
 
-sbin_PROGRAMS = rndc-confgen ddns-confgen
+sbin_PROGRAMS = ddns-confgen rndc-confgen
 
 install-exec-hook:
 	ln -f $(DESTDIR)$(sbindir)/ddns-confgen \
diff --git a/bin/dnssec/Makefile.am b/bin/dnssec/Makefile.am
index 993d704400..7aeaccc97c 100644
--- a/bin/dnssec/Makefile.am
+++ b/bin/dnssec/Makefile.am
@@ -14,7 +14,7 @@ LDADD =				\
 	$(LIBISC_LIBS)		\
 	$(LIBDNS_LIBS)
 
-sbin_PROGRAMS = \
+bin_PROGRAMS = \
 	dnssec-cds		\
 	dnssec-dsfromkey	\
 	dnssec-importkey	\
diff --git a/bin/tools/Makefile.am b/bin/tools/Makefile.am
index 089f0bfec5..721aeb4e2e 100644
--- a/bin/tools/Makefile.am
+++ b/bin/tools/Makefile.am
@@ -10,11 +10,9 @@ LDADD =				\
 
 bin_PROGRAMS =			\
 	arpaname		\
-	named-rrchecker		\
-	mdig
-
-sbin_PROGRAMS =			\
+	mdig			\
 	named-journalprint	\
+	named-rrchecker		\
 	nsec3hash
 
 arpaname_LDADD =		\
@@ -45,7 +43,7 @@ dnstap_read_LDADD =		\
 endif
 
 if HAVE_LMDB
-sbin_PROGRAMS +=			\
+bin_PROGRAMS +=			\
 	named-nzd2nzf
 
 named_nzd2nzf_CFLAGS =		\
diff --git a/contrib/scripts/zone-edit.sh.in b/contrib/scripts/zone-edit.sh.in
index 18132f9fd4..d6393157b1 100644
--- a/contrib/scripts/zone-edit.sh.in
+++ b/contrib/scripts/zone-edit.sh.in
@@ -16,10 +16,9 @@ trap "/bin/rm -rf ${dir}" 0
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
-sbindir=@sbindir@
 
 dig=${bindir}/dig
-checkzone=${sbindir}/named-checkzone
+checkzone=${bindir}/named-checkzone
 nsupdate=${bindir}/nsupdate
 
 case $# in
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index eb31281d0d..5e661068a7 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -50,31 +50,31 @@ man_MANS =				\
 	named.conf.5			\
 	rndc.conf.5			\
 	ddns-confgen.8			\
-	dnssec-cds.8			\
-	dnssec-dsfromkey.8		\
-	dnssec-importkey.8		\
-	dnssec-keyfromlabel.8		\
-	dnssec-keygen.8			\
-	dnssec-revoke.8			\
-	dnssec-settime.8		\
-	dnssec-signzone.8		\
-	dnssec-verify.8			\
+	dnssec-cds.1			\
+	dnssec-dsfromkey.1		\
+	dnssec-importkey.1		\
+	dnssec-keyfromlabel.1		\
+	dnssec-keygen.1			\
+	dnssec-revoke.1			\
+	dnssec-settime.1		\
+	dnssec-signzone.1		\
+	dnssec-verify.1			\
 	filter-aaaa.8			\
-	named-checkconf.8		\
-	named-checkzone.8		\
-	named-journalprint.8		\
-	named-nzd2nzf.8			\
+	named-checkconf.1		\
+	named-checkzone.1		\
+	named-journalprint.1		\
+	named-nzd2nzf.1			\
 	named.8				\
-	nsec3hash.8			\
+	nsec3hash.1			\
 	rndc-confgen.8			\
 	rndc.8
 
 if HAVE_PKCS11
 man_MANS +=				\
-	pkcs11-destroy.8		\
-	pkcs11-keygen.8			\
-	pkcs11-list.8			\
-	pkcs11-tokens.8
+	pkcs11-destroy.1		\
+	pkcs11-keygen.1			\
+	pkcs11-list.1			\
+	pkcs11-tokens.1
 endif HAVE_PKCS11
 
 MANPAGES_IN =				\
diff --git a/doc/man/conf.py b/doc/man/conf.py
index 0f56c8647b..03d70dd7e0 100644
--- a/doc/man/conf.py
+++ b/doc/man/conf.py
@@ -63,33 +63,33 @@ man_pages = [
     ('ddns-confgen', 'ddns-confgen', 'ddns key generation tool', author, 8),
     ('delv', 'delv', 'DNS lookup and validation utility', author, 1),
     ('dig', 'dig', 'DNS lookup utility', author, 1),
-    ('dnssec-cds', 'dnssec-cds', 'change DS records for a child zone based on CDS/CDNSKEY', author, 8),
-    ('dnssec-dsfromkey', 'dnssec-dsfromkey', 'DNSSEC DS RR generation tool', author, 8),
-    ('dnssec-importkey', 'dnssec-importkey', 'import DNSKEY records from external systems so they can be managed', author, 8),
-    ('dnssec-keyfromlabel', 'dnssec-keyfromlabel', 'DNSSEC key generation tool', author, 8),
-    ('dnssec-keygen', 'dnssec-keygen', 'DNSSEC key generation tool', author, 8),
-    ('dnssec-revoke', 'dnssec-revoke', 'set the REVOKED bit on a DNSSEC key', author, 8),
-    ('dnssec-settime', 'dnssec-settime', 'set the key timing metadata for a DNSSEC key', author, 8),
-    ('dnssec-signzone', 'dnssec-signzone', 'DNSSEC zone signing tool', author, 8),
-    ('dnssec-verify', 'dnssec-verify', 'DNSSEC zone verification tool', author, 8),
+    ('dnssec-cds', 'dnssec-cds', 'change DS records for a child zone based on CDS/CDNSKEY', author, 1),
+    ('dnssec-dsfromkey', 'dnssec-dsfromkey', 'DNSSEC DS RR generation tool', author, 1),
+    ('dnssec-importkey', 'dnssec-importkey', 'import DNSKEY records from external systems so they can be managed', author, 1),
+    ('dnssec-keyfromlabel', 'dnssec-keyfromlabel', 'DNSSEC key generation tool', author, 1),
+    ('dnssec-keygen', 'dnssec-keygen', 'DNSSEC key generation tool', author, 1),
+    ('dnssec-revoke', 'dnssec-revoke', 'set the REVOKED bit on a DNSSEC key', author, 1),
+    ('dnssec-settime', 'dnssec-settime', 'set the key timing metadata for a DNSSEC key', author, 1),
+    ('dnssec-signzone', 'dnssec-signzone', 'DNSSEC zone signing tool', author, 1),
+    ('dnssec-verify', 'dnssec-verify', 'DNSSEC zone verification tool', author, 1),
     ('dnstap-read', 'dnstap-read', 'print dnstap data in human-readable form', author, 1),
     ('filter-aaaa', 'filter-aaaa', 'filter AAAA in DNS responses when A is present', author, 8),
     ('host', 'host', 'DNS lookup utility', author, 1),
     ('mdig', 'mdig', 'DNS pipelined lookup utility', author, 1),
-    ('named-checkconf', 'named-checkconf', 'named configuration file syntax checking tool', author, 8),
-    ('named-checkzone', 'named-checkzone', 'zone file validity checking or converting tool', author, 8),
-    ('named-journalprint', 'named-journalprint', 'print zone journal in human-readable form', author, 8),
-    ('named-nzd2nzf', 'named-nzd2nzf', 'convert an NZD database to NZF text format', author, 8),
+    ('named-checkconf', 'named-checkconf', 'named configuration file syntax checking tool', author, 1),
+    ('named-checkzone', 'named-checkzone', 'zone file validity checking or converting tool', author, 1),
+    ('named-journalprint', 'named-journalprint', 'print zone journal in human-readable form', author, 1),
+    ('named-nzd2nzf', 'named-nzd2nzf', 'convert an NZD database to NZF text format', author, 1),
     ('named-rrchecker', 'named-rrchecker', 'syntax checker for individual DNS resource records', author, 1),
     ('named.conf', 'named.conf', 'configuration file for **named**', author, 5),
     ('named', 'named', 'Internet domain name server', author, 8),
-    ('nsec3hash', 'nsec3hash', 'generate NSEC3 hash', author, 8),
+    ('nsec3hash', 'nsec3hash', 'generate NSEC3 hash', author, 1),
     ('nslookup', 'nslookup', 'query Internet name servers interactively', author, 1),
     ('nsupdate', 'nsupdate', 'dynamic DNS update utility', author, 1),
-    ('pkcs11-destroy', 'pkcs11-destroy', 'destroy PKCS#11 objects', author, 8),
-    ('pkcs11-keygen', 'pkcs11-keygen', 'generate keys on a PKCS#11 device', author, 8),
-    ('pkcs11-list', 'pkcs11-list', 'list PKCS#11 objects', author, 8),
-    ('pkcs11-tokens', 'pkcs11-tokens', 'list PKCS#11 available tokens', author, 8),
+    ('pkcs11-destroy', 'pkcs11-destroy', 'destroy PKCS#11 objects', author, 1),
+    ('pkcs11-keygen', 'pkcs11-keygen', 'generate keys on a PKCS#11 device', author, 1),
+    ('pkcs11-list', 'pkcs11-list', 'list PKCS#11 objects', author, 1),
+    ('pkcs11-tokens', 'pkcs11-tokens', 'list PKCS#11 available tokens', author, 1),
     ('rndc-confgen', 'rndc-confgen', 'rndc key generation tool', author, 8),
     ('rndc.conf', 'rndc.conf', 'rndc configuration file', author, 5),
     ('rndc', 'rndc', 'name server control utility', author, 8),
diff --git a/doc/man/dnssec-cds.8in b/doc/man/dnssec-cds.1in
similarity index 99%
rename from doc/man/dnssec-cds.8in
rename to doc/man/dnssec-cds.1in
index a254fb99f7..6b8bbef361 100644
--- a/doc/man/dnssec-cds.8in
+++ b/doc/man/dnssec-cds.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-CDS" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-CDS" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 dnssec-cds \- change DS records for a child zone based on CDS/CDNSKEY
 .
diff --git a/doc/man/dnssec-dsfromkey.8in b/doc/man/dnssec-dsfromkey.1in
similarity index 98%
rename from doc/man/dnssec-dsfromkey.8in
rename to doc/man/dnssec-dsfromkey.1in
index aa708b45a8..63605d647c 100644
--- a/doc/man/dnssec-dsfromkey.8in
+++ b/doc/man/dnssec-dsfromkey.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-DSFROMKEY" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-DSFROMKEY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 dnssec-dsfromkey \- DNSSEC DS RR generation tool
 .
diff --git a/doc/man/dnssec-importkey.8in b/doc/man/dnssec-importkey.1in
similarity index 98%
rename from doc/man/dnssec-importkey.8in
rename to doc/man/dnssec-importkey.1in
index 73f0d10af4..cc941ac00f 100644
--- a/doc/man/dnssec-importkey.8in
+++ b/doc/man/dnssec-importkey.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-IMPORTKEY" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-IMPORTKEY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 dnssec-importkey \- import DNSKEY records from external systems so they can be managed
 .
diff --git a/doc/man/dnssec-keyfromlabel.8in b/doc/man/dnssec-keyfromlabel.1in
similarity index 99%
rename from doc/man/dnssec-keyfromlabel.8in
rename to doc/man/dnssec-keyfromlabel.1in
index 7943796541..b942500d0c 100644
--- a/doc/man/dnssec-keyfromlabel.8in
+++ b/doc/man/dnssec-keyfromlabel.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-KEYFROMLABEL" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-KEYFROMLABEL" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 dnssec-keyfromlabel \- DNSSEC key generation tool
 .
diff --git a/doc/man/dnssec-keygen.8in b/doc/man/dnssec-keygen.1in
similarity index 99%
rename from doc/man/dnssec-keygen.8in
rename to doc/man/dnssec-keygen.1in
index b6e16efded..fda54c6f7e 100644
--- a/doc/man/dnssec-keygen.8in
+++ b/doc/man/dnssec-keygen.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-KEYGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-KEYGEN" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 dnssec-keygen \- DNSSEC key generation tool
 .
diff --git a/doc/man/dnssec-revoke.8in b/doc/man/dnssec-revoke.1in
similarity index 97%
rename from doc/man/dnssec-revoke.8in
rename to doc/man/dnssec-revoke.1in
index 15c30c5202..3bc25e5e74 100644
--- a/doc/man/dnssec-revoke.8in
+++ b/doc/man/dnssec-revoke.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-REVOKE" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-REVOKE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 dnssec-revoke \- set the REVOKED bit on a DNSSEC key
 .
diff --git a/doc/man/dnssec-settime.8in b/doc/man/dnssec-settime.1in
similarity index 99%
rename from doc/man/dnssec-settime.8in
rename to doc/man/dnssec-settime.1in
index b1d84ed9a0..c75e8c15cd 100644
--- a/doc/man/dnssec-settime.8in
+++ b/doc/man/dnssec-settime.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-SETTIME" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-SETTIME" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 dnssec-settime \- set the key timing metadata for a DNSSEC key
 .
diff --git a/doc/man/dnssec-signzone.8in b/doc/man/dnssec-signzone.1in
similarity index 99%
rename from doc/man/dnssec-signzone.8in
rename to doc/man/dnssec-signzone.1in
index 9b6cfdb2ee..10184a43e3 100644
--- a/doc/man/dnssec-signzone.8in
+++ b/doc/man/dnssec-signzone.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-SIGNZONE" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-SIGNZONE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 dnssec-signzone \- DNSSEC zone signing tool
 .
diff --git a/doc/man/dnssec-verify.8in b/doc/man/dnssec-verify.1in
similarity index 98%
rename from doc/man/dnssec-verify.8in
rename to doc/man/dnssec-verify.1in
index 3d07560edb..050952df69 100644
--- a/doc/man/dnssec-verify.8in
+++ b/doc/man/dnssec-verify.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DNSSEC-VERIFY" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DNSSEC-VERIFY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 dnssec-verify \- DNSSEC zone verification tool
 .
diff --git a/doc/man/named-checkconf.8in b/doc/man/named-checkconf.1in
similarity index 98%
rename from doc/man/named-checkconf.8in
rename to doc/man/named-checkconf.1in
index 40a947dd53..7ecdc326ff 100644
--- a/doc/man/named-checkconf.8in
+++ b/doc/man/named-checkconf.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NAMED-CHECKCONF" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NAMED-CHECKCONF" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 named-checkconf \- named configuration file syntax checking tool
 .
diff --git a/doc/man/named-checkzone.8in b/doc/man/named-checkzone.1in
similarity index 99%
rename from doc/man/named-checkzone.8in
rename to doc/man/named-checkzone.1in
index 9ac647b4ce..2c73ce3659 100644
--- a/doc/man/named-checkzone.8in
+++ b/doc/man/named-checkzone.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NAMED-CHECKZONE" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NAMED-CHECKZONE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 named-checkzone \- zone file validity checking or converting tool
 .
diff --git a/doc/man/named-journalprint.8in b/doc/man/named-journalprint.1in
similarity index 96%
rename from doc/man/named-journalprint.8in
rename to doc/man/named-journalprint.1in
index 5feea4aa07..734d6bb8dd 100644
--- a/doc/man/named-journalprint.8in
+++ b/doc/man/named-journalprint.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NAMED-JOURNALPRINT" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NAMED-JOURNALPRINT" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 named-journalprint \- print zone journal in human-readable form
 .
diff --git a/doc/man/named-nzd2nzf.8in b/doc/man/named-nzd2nzf.1in
similarity index 95%
rename from doc/man/named-nzd2nzf.8in
rename to doc/man/named-nzd2nzf.1in
index 56757e8a47..ff941260ad 100644
--- a/doc/man/named-nzd2nzf.8in
+++ b/doc/man/named-nzd2nzf.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NAMED-NZD2NZF" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NAMED-NZD2NZF" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 named-nzd2nzf \- convert an NZD database to NZF text format
 .
diff --git a/doc/man/nsec3hash.8in b/doc/man/nsec3hash.1in
similarity index 97%
rename from doc/man/nsec3hash.8in
rename to doc/man/nsec3hash.1in
index 860f8bcf3a..49252a4943 100644
--- a/doc/man/nsec3hash.8in
+++ b/doc/man/nsec3hash.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NSEC3HASH" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "NSEC3HASH" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 nsec3hash \- generate NSEC3 hash
 .
diff --git a/doc/man/pkcs11-destroy.8in b/doc/man/pkcs11-destroy.1in
similarity index 97%
rename from doc/man/pkcs11-destroy.8in
rename to doc/man/pkcs11-destroy.1in
index 063c0ff8d5..68d9409cf1 100644
--- a/doc/man/pkcs11-destroy.8in
+++ b/doc/man/pkcs11-destroy.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PKCS11-DESTROY" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "PKCS11-DESTROY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 pkcs11-destroy \- destroy PKCS#11 objects
 .
diff --git a/doc/man/pkcs11-keygen.8in b/doc/man/pkcs11-keygen.1in
similarity index 97%
rename from doc/man/pkcs11-keygen.8in
rename to doc/man/pkcs11-keygen.1in
index 2f3e7c5a54..7f50d6616e 100644
--- a/doc/man/pkcs11-keygen.8in
+++ b/doc/man/pkcs11-keygen.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PKCS11-KEYGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "PKCS11-KEYGEN" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 pkcs11-keygen \- generate keys on a PKCS#11 device
 .
diff --git a/doc/man/pkcs11-list.8in b/doc/man/pkcs11-list.1in
similarity index 96%
rename from doc/man/pkcs11-list.8in
rename to doc/man/pkcs11-list.1in
index 6a0a3d3368..84f43ed2a5 100644
--- a/doc/man/pkcs11-list.8in
+++ b/doc/man/pkcs11-list.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PKCS11-LIST" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "PKCS11-LIST" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 pkcs11-list \- list PKCS#11 objects
 .
diff --git a/doc/man/pkcs11-tokens.8in b/doc/man/pkcs11-tokens.1in
similarity index 95%
rename from doc/man/pkcs11-tokens.8in
rename to doc/man/pkcs11-tokens.1in
index 805a0120ec..6072b3a16b 100644
--- a/doc/man/pkcs11-tokens.8in
+++ b/doc/man/pkcs11-tokens.1in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PKCS11-TOKENS" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "PKCS11-TOKENS" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
 .SH NAME
 pkcs11-tokens \- list PKCS#11 available tokens
 .