diff --git a/CHANGES b/CHANGES
index a4c0c88eac..be4d0fc416 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
 
 4564.	[maint]		Update the built in managed keys to include the
 			upcoming root KSK. [RT #44579]
-			
+
 4563.	[bug]		Modified zones would occasionally fail to reload.
 			[RT #39424]
 
diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl
index 563894eda7..e39dbd82bc 100644
--- a/bin/named/bind9.xsl
+++ b/bin/named/bind9.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- - Copyright (C) 2006-2009, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2006-2009, 2012-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/named/server.c b/bin/named/server.c
index 8382da7dab..02b28d631a 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -12361,7 +12361,7 @@ find_name_in_list_from_map(const cfg_obj_t *config,
 				const cfg_obj_t *zoptions;
 				const cfg_obj_t *typeobj = NULL;
 				zoptions = cfg_tuple_get(obj, "options");
-				
+
 				if (zoptions != NULL)
 					cfg_map_get(zoptions, "type", &typeobj);
 				if (redirect && typeobj != NULL &&
diff --git a/bin/tests/system/addzone/clean.sh b/bin/tests/system/addzone/clean.sh
index df059b0e98..ee57d0a10e 100644
--- a/bin/tests/system/addzone/clean.sh
+++ b/bin/tests/system/addzone/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012-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/addzone/ns1/named.conf b/bin/tests/system/addzone/ns1/named.conf
index b8ef619f4f..04aeafcd98 100644
--- a/bin/tests/system/addzone/ns1/named.conf
+++ b/bin/tests/system/addzone/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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/addzone/ns1/redirect.db.1 b/bin/tests/system/addzone/ns1/redirect.db.1
index 4636dc8aef..5560adeab0 100644
--- a/bin/tests/system/addzone/ns1/redirect.db.1
+++ b/bin/tests/system/addzone/ns1/redirect.db.1
@@ -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/.
+.\"
 ; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/bin/tests/system/addzone/ns1/redirect.db.2 b/bin/tests/system/addzone/ns1/redirect.db.2
index 2fa3e2fe9e..88c25a5039 100644
--- a/bin/tests/system/addzone/ns1/redirect.db.2
+++ b/bin/tests/system/addzone/ns1/redirect.db.2
@@ -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/.
+.\"
 ; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/bin/tests/system/addzone/ns2/redirect.db.1 b/bin/tests/system/addzone/ns2/redirect.db.1
index 4636dc8aef..5560adeab0 100644
--- a/bin/tests/system/addzone/ns2/redirect.db.1
+++ b/bin/tests/system/addzone/ns2/redirect.db.1
@@ -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/.
+.\"
 ; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/bin/tests/system/addzone/ns2/redirect.db.2 b/bin/tests/system/addzone/ns2/redirect.db.2
index 2fa3e2fe9e..88c25a5039 100644
--- a/bin/tests/system/addzone/ns2/redirect.db.2
+++ b/bin/tests/system/addzone/ns2/redirect.db.2
@@ -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/.
+.\"
 ; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/bin/tests/system/addzone/ns3/named.conf b/bin/tests/system/addzone/ns3/named.conf
index e143447209..638ac61828 100644
--- a/bin/tests/system/addzone/ns3/named.conf
+++ b/bin/tests/system/addzone/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 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
@@ -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/addzone/ns3/redirect.db.1 b/bin/tests/system/addzone/ns3/redirect.db.1
index 167b5332ee..4437dbe0bc 100644
--- a/bin/tests/system/addzone/ns3/redirect.db.1
+++ b/bin/tests/system/addzone/ns3/redirect.db.1
@@ -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/.
+.\"
 ; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/bin/tests/system/addzone/ns3/redirect.db.2 b/bin/tests/system/addzone/ns3/redirect.db.2
index 7bddb056a9..ff883632ad 100644
--- a/bin/tests/system/addzone/ns3/redirect.db.2
+++ b/bin/tests/system/addzone/ns3/redirect.db.2
@@ -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/.
+.\"
 ; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/bin/tests/system/addzone/setup.sh b/bin/tests/system/addzone/setup.sh
index f793f104d2..22df7755ca 100644
--- a/bin/tests/system/addzone/setup.sh
+++ b/bin/tests/system/addzone/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012-2014, 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/addzone/tests.sh b/bin/tests/system/addzone/tests.sh
index 6a8cc54c46..aa90235f0d 100755
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-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/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
index 8c79ebe0b2..139291e917 100644
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 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/statschannel/clean.sh b/bin/tests/system/statschannel/clean.sh
index 0c1c5320b8..0e603e3654 100644
--- a/bin/tests/system/statschannel/clean.sh
+++ b/bin/tests/system/statschannel/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 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
diff --git a/bin/tests/system/statschannel/mem-xml.pl b/bin/tests/system/statschannel/mem-xml.pl
index b4528962de..58953dd5bd 100644
--- a/bin/tests/system/statschannel/mem-xml.pl
+++ b/bin/tests/system/statschannel/mem-xml.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2015, 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/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh
index a55322683b..b5601b7c83 100644
--- a/bin/tests/system/statschannel/tests.sh
+++ b/bin/tests/system/statschannel/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 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
diff --git a/doc/arm/logging-categories.xml b/doc/arm/logging-categories.xml
index 6449676b11..36232edcd5 100644
--- a/doc/arm/logging-categories.xml
+++ b/doc/arm/logging-categories.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 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
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index fc5595e64e..4346fb1faa 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 1998-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/ecs.c b/lib/dns/ecs.c
index 0e9483543f..4a1852cd4a 100644
--- a/lib/dns/ecs.c
+++ b/lib/dns/ecs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2017  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/Makefile.in b/lib/dns/include/dns/Makefile.in
index 0697ae6f60..c7ae21dff6 100644
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2004, 2007-2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 1998-2004, 2007-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
diff --git a/lib/dns/include/dns/ecs.h b/lib/dns/include/dns/ecs.h
index 05268a9e63..fcb82afa27 100644
--- a/lib/dns/include/dns/ecs.h
+++ b/lib/dns/include/dns/ecs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2017  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/rrl.h b/lib/dns/include/dns/rrl.h
index dd9b392f37..37fb839c45 100644
--- a/lib/dns/include/dns/rrl.h
+++ b/lib/dns/include/dns/rrl.h
@@ -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
diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 162108b0e4..7eb7c3e8d0 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-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/isc/buffer.c b/lib/isc/buffer.c
index 7337ab43e8..95b5c5ec28 100644
--- a/lib/isc/buffer.c
+++ b/lib/isc/buffer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2002, 2004-2008, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2002, 2004-2008, 2012, 2014-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/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h
index 73e35a0e23..dcb19aa787 100644
--- a/lib/isc/include/isc/buffer.h
+++ b/lib/isc/include/isc/buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2002, 2004-2008, 2010, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2002, 2004-2008, 2010, 2012, 2014, 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/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h
index e02c84d1e0..b333ec423f 100644
--- a/lib/isc/include/isc/netaddr.h
+++ b/lib/isc/include/isc/netaddr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2002, 2004-2007, 2009, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2002, 2004-2007, 2009, 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
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 1a289ab125..c4cbf6e840 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2010, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1997-2010, 2012-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
@@ -1119,7 +1119,7 @@ destroy(isc__mem_t *ctx) {
 		if (ctx->basic_table != NULL) {
 			(ctx->memfree)(ctx->arg, ctx->basic_table);
 			ctx->malloced -= ctx->basic_table_size *
-                                         sizeof(unsigned char *);
+					 sizeof(unsigned char *);
 		}
 	}
 
diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index 47730c4d95..e647c0eda5 100644
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2002, 2004, 2005, 2007, 2010-2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2002, 2004, 2005, 2007, 2010-2012, 2014-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/util/bindkeys.pl b/util/bindkeys.pl
index 93fa4cfd19..0cd16a23cd 100755
--- a/util/bindkeys.pl
+++ b/util/bindkeys.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2009-2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2012, 2014, 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