diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index b372baf2d7..2fd66af6df 100644
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index d6a77755e8..e289fbb15b 100644
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2007, 2009-2012  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2002  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -39,6 +39,7 @@
       <year>2009</year>
       <year>2010</year>
       <year>2011</year>
+      <year>2012</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index e9de6ac78e..335e03b3a1 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook
index eac4ac01dc..5e07467a47 100644
--- a/bin/dnssec/dnssec-signzone.docbook
+++ b/bin/dnssec/dnssec-signzone.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -44,6 +44,7 @@
       <year>2008</year>
       <year>2009</year>
       <year>2011</year>
+      <year>2012</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>
diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index d432effc31..338d805993 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2012  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
@@ -44,6 +44,7 @@
       <year>2009</year>
       <year>2010</year>
       <year>2011</year>
+      <year>2012</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c
index 386d5cac8d..f98c1e968e 100644
--- a/bin/tests/rbt_test.c
+++ b/bin/tests/rbt_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012  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/bin/tests/system/masterformat/ns3/named.conf b/bin/tests/system/masterformat/ns3/named.conf
index 2d9b2b666b..e7e92aff7f 100644
--- a/bin/tests/system/masterformat/ns3/named.conf
+++ b/bin/tests/system/masterformat/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012  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/rndc/ns2/secondkey.conf b/bin/tests/system/rndc/ns2/secondkey.conf
index 99ecf54f38..99a876c0e9 100644
--- a/bin/tests/system/rndc/ns2/secondkey.conf
+++ b/bin/tests/system/rndc/ns2/secondkey.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2012  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/callbacks.c b/lib/dns/callbacks.c
index 56264f3129..64e109fb11 100644
--- a/lib/dns/callbacks.c
+++ b/lib/dns/callbacks.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2011, 2012  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/callbacks.h b/lib/dns/include/dns/callbacks.h
index 963f96189d..2963cdb845 100644
--- a/lib/dns/include/dns/callbacks.h
+++ b/lib/dns/include/dns/callbacks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2011, 2012  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/dns/version.h b/lib/dns/include/dns/version.h
index be0ce9d8a0..6143ce2452 100644
--- a/lib/dns/include/dns/version.h
+++ b/lib/dns/include/dns/version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c
index 5fa5157cbd..d84301714a 100644
--- a/lib/dns/rootns.c
+++ b/lib/dns/rootns.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2010, 2012  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/tests/rbt_test.c b/lib/dns/tests/rbt_test.c
index 4d906f0c40..9870a75739 100644
--- a/lib/dns/tests/rbt_test.c
+++ b/lib/dns/tests/rbt_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012  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
@@ -52,7 +52,7 @@
 #include <dst/dst.h>
 
 typedef struct data_holder {
- 	int len;
+	int len;
 	const char *data;
 } data_holder_t;
 
