diff --git a/CHANGES b/CHANGES
index 0300471692..968961ab32 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 4560.	[bug]		mdig: add -m option to enable memory debugging rather
 			than having it on all the time. [RT #44509]
 
-4559.	[bug]  		openssl_link.c didn't compile if ISC_MEM_TRACKLINES
+4559.	[bug]		openssl_link.c didn't compile if ISC_MEM_TRACKLINES
 			was turned off.  [RT #44509]
 
 4558.	[bug]		Synthesised CNAME before matching DNAME was still
diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index 08a47b4750..2c9229f287 100644
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -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/tools/mdig.docbook b/bin/tools/mdig.docbook
index a650732883..0d8dc025cf 100644
--- a/bin/tools/mdig.docbook
+++ b/bin/tools/mdig.docbook
@@ -1,7 +1,7 @@
 <!DOCTYPE book [
 <!ENTITY mdash "&#8212;">]>
 <!--
- - 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
@@ -31,6 +31,7 @@
     <copyright>
       <year>2015</year>
       <year>2016</year>
+      <year>2017</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 4e0976edab..7f74489937 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-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/win32/socket.c b/lib/isc/win32/socket.c
index cc133cb764..dc059c7945 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-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
@@ -3083,7 +3083,7 @@ isc__socket_send(isc_socket_t *sock, isc_region_t *region,
 isc_result_t
 isc__socket_sendto(isc_socket_t *sock, isc_region_t *region,
 		   isc_task_t *task, isc_taskaction_t action, void *arg,
-                  const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo)
+		  const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo)
 {
 	isc_socketevent_t *dev;
 	isc_socketmgr_t *manager;
@@ -3135,7 +3135,7 @@ isc__socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist,
 isc_result_t
 isc__socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist,
 		    isc_task_t *task, isc_taskaction_t action, void *arg,
-                   const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo)
+		   const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo)
 {
 	return (isc_socket_sendtov2(sock, buflist, task, action, arg, address,
 				    pktinfo, 0));
@@ -3144,7 +3144,7 @@ isc__socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist,
 isc_result_t
 isc__socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist,
 		     isc_task_t *task, isc_taskaction_t action, void *arg,
-                    const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo,
+		    const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo,
 		     unsigned int flags)
 {
 	isc_socketevent_t *dev;
@@ -3201,7 +3201,7 @@ isc__socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist,
 isc_result_t
 isc__socket_sendto2(isc_socket_t *sock, isc_region_t *region,
 		    isc_task_t *task,
-                   const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo,
+		   const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo,
 		    isc_socketevent_t *event, unsigned int flags)
 {
 	isc_result_t ret;