diff --git a/bin/tests/system/serve-stale/ans2/ans.pl b/bin/tests/system/serve-stale/ans2/ans.pl
index 2c3dfa711f..9f95460dbf 100644
--- a/bin/tests/system/serve-stale/ans2/ans.pl
+++ b/bin/tests/system/serve-stale/ans2/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# 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
diff --git a/bin/tests/system/serve-stale/clean.sh b/bin/tests/system/serve-stale/clean.sh
index 754158e60c..15e23bb343 100644
--- a/bin/tests/system/serve-stale/clean.sh
+++ b/bin/tests/system/serve-stale/clean.sh
@@ -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/.
+
 rm -f dig.out.test*
 rm -f ns1/named.conf
 rm -f ns3/root.bk
diff --git a/bin/tests/system/serve-stale/ns1/named1.conf b/bin/tests/system/serve-stale/ns1/named1.conf
index 0e924e64b4..21fc39900d 100644
--- a/bin/tests/system/serve-stale/ns1/named1.conf
+++ b/bin/tests/system/serve-stale/ns1/named1.conf
@@ -7,12 +7,12 @@
  */
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-sha256;
+	secret "1234abcd8765";
+	algorithm hmac-sha256;
 };
 
 controls {
-        inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+	inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
 };
 
 options {
diff --git a/bin/tests/system/serve-stale/ns1/named2.conf b/bin/tests/system/serve-stale/ns1/named2.conf
index df6077ff9f..a481fd8a99 100644
--- a/bin/tests/system/serve-stale/ns1/named2.conf
+++ b/bin/tests/system/serve-stale/ns1/named2.conf
@@ -7,12 +7,12 @@
  */
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-sha256;
+	secret "1234abcd8765";
+	algorithm hmac-sha256;
 };
 
 controls {
-        inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+	inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
 };
 
 options {
diff --git a/bin/tests/system/serve-stale/ns1/root.db b/bin/tests/system/serve-stale/ns1/root.db
index eb9ad3ecf1..a865fe0c3a 100644
--- a/bin/tests/system/serve-stale/ns1/root.db
+++ b/bin/tests/system/serve-stale/ns1/root.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/.
+
 .		300	SOA	. . 0 0 0 0 0
 .		300	NS	ns.nil.
 ns.nil.		300	A	10.53.0.1
diff --git a/bin/tests/system/serve-stale/ns3/named.conf b/bin/tests/system/serve-stale/ns3/named.conf
index 361f10aff3..88bd08ce47 100644
--- a/bin/tests/system/serve-stale/ns3/named.conf
+++ b/bin/tests/system/serve-stale/ns3/named.conf
@@ -7,12 +7,12 @@
  */
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-sha256;
+	secret "1234abcd8765";
+	algorithm hmac-sha256;
 };
 
 controls {
-        inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; };
+	inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; };
 };
 
 options {
diff --git a/bin/tests/system/serve-stale/setup.sh b/bin/tests/system/serve-stale/setup.sh
index 1faa70e308..cd75f4f82e 100644
--- a/bin/tests/system/serve-stale/setup.sh
+++ b/bin/tests/system/serve-stale/setup.sh
@@ -1 +1,7 @@
+# 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/.
+
 cp -f ns1/named1.conf ns1/named.conf
diff --git a/bin/tests/system/serve-stale/tests.sh b/bin/tests/system/serve-stale/tests.sh
index e27c3a067f..c4dfd53d3b 100755
--- a/bin/tests/system/serve-stale/tests.sh
+++ b/bin/tests/system/serve-stale/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009-2016  Internet Systems Consortium, Inc. ("ISC")
+# 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
diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h
index 52e2a848e4..ea1b25eafe 100644
--- a/lib/dns/include/dns/cache.h
+++ b/lib/dns/include/dns/cache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2004-2007, 2009, 2011-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/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 0473d51430..957a7183a9 100644
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2001, 2003-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2003-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/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 37fe2d9cef..a9b74a49f4 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -2012,7 +2012,7 @@ clean_now_or_later(dns_rbtnode_t *node, dns_rbtdb_t *rbtdb,
 		free_rdataset(rbtdb, mctx, header);
 	} else {
 		header->attributes |= RDATASET_ATTR_STALE |
-		                      RDATASET_ATTR_ANCIENT;
+				      RDATASET_ATTR_ANCIENT;
 		node->dirty = 1;
 		*header_prevp = header;
 	}
diff --git a/lib/dns/tests/db_test.c b/lib/dns/tests/db_test.c
index d1bbba9d89..03ffc30823 100644
--- a/lib/dns/tests/db_test.c
+++ b/lib/dns/tests/db_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2015-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