diff --git a/CHANGES b/CHANGES
index e36a0be0aa..7e2a5f8c87 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
 4610.	[func]		The "new-zones-directory" option specifies the
-			location of NZF or NZD files for storing 
+			location of NZF or NZD files for storing
 			configuration of zones added by "rndc addzone".
 			Thanks to Petr Menšík. [RT #44853]
 
diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index 58ae28c6a5..ab29fbe519 100644
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@@ -244,7 +244,7 @@
 	    The configuration is saved in a file called
 	    <filename><replaceable>viewname</replaceable>.nzf</filename>
 	    (or, if <command>named</command> is compiled with
-	    liblmdb, an LMDB database file called 
+	    liblmdb, an LMDB database file called
 	    <filename><replaceable>viewname</replaceable>.nzd</filename>).
 	    <replaceable>viewname</replaceable> is the
 	    name of the view, unless the view name contains characters
diff --git a/bin/tests/system/addzone/ns2/named3.conf b/bin/tests/system/addzone/ns2/named3.conf
index 920a1e55dd..2bb92f53f4 100644
--- a/bin/tests/system/addzone/ns2/named3.conf
+++ b/bin/tests/system/addzone/ns2/named3.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 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/server-json.pl b/bin/tests/system/statschannel/server-json.pl
index abfdd9a230..0709b6aa15 100644
--- a/bin/tests/system/statschannel/server-json.pl
+++ b/bin/tests/system/statschannel/server-json.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# 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/server-xml.pl b/bin/tests/system/statschannel/server-xml.pl
index c73e47cf2d..0640856c6d 100644
--- a/bin/tests/system/statschannel/server-xml.pl
+++ b/bin/tests/system/statschannel/server-xml.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# 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/traffic-json.pl b/bin/tests/system/statschannel/traffic-json.pl
index c64c7b48d5..cd45729443 100644
--- a/bin/tests/system/statschannel/traffic-json.pl
+++ b/bin/tests/system/statschannel/traffic-json.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# 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/traffic-xml.pl b/bin/tests/system/statschannel/traffic-xml.pl
index d8288e1913..4458a34587 100644
--- a/bin/tests/system/statschannel/traffic-xml.pl
+++ b/bin/tests/system/statschannel/traffic-xml.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# 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/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 166d67a24f..30468bf70f 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -5947,7 +5947,7 @@ options {
 		  is saved in a file called
 		  <filename><replaceable>viewname</replaceable>.nzf</filename>
 		  (or, if <command>named</command> is compiled with
-		  liblmdb, in an LMDB database file called 
+		  liblmdb, in an LMDB database file called
 		  <filename><replaceable>viewname</replaceable>.nzd</filename>).
 		  <replaceable>viewname</replaceable> is the name of the
 		  view, unless the view name contains characters that are
diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in
index c9cc25a5d5..65d3f289ca 100644
--- a/lib/irs/Makefile.in
+++ b/lib/irs/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 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/Makefile.in b/lib/isc/Makefile.in
index 1d31f488f3..3e0a7e3e5d 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/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/isc/tests/file_test.c b/lib/isc/tests/file_test.c
index 061db7c020..3b5c54e49b 100644
--- a/lib/isc/tests/file_test.c
+++ b/lib/isc/tests/file_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 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/unix/file.c b/lib/isc/unix/file.c
index 5655fa51db..fc18d715c9 100644
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2005, 2007, 2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2002, 2004, 2005, 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/isc/win32/file.c b/lib/isc/win32/file.c
index b5e20e22be..5b9ebd1383 100644
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2007, 2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2002, 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/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 7a45162338..53a94e3c73 100644
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2005, 2007, 2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001-2005, 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/lwres/Makefile.in b/lib/lwres/Makefile.in
index b7a3976c5a..fe39b367b4 100644
--- a/lib/lwres/Makefile.in
+++ b/lib/lwres/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2000, 2001, 2004, 2005, 2007, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2005, 2007, 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