diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 719db27ec3..5fee9e4b8e 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -1520,37 +1520,37 @@ static unsigned char ednsoptscnt = 0;
 
 void
 save_opt(dig_lookup_t *lookup, char *code, char *value) {
-        isc_uint32_t num;
-        isc_buffer_t b;
-        isc_result_t result;
+	isc_uint32_t num;
+	isc_buffer_t b;
+	isc_result_t result;
 
-        if (ednsoptscnt == EDNSOPTS)
-                fatal("too many ednsopts");
+	if (ednsoptscnt == EDNSOPTS)
+		fatal("too many ednsopts");
 
-        result = parse_uint(&num, code, 65535, "ednsopt");
+	result = parse_uint(&num, code, 65535, "ednsopt");
 	if (result != ISC_R_SUCCESS)
 		fatal("bad edns code point: %s", code);
 
-        ednsopts[ednsoptscnt].code = num;
-        ednsopts[ednsoptscnt].length = 0;
-        ednsopts[ednsoptscnt].value = NULL;
+	ednsopts[ednsoptscnt].code = num;
+	ednsopts[ednsoptscnt].length = 0;
+	ednsopts[ednsoptscnt].value = NULL;
 
-        if (value != NULL) {
-                char *buf;
-                buf = isc_mem_allocate(mctx, strlen(value)/2 + 1);
-                if (buf == NULL)
-                        fatal("out of memory");
-                isc_buffer_init(&b, buf, strlen(value)/2 + 1);
-                result = isc_hex_decodestring(value, &b);
-                check_result(result, "isc_hex_decodestring");
-                ednsopts[ednsoptscnt].value = isc_buffer_base(&b);
-                ednsopts[ednsoptscnt].length = isc_buffer_usedlength(&b);
-        }
+	if (value != NULL) {
+		char *buf;
+		buf = isc_mem_allocate(mctx, strlen(value)/2 + 1);
+		if (buf == NULL)
+			fatal("out of memory");
+		isc_buffer_init(&b, buf, strlen(value)/2 + 1);
+		result = isc_hex_decodestring(value, &b);
+		check_result(result, "isc_hex_decodestring");
+		ednsopts[ednsoptscnt].value = isc_buffer_base(&b);
+		ednsopts[ednsoptscnt].length = isc_buffer_usedlength(&b);
+	}
 
-        if (lookup->ednsoptscnt == 0)
-                lookup->ednsopts = &ednsopts[ednsoptscnt];
-        lookup->ednsoptscnt++;
-        ednsoptscnt++;
+	if (lookup->ednsoptscnt == 0)
+		lookup->ednsopts = &ednsopts[ednsoptscnt];
+	lookup->ednsoptscnt++;
+	ednsoptscnt++;
 }
 
 /*%
@@ -2541,7 +2541,7 @@ setup_lookup(dig_lookup_t *lookup) {
 
 		if (lookup->ednsoptscnt != 0) {
 			memmove(&opts[i], lookup->ednsopts,
-			        sizeof(dns_ednsopt_t) * lookup->ednsoptscnt);
+				sizeof(dns_ednsopt_t) * lookup->ednsoptscnt);
 			i += lookup->ednsoptscnt;
 		}
 
diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 8abbdec631..7c4463c521 100755
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2015  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/tests/system/rpzrecurse/ns1/example.db b/bin/tests/system/rpzrecurse/ns1/example.db
index d0fbc3739a..e9dd45b54a 100644
--- a/bin/tests/system/rpzrecurse/ns1/example.db
+++ b/bin/tests/system/rpzrecurse/ns1/example.db
@@ -1,3 +1,17 @@
+; Copyright (C) 2015  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
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
+
 $TTL 3600
 @ IN SOA root.example. example. 1 3600 3600 3600 3600
 @ IN NS ns.example.
diff --git a/isc-config.sh.in b/isc-config.sh.in
index b253206cfa..04a9e5c6f4 100644
--- a/isc-config.sh.in
+++ b/isc-config.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2013, 2015  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h
index 923ad436ce..14a0737294 100644
--- a/lib/dns/include/dns/rpz.h
+++ b/lib/dns/include/dns/rpz.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2013, 2015  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