diff --git a/bin/delv/delv.html b/bin/delv/delv.html
index c9bbb3c5bf..ae21e2b5c4 100644
--- a/bin/delv/delv.html
+++ b/bin/delv/delv.html
@@ -396,7 +396,7 @@
 <dt><span class="term"><code class="option">+[no]all</code></span></dt>
 <dd><p>
 	      Set or clear the display options
-	      <code class="option">+[no]comments</code>, 
+	      <code class="option">+[no]comments</code>,
 	      <code class="option">+[no]rrcomments</code>, and
 	      <code class="option">+[no]trust</code> as a group.
 	    </p></dd>
diff --git a/bin/python/dnssec-coverage.html b/bin/python/dnssec-coverage.html
index 99cf1008cc..867b1468fd 100644
--- a/bin/python/dnssec-coverage.html
+++ b/bin/python/dnssec-coverage.html
@@ -79,7 +79,7 @@
 <p>
             The length of time to check for DNSSEC coverage.  Key events
             scheduled further into the future than <code class="option">duration</code>
-            will be ignored, and assumed to be correct.  
+            will be ignored, and assumed to be correct.
           </p>
 <p>
             The value of <code class="option">duration</code> can be set in seconds,
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 8b402f2349..fb700abc6d 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -135,7 +135,7 @@ XSRCS =		adb_test.c \
 
 @BIND9_MAKE_RULES@
 
-# disable optimization for backtrace test to get the expected result	
+# disable optimization for backtrace test to get the expected result
 BTTEST_CFLAGS =	${BACKTRACECFLAGS} ${EXT_CFLAGS} ${ALL_CPPFLAGS} -g \
 		${ALWAYS_WARNINGS} ${STD_CWARNINGS} ${CWARNINGS}
 
diff --git a/bin/tests/system/fetchlimit/Makefile.in b/bin/tests/system/fetchlimit/Makefile.in
index 5540f36318..fffd969454 100644
--- a/bin/tests/system/fetchlimit/Makefile.in
+++ b/bin/tests/system/fetchlimit/Makefile.in
@@ -25,7 +25,7 @@ CINCLUDES =	${ISC_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	
+DNSLIBS =
 ISCLIBS =	.
 
 DNSDEPLIBS =
diff --git a/doc/xsl/Makefile.in b/doc/xsl/Makefile.in
index ed925ca41c..da9881477d 100644
--- a/doc/xsl/Makefile.in
+++ b/doc/xsl/Makefile.in
@@ -23,4 +23,4 @@ TARGETS =
 
 distclean::
 	rm -f isc-docbook-chunk.xsl isc-docbook-html.xsl \
-	      isc-manpage.xsl isc-notes-html.xsl 
+	      isc-manpage.xsl isc-notes-html.xsl
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index ac63ec5925..25ad74d067 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -57,7 +57,7 @@ PKCS11LINKOBJS	= pkcs11dh_link.@O@ pkcs11dsa_link.@O@ pkcs11rsa_link.@O@ \
 
 DSTOBJS =	@DST_EXTRA_OBJS@ @OPENSSLLINKOBJS@ @PKCS11LINKOBJS@ \
 		dst_api.@O@ dst_lib.@O@ dst_parse.@O@ dst_result.@O@ \
-		gssapi_link.@O@ gssapictx.@O@ hmac_link.@O@ key.@O@ 
+		gssapi_link.@O@ gssapictx.@O@ hmac_link.@O@ key.@O@
 
 GEOIPLINKOBJS = geoip.@O@
 
@@ -98,7 +98,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ @OPENSSLLINKSRCS@ @PKCS11LINKSRCS@ \
 		dst_result.c gssapi_link.c gssapictx.c \
 		hmac_link.c key.c
 
-GEOIOLINKSRCS = geoip.c 
+GEOIOLINKSRCS = geoip.c
 
 DNSSRCS =	acache.c acl.c adb.c byaddr.c \
 		cache.c callbacks.c clientinfo.c compress.c \
diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 1864786e6e..322bc35c79 100644
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -59,7 +59,7 @@ SRCS =		db_test.c \
 		time_test.c \
 		update_test.c \
 		zonemgr_test.c \
-		zt_test.c 
+		zt_test.c
 
 SUBDIRS =
 TARGETS =	db_test@EXEEXT@ \
@@ -213,5 +213,5 @@ clean distclean::
 	rm -f ${TARGETS}
 	rm -f atf.out
 	rm -f testdata/master/master12.data testdata/master/master13.data \
-		testdata/master/master14.data 
+		testdata/master/master14.data
 	rm -f zone.bin
diff --git a/util/update_copyrights b/util/update_copyrights
index d8aad3c1a7..e85473c61d 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -559,7 +559,9 @@ foreach $file (keys %file_types) {
 				$body = "$body$_";
 			}
 			$_ = $body;
-		} elsif ($type eq "SGML" && $sysyears =~ /$this_year/) {
+		} elsif (($type eq "SGML" || $type eq "HTML" ||
+			  $type eq "MAKE") &&
+		         $sysyears =~ /$this_year/) {
 			my $body = "";
 			while (<SOURCE>) {
 			# Remove trailing white space.