diff --git a/util/copyrights b/util/copyrights
index 4c2711b53d..f307395204 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -78,10 +78,10 @@
 ./bin/confgen/win32/rndcconfgen.vcxproj.user	X	2013
 ./bin/delv/.gitignore				X	2014
 ./bin/delv/Makefile.in				MAKE	2014,2015
-./bin/delv/delv.1				MAN	2014,2015,2016
+./bin/delv/delv.1				MAN	DOCBOOK
 ./bin/delv/delv.c				C	2014,2015,2016
 ./bin/delv/delv.docbook				SGML	2014,2015,2016
-./bin/delv/delv.html				HTML	2014,2015,2016
+./bin/delv/delv.html				HTML	DOCBOOK
 ./bin/delv/win32/delv.dsp.in			X	2014
 ./bin/delv/win32/delv.dsw			X	2014
 ./bin/delv/win32/delv.mak.in			X	2014
@@ -133,10 +133,10 @@
 ./bin/dnssec/dnssec-dsfromkey.c			C	2008,2009,2010,2011,2012,2014,2015
 ./bin/dnssec/dnssec-dsfromkey.docbook		SGML	2008,2009,2010,2011,2012,2014,2015
 ./bin/dnssec/dnssec-dsfromkey.html		HTML	DOCBOOK
-./bin/dnssec/dnssec-importkey.8			MAN	2013,2014,2015
+./bin/dnssec/dnssec-importkey.8			MAN	DOCBOOK
 ./bin/dnssec/dnssec-importkey.c			C	2013,2014,2015
 ./bin/dnssec/dnssec-importkey.docbook		SGML	2013,2014,2015
-./bin/dnssec/dnssec-importkey.html		HTML	2013,2014,2015
+./bin/dnssec/dnssec-importkey.html		HTML	DOCBOOK
 ./bin/dnssec/dnssec-keyfromlabel.8		MAN	DOCBOOK
 ./bin/dnssec/dnssec-keyfromlabel.c		C	2007,2008,2009,2010,2011,2012,2014,2015
 ./bin/dnssec/dnssec-keyfromlabel.docbook	SGML	2008,2009,2010,2011,2012,2014,2015
@@ -157,7 +157,7 @@
 ./bin/dnssec/dnssec-signzone.c			C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./bin/dnssec/dnssec-signzone.docbook		SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015
 ./bin/dnssec/dnssec-signzone.html		HTML	DOCBOOK
-./bin/dnssec/dnssec-verify.8			MAN	2012,2014,2015
+./bin/dnssec/dnssec-verify.8			MAN	DOCBOOK
 ./bin/dnssec/dnssec-verify.c			C	2012,2014,2015
 ./bin/dnssec/dnssec-verify.docbook		SGML	2012,2014,2015
 ./bin/dnssec/dnssec-verify.html			HTML	DOCBOOK
@@ -336,10 +336,10 @@
 ./bin/pkcs11/pkcs11-list.c			X	2009,2014,2015
 ./bin/pkcs11/pkcs11-list.docbook		SGML	2009,2014,2015
 ./bin/pkcs11/pkcs11-list.html			HTML	DOCBOOK
-./bin/pkcs11/pkcs11-tokens.8			MAN	2014
+./bin/pkcs11/pkcs11-tokens.8			MAN	DOCBOOK
 ./bin/pkcs11/pkcs11-tokens.c			C	2014,2015
 ./bin/pkcs11/pkcs11-tokens.docbook		SGML	2014,2015
-./bin/pkcs11/pkcs11-tokens.html			HTML	2014
+./bin/pkcs11/pkcs11-tokens.html			HTML	DOCBOOK
 ./bin/pkcs11/win32/pk11destroy.dsp.in		X	2009,2013,2014
 ./bin/pkcs11/win32/pk11destroy.dsw		X	2009
 ./bin/pkcs11/win32/pk11destroy.mak.in		X	2009,2013,2014
