diff --git a/bin/named/server.c b/bin/named/server.c
index ab09cd381b..3031fc2efd 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -10631,7 +10631,7 @@ mkey_dumpzone(dns_view_t *view, isc_buffer_t **text) {
 			snprintf(buf, sizeof(buf), "\n\n    name: %s", nbuf);
 			CHECK(putstr(text, buf));
 		}
-			
+
 
 		for (result = dns_rdataset_first(kdset);
 		     result == ISC_R_SUCCESS;
diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh
index fbb26797b2..de785bec65 100644
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006-2015  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/tests/system/dnssec/ns5/named1.conf b/bin/tests/system/dnssec/ns5/named1.conf
index 1a13a9f776..a680117d39 100644
--- a/bin/tests/system/dnssec/ns5/named1.conf
+++ b/bin/tests/system/dnssec/ns5/named1.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns5/named2.conf b/bin/tests/system/dnssec/ns5/named2.conf
index 5b60285e27..dbf4038e65 100644
--- a/bin/tests/system/dnssec/ns5/named2.conf
+++ b/bin/tests/system/dnssec/ns5/named2.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -40,19 +39,19 @@ options {
 };
 
 view root {
-        match-destinations { 127.0.0.1; };
+	match-destinations { 127.0.0.1; };
 
-        zone "." {
-                type master;
-                file "root.db.signed";
-        };
+	zone "." {
+		type master;
+		file "root.db.signed";
+	};
 };
 
 view other {
 include "revoked.conf";
 
-        zone "." {
-                type static-stub;
-                server-addresses { 127.0.0.1; };
-        };
+	zone "." {
+		type static-stub;
+		server-addresses { 127.0.0.1; };
+	};
 };
diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index 0418f9510f..4145c34068 100644
--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2007, 2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/tests/system/mkeys/README b/bin/tests/system/mkeys/README
index eb77d7bc79..0fc98746de 100644
--- a/bin/tests/system/mkeys/README
+++ b/bin/tests/system/mkeys/README
@@ -1,3 +1,6 @@
+Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This is for testing managed-keys, in particular with problems
 with RFC 5011 Automated Updates of DNSSEC Trust Anchors.
 
diff --git a/bin/tests/system/mkeys/clean.sh b/bin/tests/system/mkeys/clean.sh
index dfd44a4eb9..07209ba1e8 100644
--- a/bin/tests/system/mkeys/clean.sh
+++ b/bin/tests/system/mkeys/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/mkeys/ns1/named1.conf b/bin/tests/system/mkeys/ns1/named1.conf
index 4298cd451d..3c93c199bd 100644
--- a/bin/tests/system/mkeys/ns1/named1.conf
+++ b/bin/tests/system/mkeys/ns1/named1.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/mkeys/ns1/named2.conf b/bin/tests/system/mkeys/ns1/named2.conf
index 4324524ff7..fe722133d1 100644
--- a/bin/tests/system/mkeys/ns1/named2.conf
+++ b/bin/tests/system/mkeys/ns1/named2.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/mkeys/ns1/root.db b/bin/tests/system/mkeys/ns1/root.db
index 461d78894b..c690d9342a 100644
--- a/bin/tests/system/mkeys/ns1/root.db
+++ b/bin/tests/system/mkeys/ns1/root.db
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007, 2010, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/mkeys/ns1/sign.sh b/bin/tests/system/mkeys/ns1/sign.sh
index fde0e15947..1d62468fc4 100644
--- a/bin/tests/system/mkeys/ns1/sign.sh
+++ b/bin/tests/system/mkeys/ns1/sign.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2014  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2003  Internet Software Consortium.
+# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/mkeys/ns2/named.conf b/bin/tests/system/mkeys/ns2/named.conf
index 9da4fcbdc3..895668f4e9 100644
--- a/bin/tests/system/mkeys/ns2/named.conf
+++ b/bin/tests/system/mkeys/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -27,11 +27,11 @@ options {
 	listen-on { 10.53.0.2; };
 	listen-on-v6 { none; };
 	recursion yes;
-        notify no;
+	notify no;
 	dnssec-enable yes;
 	dnssec-validation auto;
 	bindkeys-file "managed.conf";
-        servfail-ttl 0;
+	servfail-ttl 0;
 };
 
 key rndc_key {
diff --git a/bin/tests/system/mkeys/ns3/named.conf b/bin/tests/system/mkeys/ns3/named.conf
index c6ef9f7af6..a1481ed39f 100644
--- a/bin/tests/system/mkeys/ns3/named.conf
+++ b/bin/tests/system/mkeys/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -27,7 +27,7 @@ options {
 	listen-on { 10.53.0.3; };
 	listen-on-v6 { none; };
 	recursion yes;
-        notify no;
+	notify no;
 	dnssec-enable yes;
 	dnssec-validation yes;
 	bindkeys-file "managed.conf";
diff --git a/bin/tests/system/mkeys/setup.sh b/bin/tests/system/mkeys/setup.sh
index a205bba8ba..bf3bc7ebc6 100644
--- a/bin/tests/system/mkeys/setup.sh
+++ b/bin/tests/system/mkeys/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2007, 2009, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000, 2001  Internet Software Consortium.
+# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/mkeys/tests.sh b/bin/tests/system/mkeys/tests.sh
index 5408a35c80..143f77b820 100644
--- a/bin/tests/system/mkeys/tests.sh
+++ b/bin/tests/system/mkeys/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index 94669c270c..99ccff0c15 100644
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2010, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2010, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/include/dns/nta.h b/lib/dns/include/dns/nta.h
index e8d4259c32..b0ba46ae18 100644
--- a/lib/dns/include/dns/nta.h
+++ b/lib/dns/include/dns/nta.h
@@ -185,7 +185,7 @@ isc_result_t
 dns_ntatable_totext(dns_ntatable_t *ntatable, isc_buffer_t **buf);
 /*%<
  * Dump the NTA table to buffer at 'buf'
- * 
+ *
  * Requires:
  * \li   "ntatable" is a valid table.
  *
diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index bb550ca631..6436a6512f 100644
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2010, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2010, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -564,7 +564,7 @@ putstr(isc_buffer_t **b, const char *str) {
 	result = isc_buffer_reserve(b, strlen(str));
 	if (result != ISC_R_SUCCESS)
 		return (result);
-	
+
 	isc_buffer_putstr(*b, str);
 	return (ISC_R_SUCCESS);
 }
diff --git a/lib/dns/nta.c b/lib/dns/nta.c
index c9291617d9..1e472909c2 100644
--- a/lib/dns/nta.c
+++ b/lib/dns/nta.c
@@ -510,7 +510,7 @@ putstr(isc_buffer_t **b, const char *str) {
 	result = isc_buffer_reserve(b, strlen(str));
 	if (result != ISC_R_SUCCESS)
 		return (result);
-	
+
 	isc_buffer_putstr(*b, str);
 	return (ISC_R_SUCCESS);
 }
@@ -540,7 +540,7 @@ dns_ntatable_totext(dns_ntatable_t *ntatable, isc_buffer_t **buf) {
 		if (node->data != NULL) {
 			dns_nta_t *n = (dns_nta_t *) node->data;
 			char nbuf[DNS_NAME_FORMATSIZE];
-		        char tbuf[ISC_FORMATHTTPTIMESTAMP_SIZE];
+			char tbuf[ISC_FORMATHTTPTIMESTAMP_SIZE];
 			char obuf[DNS_NAME_FORMATSIZE +
 				  ISC_FORMATHTTPTIMESTAMP_SIZE +
 				  sizeof("expired:  \n")];
diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c
index 1e5741863f..00cf084eb6 100644
--- a/lib/dns/rdata/generic/keydata_65533.c
+++ b/lib/dns/rdata/generic/keydata_65533.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2011-2013, 2015  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -200,17 +200,17 @@ totext_keydata(ARGS_TOTEXT) {
 
 			isc_stdtime_get(&now);
 
-			RETERR(str_totext(tctx->linebreak, target)); 
+			RETERR(str_totext(tctx->linebreak, target));
 			RETERR(str_totext("; next refresh: ", target));
 			isc_time_set(&t, refresh, 0);
 			isc_time_formathttptimestamp(&t, rbuf, sizeof(rbuf));
 			RETERR(str_totext(rbuf, target));
 
 			if (add == 0) {
-				RETERR(str_totext(tctx->linebreak, target)); 
+				RETERR(str_totext(tctx->linebreak, target));
 				RETERR(str_totext("; no trust", target));
 			} else {
-				RETERR(str_totext(tctx->linebreak, target)); 
+				RETERR(str_totext(tctx->linebreak, target));
 				if (add < now) {
 					RETERR(str_totext("; trusted since: ",
 							  target));
@@ -225,7 +225,7 @@ totext_keydata(ARGS_TOTEXT) {
 			}
 
 			if (remove != 0) {
-				RETERR(str_totext(tctx->linebreak, target)); 
+				RETERR(str_totext(tctx->linebreak, target));
 				RETERR(str_totext("; removal pending: ",
 						  target));
 				isc_time_set(&t, remove, 0);
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 2e409ce172..c0577f38eb 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -8999,7 +8999,7 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
 					deletekey = ISC_TRUE;
 					newkey = ISC_TRUE;
 					keydata.removehd = 0;
-					keydata.addhd = 
+					keydata.addhd =
 						now + dns_zone_mkey_month;
 				} else if (keydata.addhd > now)
 					pending++;
diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c
index 8e785f2848..ed68088083 100644
--- a/lib/isc/buffer.c
+++ b/lib/isc/buffer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c
index 3a4e476534..e4eeab9937 100644
--- a/lib/isc/httpd.c
+++ b/lib/isc/httpd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008, 2010-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006-2008, 2010-2015  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/tests/time_test.c b/lib/isc/tests/time_test.c
index eb56ff9fb6..66836f7feb 100644
--- a/lib/isc/tests/time_test.c
+++ b/lib/isc/tests/time_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index ade55247a9..fd767040ae 100644
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h
index bfd5bc0d62..5b97c53588 100644
--- a/lib/isc/win32/include/isc/time.h
+++ b/lib/isc/win32/include/isc/time.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2009, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2009, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any