diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index 9b0f66cb38..fae251631b 100644
--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
@@ -255,7 +255,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
 
 	/* Initialize the lock */
 	result = isc_mutex_init(&cd->lock);
-	if (result != ISC_R_SUCCESS) 
+	if (result != ISC_R_SUCCESS)
 		goto failed;
 
 	/* Open the library */
diff --git a/bin/tests/db_test.c b/bin/tests/db_test.c
index 4024bc59f7..d3d8b4a543 100644
--- a/bin/tests/db_test.c
+++ b/bin/tests/db_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2011-2013  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/shutdown_test.c b/bin/tests/shutdown_test.c
index 91bb0477f6..e0d6ae76ab 100644
--- a/bin/tests/shutdown_test.c
+++ b/bin/tests/shutdown_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2013  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/bin/tests/sock_test.c b/bin/tests/sock_test.c
index f6d2a39222..82a7e77555 100644
--- a/bin/tests/sock_test.c
+++ b/bin/tests/sock_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2008, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2008, 2012, 2013  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/bin/tests/task_test.c b/bin/tests/task_test.c
index 2e162b6d1e..4a22ca4850 100644
--- a/bin/tests/task_test.c
+++ b/bin/tests/task_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2013  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/bin/tests/timer_test.c b/bin/tests/timer_test.c
index cb5459ccf2..06205b7db6 100644
--- a/bin/tests/timer_test.c
+++ b/bin/tests/timer_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2013  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/dns/client.c b/lib/dns/client.c
index 182ae21afe..fc551cf9df 100644
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -2019,7 +2019,7 @@ resolveaddr_done(isc_task_t *task, isc_event_t *event) {
 				case AF_INET:
 					dns_rdataset_current(rdataset, &rdata);
 					result = dns_rdata_tostruct(&rdata, &rdata_a,
-							            NULL);
+								    NULL);
 					RUNTIME_CHECK(result == ISC_R_SUCCESS);
 					isc_sockaddr_fromin(sa,
 							    &rdata_a.in_addr,
@@ -2029,7 +2029,7 @@ resolveaddr_done(isc_task_t *task, isc_event_t *event) {
 				case AF_INET6:
 					dns_rdataset_current(rdataset, &rdata);
 					result = dns_rdata_tostruct(&rdata, &rdata_aaaa,
-							            NULL);
+								    NULL);
 					RUNTIME_CHECK(result == ISC_R_SUCCESS);
 					isc_sockaddr_fromin6(sa,
 							     &rdata_aaaa.in6_addr,
diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c
index fc62da12ac..1de540f296 100644
--- a/lib/irs/getaddrinfo.c
+++ b/lib/irs/getaddrinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2012, 2013  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
@@ -785,7 +785,7 @@ process_answer(isc_task_t *task, isc_event_t *event) {
 				case AF_INET:
 					dns_rdataset_current(rdataset, &rdata);
 					result = dns_rdata_tostruct(&rdata, &rdata_a,
-							            NULL);
+								    NULL);
 					RUNTIME_CHECK(result == ISC_R_SUCCESS);
 					SIN(ai->ai_addr)->sin_port =
 						resstate->head->ai_port;
@@ -796,7 +796,7 @@ process_answer(isc_task_t *task, isc_event_t *event) {
 				case AF_INET6:
 					dns_rdataset_current(rdataset, &rdata);
 					result = dns_rdata_tostruct(&rdata, &rdata_aaaa,
-							            NULL);
+								    NULL);
 					RUNTIME_CHECK(result == ISC_R_SUCCESS);
 					SIN6(ai->ai_addr)->sin6_port =
 						resstate->head->ai_port;
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 668fbcd1ba..00881256af 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1341,7 +1341,7 @@ process_cmsg(isc__socket_t *sock, struct msghdr *msg, isc_socketevent_t *dev) {
 		if (cmsgp->cmsg_level == IPPROTO_IP
 		    && (cmsgp->cmsg_type == IP_TOS
 #ifdef IP_RECVTOS
-		        || cmsgp->cmsg_type == IP_RECVTOS
+			|| cmsgp->cmsg_type == IP_RECVTOS
 #endif
 			)) {
 			dev->dscp = (int) *(uint8_t *)CMSG_DATA(cmsgp);
diff --git a/lib/samples/Makefile-postinstall.in b/lib/samples/Makefile-postinstall.in
index 5b1aafba72..5a65539ec8 100644
--- a/lib/samples/Makefile-postinstall.in
+++ b/lib/samples/Makefile-postinstall.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2012, 2013  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/samples/nsprobe.c b/lib/samples/nsprobe.c
index 54cc7146c8..a97046e307 100644
--- a/lib/samples/nsprobe.c
+++ b/lib/samples/nsprobe.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-2013  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/samples/resolve.c b/lib/samples/resolve.c
index f03c6910ad..935867e98b 100644
--- a/lib/samples/resolve.c
+++ b/lib/samples/resolve.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  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/samples/sample-async.c b/lib/samples/sample-async.c
index e646e795e9..fe0cb6556b 100644
--- a/lib/samples/sample-async.c
+++ b/lib/samples/sample-async.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2013  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/samples/sample-gai.c b/lib/samples/sample-gai.c
index 1aa4c311c6..bcb9981688 100644
--- a/lib/samples/sample-gai.c
+++ b/lib/samples/sample-gai.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2012, 2013  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/samples/sample-request.c b/lib/samples/sample-request.c
index 46629f0328..fc212d440b 100644
--- a/lib/samples/sample-request.c
+++ b/lib/samples/sample-request.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2012, 2013  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/samples/sample-update.c b/lib/samples/sample-update.c
index aa20b58707..c8c2790a16 100644
--- a/lib/samples/sample-update.c
+++ b/lib/samples/sample-update.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2010, 2012, 2013  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