@@ -366,13 +366,13 @@
 ./bin/pkcs11/win32/pk11tokens.vcxproj.user	X	2014
 ./bin/python/.gitignore				X	2012,2013
 ./bin/python/Makefile.in			MAKE	2012,2013,2014
-./bin/python/dnssec-checkds.8			MAN	2012,2013,2014,2015
+./bin/python/dnssec-checkds.8			MAN	DOCBOOK
 ./bin/python/dnssec-checkds.docbook		SGML	2012,2013,2014,2015
 ./bin/python/dnssec-checkds.html		HTML	DOCBOOK
 ./bin/python/dnssec-checkds.py.in		PYTHON	2012,2013,2014,2015
-./bin/python/dnssec-coverage.8			MAN	2013,2014,2015
+./bin/python/dnssec-coverage.8			MAN	DOCBOOK
 ./bin/python/dnssec-coverage.docbook		SGML	2013,2014,2015
-./bin/python/dnssec-coverage.html		HTML	2013,2014,2015
+./bin/python/dnssec-coverage.html		HTML	DOCBOOK
 ./bin/python/dnssec-coverage.py.in		PYTHON	2013,2014,2015
 ./bin/rndc/.gitignore				X	2012,2014
 ./bin/rndc/Makefile.in				MAKE	2000,2001,2002,2004,2007,2009,2012,2014,2015
@@ -2403,10 +2403,10 @@
 ./bin/tools/arpaname.c				C	2009,2015
 ./bin/tools/arpaname.docbook			SGML	2009,2014,2015
 ./bin/tools/arpaname.html			HTML	DOCBOOK
-./bin/tools/dnstap-read.1			MAN	2015
+./bin/tools/dnstap-read.1			MAN	DOCBOOK
 ./bin/tools/dnstap-read.c			C	2015
 ./bin/tools/dnstap-read.docbook			SGML	2015
-./bin/tools/dnstap-read.html			HTML	2015
+./bin/tools/dnstap-read.html			HTML	DOCBOOK
 ./bin/tools/genrandom.8				MAN	DOCBOOK
 ./bin/tools/genrandom.c				C	2000,2001,2002,2003,2004,2005,2007,2009,2010,2012,2014
 ./bin/tools/genrandom.docbook			SGML	2009,2010,2011,2014,2015
@@ -2423,10 +2423,10 @@
 ./bin/tools/named-journalprint.c		C	2000,2001,2004,2005,2006,2007,2008,2009,2015
 ./bin/tools/named-journalprint.docbook		SGML	2009,2014,2015
 ./bin/tools/named-journalprint.html		HTML	DOCBOOK
-./bin/tools/named-rrchecker.1			MAN	2013,2014,2015
+./bin/tools/named-rrchecker.1			MAN	DOCBOOK
 ./bin/tools/named-rrchecker.c			C	2013,2015,2016
 ./bin/tools/named-rrchecker.docbook		SGML	2013,2014,2015
-./bin/tools/named-rrchecker.html		HTML	2013,2014,2015
+./bin/tools/named-rrchecker.html		HTML	DOCBOOK
 ./bin/tools/nsec3hash.8				MAN	DOCBOOK
 ./bin/tools/nsec3hash.c				C	2006,2008,2009,2011,2014
 ./bin/tools/nsec3hash.docbook			SGML	2009,2014,2015
@@ -3202,9 +3202,9 @@
 ./docutil/patch-db2latex-nested-param-bug	X	2007
 ./docutil/patch-db2latex-xsltproc-title-bug	X	2007
 ./install-sh					X	1998,1999,2000,2001
-./isc-config.sh.1				MAN	2009,2012,2014,2015
+./isc-config.sh.1				MAN	DOCBOOK
 ./isc-config.sh.docbook				SGML	2009,2014,2015
-./isc-config.sh.html				HTML	2009,2011,2012,2014,2015
+./isc-config.sh.html				HTML	DOCBOOK
 ./isc-config.sh.in				SH	2000,2001,2003,2004,2007,2012,2013,2015
 ./lib/.gitignore				X	2012
 ./lib/Atffile					X	2011,2014