diff --git a/bin/tools/isc-hmac-fixup.docbook b/bin/tools/isc-hmac-fixup.docbook
index 2d2774a2ae..1558e1a136 100644
--- a/bin/tools/isc-hmac-fixup.docbook
+++ b/bin/tools/isc-hmac-fixup.docbook
@@ -1,4 +1,3 @@
-<!-- Converted by db4-upgrade version 1.0 -->
 <!--
  - Copyright (C) 2010, 2012-2015  Internet Systems Consortium, Inc. ("ISC")
  -
@@ -14,6 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
+<!-- Converted by db4-upgrade version 1.0 -->
 <refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.isc-hmac-fixup">
   <info>
     <date>2013-04-28</date>
diff --git a/util/copyrights b/util/copyrights
index 3c99ac668a..1a99eafdb8 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -3009,10 +3009,8 @@
 ./doc/arm/dlz.xml				SGML	2012,2013,2014,2015
 ./doc/arm/dnssec.xml				SGML	2010,2011,2015
 ./doc/arm/dyndb.xml				SGML	2015
-./doc/arm/html-fixup.pl				PERL	2015
 ./doc/arm/isc-logo.eps				X	2005,2010
 ./doc/arm/isc-logo.pdf				X	2005,2010
-./doc/arm/latex-fixup.pl			PERL	2005,2007,2012,2015
 ./doc/arm/libdns.xml				SGML	2010,2014
 ./doc/arm/logging-categories.xml		SGML	2015
 ./doc/arm/man.arpaname.html			X	2009,2010,2011,2012,2013,2014,2015
@@ -3111,12 +3109,9 @@
 ./doc/xsl/copyright.xsl				SGML	2005,2007,2009
 ./doc/xsl/isc-docbook-chunk.xsl.in		SGML	2005,2007,2014
 ./doc/xsl/isc-docbook-html.xsl.in		SGML	2005,2007,2014
-./doc/xsl/isc-docbook-latex-mappings.xml	SGML	2005,2007
-./doc/xsl/isc-docbook-latex.xsl.in		SGML	2005,2007,2010,2014,2015
 ./doc/xsl/isc-docbook-text.xsl			SGML	2005,2007
 ./doc/xsl/isc-manpage.xsl.in			SGML	2005,2007
 ./doc/xsl/isc-notes-html.xsl.in			SGML	2015
-./doc/xsl/isc-notes-latex.xsl.in		SGML	2014,2015
 ./doc/xsl/pre-latex.xsl				SGML	2005,2007
 ./docutil/HTML_COPYRIGHT			X	2001,2004
 ./docutil/MAN_COPYRIGHT				X	2001,2004
@@ -3173,8 +3168,8 @@
 ./lib/dns/dns64.c				C	2010,2011,2014
 ./lib/dns/dnssec.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
 ./lib/dns/dnstap.c				C	2015
-./lib/dns/dnstap.pb-c.c				C	2015
-./lib/dns/dnstap.pb-c.h				C	2015
+./lib/dns/dnstap.pb-c.c				X	2015
+./lib/dns/dnstap.pb-c.h				X	2015
 ./lib/dns/dnstap.proto				X	2015
 ./lib/dns/ds.c					C	2002,2003,2004,2005,2006,2007,2010,2012,2014
 ./lib/dns/dst_api.c				C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
@@ -3220,7 +3215,7 @@
 ./lib/dns/include/dns/dns64.h			C	2010,2014
 ./lib/dns/include/dns/dnssec.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014
 ./lib/dns/include/dns/dnstap.h			C	2015
-./lib/dns/include/dns/dnstap.pb-c.h		C	2015
+./lib/dns/include/dns/dnstap.pb-c.h		X	2015
 ./lib/dns/include/dns/ds.h			C	2002,2004,2005,2006,2007,2010,2012,2014
 ./lib/dns/include/dns/dsdigest.h		C	2012
 ./lib/dns/include/dns/dyndb.h			C	2015
diff --git a/util/update_copyrights b/util/update_copyrights
index 8c2b35215b..aa7d676376 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -314,7 +314,7 @@ foreach $file (keys %file_types) {
                 }
         } elsif ($sgml_comment) {
 		$before_copyright = "";
-                while (/^<!DOCTYPE/ || /^<\?xml-stylesheet/ || /^<\?xml /) {
+                while (/^<!DOCTYPE/ || /^<!ENTITY/ || /^<\?xml-stylesheet/ || /^<\?xml /) {
 			# print "SGML: $_";
 			$before_copyright = "$before_copyright$_";
 			if (/>$/ ) {
@@ -332,7 +332,7 @@ foreach $file (keys %file_types) {
 				next;
 			}
                 }
-                if (/^<!/) {
+                if (/^<!--/) {
                         $_ = <SOURCE> if $_ eq "<!--\n";
                         if ($_ !~ /[Cc]opyright/) {
                                 print "$file: non-copyright comment\n";