@@ -64,7 +64,7 @@ typedef struct rbt_testdata {
 
 #define DATA_ITEM(name) { (name), sizeof(name) - 1, { sizeof(name), (name) } }
 
-rbt_testdata_t testdata[] = { 
+rbt_testdata_t testdata[] = {
 	DATA_ITEM("first.com."),
 	DATA_ITEM("one.net."),
 	DATA_ITEM("two.com."),
@@ -98,40 +98,40 @@ delete_data(void *data, void *arg) {
 
 static isc_result_t
 write_data(FILE *file, unsigned char *datap, isc_uint32_t serial) {
-        size_t ret = 0;
-        data_holder_t *data = (data_holder_t *)datap; 
+	size_t ret = 0;
+	data_holder_t *data = (data_holder_t *)datap;
 	data_holder_t temp;
 	isc_uint64_t where = ftell(file);
 
 	UNUSED(serial);
-	
+
 	REQUIRE(data != NULL);
 	REQUIRE((data->len == 0 && data->data == NULL) ||
 		(data->len != 0 && data->data != NULL));
-	
+
 	temp = *data;
-        temp.data = (data->len == 0
+	temp.data = (data->len == 0
 		     ? NULL
 		     : (char *)(where + sizeof(data_holder_t)));
 
-        ret = fwrite(&temp, sizeof(data_holder_t), 1, file);
-        if (data->len > 0)
+	ret = fwrite(&temp, sizeof(data_holder_t), 1, file);
+	if (data->len > 0)
 		ret = fwrite(data->data, data->len, 1, file);
 
-        return (ISC_R_SUCCESS);
+	return (ISC_R_SUCCESS);
 }
 
 static void
 fix_data(dns_rbtnode_t *p) {
-	data_holder_t *data = p->data; 
-	
+	data_holder_t *data = p->data;
+
 	REQUIRE(data != NULL);
 	REQUIRE((data->len == 0 && data->data == NULL) ||
 		(data->len != 0 && data->data != NULL));
-	
+
 	printf("fixing data: len %d, data %p\n", data->len, data->data);
-        
-        data->data = (data->len == 0)
+
+	data->data = (data->len == 0)
 		? NULL
 		: (char *)data + sizeof(data_holder_t);
 }
@@ -148,13 +148,13 @@ add_test_data(isc_mem_t *mctx, dns_rbt_t *rbt)
 	dns_fixedname_t fname;
 	dns_name_t *name;
 	dns_compress_t cctx;
-        rbt_testdata_t *testdatap = testdata;
+	rbt_testdata_t *testdatap = testdata;
 
 	dns_compress_init(&cctx, -1, mctx);
-	
-	while (testdatap->name != NULL && testdatap->data.data != NULL) {	
+
+	while (testdatap->name != NULL && testdatap->data.data != NULL) {
 		memcpy(buffer, testdatap->name, testdatap->name_len);
-		
+
 		isc_buffer_init(&b, buffer, testdatap->name_len);
 		isc_buffer_add(&b, testdatap->name_len);
 		dns_fixedname_init(&fname);
@@ -164,7 +164,7 @@ add_test_data(isc_mem_t *mctx, dns_rbt_t *rbt)
 			testdatap++;
 			continue;
 		}
-		
+
 		if (name != NULL) {
 			result = dns_rbt_addname(rbt, name, &testdatap->data);
 			ATF_CHECK_STREQ(dns_result_totext(result), "success");
@@ -172,7 +172,7 @@ add_test_data(isc_mem_t *mctx, dns_rbt_t *rbt)
 		testdatap++;
 	}
 
-        dns_compress_invalidate(&cctx);
+	dns_compress_invalidate(&cctx);
 }
 
 /*
@@ -185,17 +185,17 @@ check_test_data(dns_rbt_t *rbt)
 	char *arg;
 	dns_fixedname_t fname;
 	dns_fixedname_t fixed;
-        dns_name_t *name;
-        isc_buffer_t b;
-        data_holder_t *data;
-        isc_result_t result;
+	dns_name_t *name;
+	isc_buffer_t b;
+	data_holder_t *data;
+	isc_result_t result;
 	dns_name_t *foundname;
 	rbt_testdata_t *testdatap = testdata;
-	
+
 	dns_fixedname_init(&fixed);
 	foundname = dns_fixedname_name(&fixed);
-	
-	while (testdatap->name != NULL && testdatap->data.data != NULL) {	
+
+	while (testdatap->name != NULL && testdatap->data.data != NULL) {
 		memcpy(buffer, testdatap->name, testdatap->name_len + 1);
 		arg = buffer;
 
@@ -208,12 +208,12 @@ check_test_data(dns_rbt_t *rbt)
 			testdatap++;
 			continue;
 		}
-		
+
 		data = NULL;
 		result = dns_rbt_findname(rbt, name, 0, foundname,
 					  (void *) &data);
 		ATF_CHECK_STREQ(dns_result_totext(result), "success");
-		
+
 		testdatap++;
 	}
 }
@@ -222,7 +222,7 @@ static void
 data_printer(FILE *out, void *datap)
 {
 	data_holder_t *data = (data_holder_t *)datap;
-	
+
 	fprintf(out, "%d bytes, %s", data->len, data->data);
 }
 
@@ -233,24 +233,24 @@ ATF_TC_HEAD(isc_rbt, tc) {
 ATF_TC_BODY(isc_rbt, tc) {
 	dns_rbt_t *rbt = NULL;
 	isc_result_t result;
-	
+
 	UNUSED(tc);
 
 	isc_mem_debugging = ISC_MEM_DEBUGRECORD;
-	
+
 	result = dns_test_begin(NULL, ISC_TRUE);
 	ATF_CHECK_STREQ(dns_result_totext(result), "success");
 	result = dns_rbt_create(mctx, delete_data, NULL, &rbt);
 	ATF_CHECK_STREQ(dns_result_totext(result), "success");
 
 	add_test_data(mctx, rbt);
-	
+
 	check_test_data(rbt);
 
 	dns_rbt_printall(rbt, data_printer);
-	
+
 	dns_rbt_destroy(&rbt);
-	
+
 	dns_test_end();
 }
 
@@ -267,18 +267,18 @@ ATF_TC_BODY(isc_serialize_rbt, tc) {
 	int fd;
 	off_t filesize = 0;
 	char *base;
-	
+
 	UNUSED(tc);
 
 	isc_mem_debugging = ISC_MEM_DEBUGRECORD;
-	
+
 	result = dns_test_begin(NULL, ISC_TRUE);
 	ATF_CHECK_STREQ(dns_result_totext(result), "success");
 	result = dns_rbt_create(mctx, delete_data, NULL, &rbt);
 	ATF_CHECK_STREQ(dns_result_totext(result), "success");
-	
+
 	add_test_data(mctx, rbt);
-	
+
 	dns_rbt_printall(rbt, data_printer);
 
 	/*
@@ -291,7 +291,7 @@ ATF_TC_BODY(isc_serialize_rbt, tc) {
 					write_data, 0, &offset);
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 	dns_rbt_destroy(&rbt);
-	
+
 	/*
 	 * Deserialize the tree
 	 */
@@ -306,19 +306,19 @@ ATF_TC_BODY(isc_serialize_rbt, tc) {
 		    PROT_READ|PROT_WRITE,
 		    MAP_FILE|MAP_PRIVATE, fd, 0);
 	ATF_REQUIRE(base != NULL && base != MAP_FAILED);
-	
+
 	result = dns_rbt_deserialize_tree(base, 0, mctx, delete_data, NULL,
 					  fix_data, NULL, &rbt_deserialized);
-	
+
 	/* Test to make sure we have a valid tree */
 	ATF_REQUIRE(result == ISC_R_SUCCESS);
 	if (rbt_deserialized == NULL)
-	        atf_tc_fail("deserialized rbt is null!"); /* Abort execution. */
-		
+		atf_tc_fail("deserialized rbt is null!"); /* Abort execution. */
+
 	check_test_data(rbt_deserialized);
 
 	dns_rbt_printall(rbt_deserialized, data_printer);
-	
+
 	dns_rbt_destroy(&rbt_deserialized);
 	munmap(base, filesize);
 	unlink("zone.bin");
@@ -331,7 +331,7 @@ ATF_TC_HEAD(dns_rbt_serialize_align, tc) {
 }
 ATF_TC_BODY(dns_rbt_serialize_align, tc) {
 	UNUSED(tc);
-	
+
 	ATF_CHECK(dns_rbt_serialize_align(0) == 0);
 	ATF_CHECK(dns_rbt_serialize_align(1) == 8);
 	ATF_CHECK(dns_rbt_serialize_align(2) == 8);
diff --git a/lib/dns/version.c b/lib/dns/version.c
index 10b60fcd3e..1059e5f406 100644
--- a/lib/dns/version.c
+++ b/lib/dns/version.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index 00e73d0541..2ad65f714c 100644
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -618,7 +618,7 @@ isc_file_mmap(void *addr, size_t len, int prot,
 	UNUSED(addr);
 	UNUSED(prot);
 	UNUSED(flags);
-	
+
 	end = lseek(fd, 0, SEEK_END);
 	lseek(fd, offset, SEEK_SET);
 	if (end - offset < (off_t) len)
diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 2161e35f70..5461395607 100644
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -669,7 +669,7 @@ isc_file_mmap(void *addr, size_t len, int prot,
 	void *buf;
 	ssize_t ret;
 	off_t end;
-	
+
 	UNUSED(addr);
 	UNUSED(prot);
 	UNUSED(flags);