diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index e8b3940894d29120495dd399c69e93f4e9a8239f..a912c6f179651205516069b072111e704d3a4936 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2017  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
diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook
index 26d8cd9a6631f4df96f8f795aceb69e9cc432575..4c32977e481bcf2f5552d2c48e634d7d4229a71a 100644
--- a/bin/dig/nslookup.docbook
+++ b/bin/dig/nslookup.docbook
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2007, 2010, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2007, 2010, 2013-2017  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
@@ -66,6 +66,7 @@
       <year>2014</year>
       <year>2015</year>
       <year>2016</year>
+      <year>2017</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index c5004fdfc4d8b1c449063a55bbe2709c1ce8a3dc..bd1200f07aeaee66fd5004bfb06ba911e6fd6b7b 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2017  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
diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh
index 2855c3baf607c7434a05dfd151f6d00be8282c66..e578388a31aed33f35c9608cdbef437a9d57413b 100644
--- a/bin/tests/system/additional/tests.sh
+++ b/bin/tests/system/additional/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2016, 2017  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
diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh
index 125626d20a1025ea61f3de375aff89d65ffa7952..feeba3318fd63c0e1b6881511c522fa7c5119348 100644
--- a/bin/tests/system/checkzone/tests.sh
+++ b/bin/tests/system/checkzone/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2017  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
diff --git a/bin/tests/system/checkzone/zones/delegating-ns-address-below-dname.db b/bin/tests/system/checkzone/zones/delegating-ns-address-below-dname.db
index ec13ffadd1e262e98e1f583d22be2a0c961d4686..9d46e9a7c313677eb3850c798f6f91b4ce31c009 100644
--- a/bin/tests/system/checkzone/zones/delegating-ns-address-below-dname.db
+++ b/bin/tests/system/checkzone/zones/delegating-ns-address-below-dname.db
@@ -1,3 +1,9 @@
+; Copyright (C) 2017  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/.
+
 $TTL 300
 example.com.		SOA	marka.isc.org. a.root.servers.nil. (
 				2026    ; serial
diff --git a/bin/tests/system/checkzone/zones/ns-address-below-dname.db b/bin/tests/system/checkzone/zones/ns-address-below-dname.db
index b6d7c41fb057bbed4251d23729d7c3ee67e1d23c..56d8d11c5b3e8bc710fb934296dc3847e7f68dc8 100644
--- a/bin/tests/system/checkzone/zones/ns-address-below-dname.db
+++ b/bin/tests/system/checkzone/zones/ns-address-below-dname.db
@@ -1,3 +1,9 @@
+; Copyright (C) 2017  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/.
+
 $TTL 300
 example.com.		SOA	marka.isc.org. a.root.servers.nil. (
 				2026    ; serial
diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index e6e6f5d82ca45c99e0b9592f1ceeed86de226ee1..45b8b785d82b0c0da1ce1fbf4c84a05b2ea9bc40 100644
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2009, 2011-2017  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
@@ -1412,7 +1412,7 @@ dns_cache_dumpstats(dns_cache_t *cache, FILE *fp) {
 		"cache database hash buckets");
 
 	fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n",
-	        (isc_uint64_t) isc_mem_total(cache->mctx),
+		(isc_uint64_t) isc_mem_total(cache->mctx),
 		"cache tree memory total");
 	fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n",
 		(isc_uint64_t) isc_mem_inuse(cache->mctx),