diff --git a/CHANGES b/CHANGES
index 06c5f61379..ade0cdc751 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,7 @@
 3723.	[cleanup]	Imported keys are now handled the same way
 			regardless of DNSSEC algorithm. [RT #35215]
 
-3722.	[bug]		Using geoip ACLs in a blackhole statement 
+3722.	[bug]		Using geoip ACLs in a blackhole statement
 			could cause a segfault. [RT #35272]
 
 3721.	[doc]		Improved documentation of the EDNS processing
diff --git a/bin/tests/system/geoip/clean.sh b/bin/tests/system/geoip/clean.sh
index 96409f0112..22d5e74466 100644
--- a/bin/tests/system/geoip/clean.sh
+++ b/bin/tests/system/geoip/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014  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/geoip/ns2/named12.conf b/bin/tests/system/geoip/ns2/named12.conf
index b7fda1249e..a650a635d2 100644
--- a/bin/tests/system/geoip/ns2/named12.conf
+++ b/bin/tests/system/geoip/ns2/named12.conf
@@ -19,7 +19,7 @@
 controls { /* empty */ };
 
 acl blocking {
-        geoip db country country AU;
+	geoip db country country AU;
 };
 
 options {
@@ -32,7 +32,7 @@ options {
 	listen-on-v6 { none; };
 	recursion no;
 	geoip-directory "../data";
-        blackhole { blocking; };
+	blackhole { blocking; };
 };
 
 key rndc_key {
diff --git a/bin/tests/system/geoip/tests.sh b/bin/tests/system/geoip/tests.sh
index 51b1c4c288..0a0705cbb8 100644
--- a/bin/tests/system/geoip/tests.sh
+++ b/bin/tests/system/geoip/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014  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/acl.c b/lib/dns/acl.c
index fc5598503a..a2d0347a2c 100644
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -408,7 +408,7 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr,
 
 #ifdef HAVE_GEOIP
 	case dns_aclelementtype_geoip:
-		if (env == NULL || env->geoip == NULL) 
+		if (env == NULL || env->geoip == NULL)
 			return (ISC_FALSE);
 		return (dns_geoip_match(reqaddr, env->geoip, &e->geoip_elem));
 #endif
diff --git a/lib/dns/dst_result.c b/lib/dns/dst_result.c
index 078ea38391..8f94caf655 100644
--- a/lib/dns/dst_result.c
+++ b/lib/dns/dst_result.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2012-2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h
index 76a6bb1e1d..ebcc6c7910 100644
--- a/lib/dns/include/dns/acl.h
+++ b/lib/dns/include/dns/acl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2011, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/include/dst/result.h b/lib/dns/include/dst/result.h
index cf9428f6bd..e180739c30 100644
--- a/lib/dns/include/dst/result.h
+++ b/lib/dns/include/dst/result.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt
index 6a5263757f..e1051d34fb 100644
--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -1,6 +1,6 @@
 Copyright (C) 2004, 2005, 2007-2009, 2012-2014  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 2001, 2003  Internet Software Consortium.
-See COPYRIGHT in the main source directory for license terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 NOTES ON BIND 9.10 FOR WINDOWS: