diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index ee891b4e36..320d2490d1 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1933,7 +1933,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
 			{
 				debug("config line %s", batchline);
 				bargc = split_batchline(batchline, bargv, 62,
-						        ".digrc argv");
+							".digrc argv");
 				bargv[0] = argv[0];
 				argv0 = argv[0];
 				parse_args(ISC_TRUE, ISC_TRUE,
diff --git a/bin/tests/system/rootkeysentinel/ns3/hint.db b/bin/tests/system/rootkeysentinel/ns3/hint.db
index bcd3e4b7f1..4a7363741b 100644
--- a/bin/tests/system/rootkeysentinel/ns3/hint.db
+++ b/bin/tests/system/rootkeysentinel/ns3/hint.db
@@ -1,2 +1,11 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 .                       NS      a.root-servers.nil.
 a.root-servers.nil.     A       10.53.0.1
diff --git a/bin/tests/system/rootkeysentinel/ns4/hint.db b/bin/tests/system/rootkeysentinel/ns4/hint.db
index bcd3e4b7f1..4a7363741b 100644
--- a/bin/tests/system/rootkeysentinel/ns4/hint.db
+++ b/bin/tests/system/rootkeysentinel/ns4/hint.db
@@ -1,2 +1,11 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 .                       NS      a.root-servers.nil.
 a.root-servers.nil.     A       10.53.0.1
diff --git a/doc/design/db_rules b/doc/design/db_rules
index e6335da6f6..ef4de0e0f7 100644
--- a/doc/design/db_rules
+++ b/doc/design/db_rules
@@ -6,7 +6,6 @@ Here is a more formal statement of the important database design
 rules.  Each rule has a 5 character mnemonic, for use in source code
 comments.
 
-
 Reference Safety						[DBREF]
 
 	1)	Any node reference retrieved from the database shall remain
diff --git a/doc/dev/tests b/doc/dev/tests
index e1d31efddd..5cccc28a8f 100644
--- a/doc/dev/tests
+++ b/doc/dev/tests
@@ -5,7 +5,6 @@ See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 We do hourly test builds of the bind9 tree.  This is an attempt to
 document how they work.
 
-
 * How things work
 
 The scripts driving the build system are in ~wpk/b9t.  They are now
diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 3192d6f14d..564c9aa206 100644
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1875,7 +1875,7 @@ static isc_result_t
 algorithm_status(unsigned int alg) {
 	REQUIRE(dst_initialized == ISC_TRUE);
 
-	if (dst_algorithm_supported(alg)) {		
+	if (dst_algorithm_supported(alg)) {
 		return (ISC_R_SUCCESS);
 	}
 	return (DST_R_UNSUPPORTEDALG);
diff --git a/lib/isc/random.c b/lib/isc/random.c
index 08df74a32f..c6ed6823e2 100644
--- a/lib/isc/random.c
+++ b/lib/isc/random.c
@@ -175,7 +175,7 @@ isc_random_buf(void *buf, size_t buflen) {
 	}
 # elif HAVE_PKCS11
 	RUNTIME_CHECK(pk11_rand_bytes(buf, buflen) == ISC_R_SUCCESS);
-# endif /* if defined(HAVE_ARC4RANDOM_BUF) */	
+# endif /* if defined(HAVE_ARC4RANDOM_BUF) */
 
 #endif
 }
diff --git a/lib/ns/query.c b/lib/ns/query.c
index ec54bfbcc1..f147baa202 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -5172,7 +5172,7 @@ root_key_sentinel_detect(query_ctx_t *qctx) {
 			      NS_LOGMODULE_QUERY, ISC_LOG_INFO,
 			      "root-key-sentinel-is-ta query label found");
 	} else if (qctx->client->query.qname->length > 31 && ndata[0] == 30 &&
-	           strncasecmp(ndata + 1, "root-key-sentinel-not-ta-", 25) == 0)
+		   strncasecmp(ndata + 1, "root-key-sentinel-not-ta-", 25) == 0)
 	{
 		if (!get_root_key_sentinel_id(qctx, ndata + 26)) {
 			return;
diff --git a/util/copyrights b/util/copyrights
index ad1670c7fd..dfccea1869 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1,4 +1,3 @@
-./.clang-format					X	2018
 ./.gitattributes				X	2015,2017,2018
 ./.gitignore					X	2012,2013,2014,2015,2016,2017,2018
 ./.gitlab-ci.yml				X	2018
@@ -2788,6 +2787,7 @@
 ./doc/arm/notes.conf				X	2015,2018
 ./doc/arm/notes.html				X	2014,2015,2016,2017,2018
 ./doc/arm/notes.pdf				X	2014,2015,2016,2017,2018
+./doc/arm/notes.txt				X	2018
 ./doc/arm/notes.xml				SGML	2014,2015,2016,2017,2018
 ./doc/arm/noteversion.xml.in			SGML	2015,2016,2018
 ./doc/arm/options.grammar.xml			SGML	2018
@@ -3309,7 +3309,6 @@
 ./lib/dns/tests/dnstest.c			C	2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/tests/dnstest.h			C	2011,2012,2014,2015,2016,2017,2018
 ./lib/dns/tests/dst_test.c			C	2018
-./lib/dns/tests/dstrandom_test.c		C	2017,2018
 ./lib/dns/tests/geoip_test.c			C	2013,2014,2015,2016,2017,2018
 ./lib/dns/tests/gost_test.c			C	2014,2015,2016,2017,2018
 ./lib/dns/tests/keytable_test.c			C	2014,2015,2016,2017,2018
@@ -3480,7 +3479,6 @@
 ./lib/isc/bind9.c				C	2013,2016,2018
 ./lib/isc/buffer.c				C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2012,2014,2015,2016,2017,2018
 ./lib/isc/bufferlist.c				C	1999,2000,2001,2004,2005,2007,2016,2018
-./lib/isc/chacha_private.h			X	2014,2018
 ./lib/isc/commandline.c				C.PORTION	1999,2000,2001,2004,2005,2007,2008,2014,2015,2016,2018
 ./lib/isc/counter.c				C	2014,2016,2018
 ./lib/isc/crc64.c				C	2013,2016,2018