diff --git a/bin/named/query.c b/bin/named/query.c
index aca54a7db3aed490b2e9b459ef38d707901ab25c..2438b07be861e8f4ea49261f530cd50d70c14176 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -6612,7 +6612,7 @@ query_respond_any(query_ctx_t *qctx) {
 
 			query_addrrset(qctx->client,
 				       (qctx->fname != NULL)
-				        ? &qctx->fname
+					? &qctx->fname
 					: &tname,
 				       &qctx->rdataset, NULL,
 				       NULL, DNS_SECTION_ANSWER);
@@ -9740,7 +9740,7 @@ log_query(ns_client_t *client, unsigned int flags, unsigned int extflags) {
 	if (client->ednsversion >= 0)
 		snprintf(ednsbuf, sizeof(ednsbuf), "E(%d)",
 			 client->ednsversion);
-	
+
 	if (HAVEECS(client)) {
 		strlcpy(ecsbuf, " [ECS ", sizeof(ecsbuf));
 		dns_ecs_format(&client->ecs, ecsbuf + 6, sizeof(ecsbuf) - 6);
diff --git a/bin/tests/system/dnstap/bad-size-version.conf b/bin/tests/system/dnstap/bad-size-version.conf
index 3fb6bc506a33aad9f64bd7b97e0234e885aee3da..8706fdd6095eaf1384c4544628d0b1e373f1629d 100644
--- a/bin/tests/system/dnstap/bad-size-version.conf
+++ b/bin/tests/system/dnstap/bad-size-version.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 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/dnstap/good-size-unlimited.conf b/bin/tests/system/dnstap/good-size-unlimited.conf
index 0c3bcacd5e7464549c96f206ad7916bdaaf0aaf1..7b04fbb347bb7aa92605a39fdd0585c90e161132 100644
--- a/bin/tests/system/dnstap/good-size-unlimited.conf
+++ b/bin/tests/system/dnstap/good-size-unlimited.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 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/dnstap/good-size-version.conf b/bin/tests/system/dnstap/good-size-version.conf
index 417f600044a5fdfef3d6fc9b9061687206f8aff7..0a4573d9502bb712122cd613b9415c32d5ca9d73 100644
--- a/bin/tests/system/dnstap/good-size-version.conf
+++ b/bin/tests/system/dnstap/good-size-version.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 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/dnstap/ns1/named.conf b/bin/tests/system/dnstap/ns1/named.conf
index 8d7b27cfa4d0329c4c2de94519a23fc932ced31c..95152977fd70effea242406219165870aa906959 100644
--- a/bin/tests/system/dnstap/ns1/named.conf
+++ b/bin/tests/system/dnstap/ns1/named.conf
@@ -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/bin/tests/system/dnstap/ns2/named.conf b/bin/tests/system/dnstap/ns2/named.conf
index 913e2498676df970eaa75b80de578fbfa4dd3766..8fd5f26129dd1c658dfb61b22f4cc688fdb769ee 100644
--- a/bin/tests/system/dnstap/ns2/named.conf
+++ b/bin/tests/system/dnstap/ns2/named.conf
@@ -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/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index dca1fd61ed3f8aa0694954ba4537d5692782f9f7..f0795f5fad42fcc82d5243c774f4f02babac923a 100644
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/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/lib/bind9/check.c b/lib/bind9/check.c
index 34ce342adec18db0b220f875ddf919aba25eded9..8b4ef5434046f6ec3ecb23c8028d0ef38ceadb3c 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001-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/result.h b/lib/isc/include/isc/result.h
index ec5f38936d4ecfe91ad11d7323f19b82a8bf37ec..42e58ce3ac0588f3dc26d80225276cbff46a4fa4 100644
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2003-2009, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2003-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/result.c b/lib/isc/result.c
index bb8c6eb596eedab0027d88eb3de995d6f5a34433..702c5db7cc638bd8822a90e7bd664948c0c600e3 100644
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2003-2005, 2007, 2008, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2003-2005, 2007, 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