diff --git a/lib/dns/acache.c b/lib/dns/acache.c
index ac77305cb0..d7a11f7643 100644
--- a/lib/dns/acache.c
+++ b/lib/dns/acache.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2012, 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
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 7fe7d39fc7..31997547a0 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -723,16 +723,16 @@ dns_name_equal(const dns_name_t *name1, const dns_name_t *name2) {
 
 		/* Loop unrolled for performance */
 		while (count > 3) {
-		        c = maptolower[label1[0]];
+			c = maptolower[label1[0]];
 			if (c != maptolower[label2[0]])
 				return (ISC_FALSE);
-		        c = maptolower[label1[1]];
+			c = maptolower[label1[1]];
 			if (c != maptolower[label2[1]])
 				return (ISC_FALSE);
-		        c = maptolower[label1[2]];
+			c = maptolower[label1[2]];
 			if (c != maptolower[label2[2]])
 				return (ISC_FALSE);
-		        c = maptolower[label1[3]];
+			c = maptolower[label1[3]];
 			if (c != maptolower[label2[3]])
 				return (ISC_FALSE);
 			count -= 4;
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index a2ec3bc70d..1a26fd2b80 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -662,10 +662,10 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) {
 
 	if (result == ISC_R_SUCCESS) {
 #ifdef DNS_RBT_USEHASH
-	        if (*root == NULL)
-		        UPPERNODE(new_current) = current;
+		if (*root == NULL)
+			UPPERNODE(new_current) = current;
 		else
-		        UPPERNODE(new_current) = PARENT(*root);
+			UPPERNODE(new_current) = PARENT(*root);
 #endif /* DNS_RBT_USEHASH */
 		dns_rbt_addonlevel(new_current, current, order, root);
 		rbt->nodecount++;
diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index 7bbe0fe5e5..174565fd5d 100644
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-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
diff --git a/lib/dns/tests/dnstest.h b/lib/dns/tests/dnstest.h
index 64a3261631..c0c81fad3a 100644
--- a/lib/dns/tests/dnstest.h
+++ b/lib/dns/tests/dnstest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2012, 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
diff --git a/lib/isc/include/isc/hash.h b/lib/isc/include/isc/hash.h
index 6f96ea7588..b084ad2810 100644
--- a/lib/isc/include/isc/hash.h
+++ b/lib/isc/include/isc/hash.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2013, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index 1f062b5365..195f1c1c73 100644
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -364,7 +364,7 @@ isc_sockaddr_pf(const isc_sockaddr_t *sockaddr) {
 
 void
 isc_sockaddr_fromnetaddr(isc_sockaddr_t *sockaddr, const isc_netaddr_t *na,
-		         in_port_t port)
+			 in_port_t port)
 {
 	memset(sockaddr, 0, sizeof(*sockaddr));
 	sockaddr->type.sin.sin_family = na->family;