diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index bcd9e77ef5..ba3fef001a 100644
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -374,7 +374,7 @@ dns_rdata_opt_current(dns_rdata_opt_t *opt, dns_rdata_opt_opcode_t *opcode) {
 	INSIST(opt->offset + 4 <= opt->length);
 	r.base = opt->options + opt->offset;
 	r.length = opt->length - opt->offset;
-	
+
 	opcode->opcode = uint16_fromregion(&r);
 	isc_region_consume(&r, 2);
 	opcode->length = uint16_fromregion(&r);
diff --git a/lib/dns/rdata/generic/spf_99.h b/lib/dns/rdata/generic/spf_99.h
index 04bb119f25..35ec9bc9ff 100644
--- a/lib/dns/rdata/generic/spf_99.h
+++ b/lib/dns/rdata/generic/spf_99.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -21,17 +21,17 @@
 /* $Id: spf_99.h,v 1.4 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_spf_string {
-                isc_uint8_t    length;
-                unsigned char   *data;
+		isc_uint8_t    length;
+		unsigned char   *data;
 } dns_rdata_spf_string_t;
 
 typedef struct dns_rdata_spf {
-        dns_rdatacommon_t       common;
-        isc_mem_t               *mctx;
-        unsigned char           *txt;
-        isc_uint16_t            txt_len;
-        /* private */
-        isc_uint16_t            offset;
+	dns_rdatacommon_t       common;
+	isc_mem_t               *mctx;
+	unsigned char           *txt;
+	isc_uint16_t            txt_len;
+	/* private */
+	isc_uint16_t            offset;
 } dns_rdata_spf_t;
 
 /*
diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index 8732072f41..0cbe3ea6f1 100644
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -271,35 +271,35 @@ dns_rdata_txt_next(dns_rdata_txt_t *txt) {
 	REQUIRE(txt->txt != NULL && txt->txt_len != 0);
 
 	INSIST(txt->offset + 1 <= txt->txt_len);
-        r.base = txt->txt + txt->offset;
-        r.length = txt->txt_len - txt->offset;
-        length = uint8_fromregion(&r);
-        INSIST(txt->offset + 1 + length <= txt->txt_len);
-        txt->offset = txt->offset + 1 + length;
-        if (txt->offset == txt->txt_len)
-                return (ISC_R_NOMORE);
-        return (ISC_R_SUCCESS);
+	r.base = txt->txt + txt->offset;
+	r.length = txt->txt_len - txt->offset;
+	length = uint8_fromregion(&r);
+	INSIST(txt->offset + 1 + length <= txt->txt_len);
+	txt->offset = txt->offset + 1 + length;
+	if (txt->offset == txt->txt_len)
+		return (ISC_R_NOMORE);
+	return (ISC_R_SUCCESS);
 }
 
 isc_result_t
 dns_rdata_txt_current(dns_rdata_txt_t *txt, dns_rdata_txt_string_t *string) {
-        isc_region_t r;
+	isc_region_t r;
 
-        REQUIRE(txt != NULL);
-        REQUIRE(string != NULL);
-        REQUIRE(txt->common.rdtype == 16);
-        REQUIRE(txt->txt != NULL);
-        REQUIRE(txt->offset < txt->txt_len);
+	REQUIRE(txt != NULL);
+	REQUIRE(string != NULL);
+	REQUIRE(txt->common.rdtype == 16);
+	REQUIRE(txt->txt != NULL);
+	REQUIRE(txt->offset < txt->txt_len);
 
-        INSIST(txt->offset + 1 <= txt->txt_len);
-        r.base = txt->txt + txt->offset;
-        r.length = txt->txt_len - txt->offset;
+	INSIST(txt->offset + 1 <= txt->txt_len);
+	r.base = txt->txt + txt->offset;
+	r.length = txt->txt_len - txt->offset;
 
-        string->length = uint8_fromregion(&r);
-        isc_region_consume(&r, 1);
-        string->data = r.base;
-        INSIST(txt->offset + 1 + string->length <= txt->txt_len);
+	string->length = uint8_fromregion(&r);
+	isc_region_consume(&r, 1);
+	string->data = r.base;
+	INSIST(txt->offset + 1 + string->length <= txt->txt_len);
 
-        return (ISC_R_SUCCESS);
+	return (ISC_R_SUCCESS);
 }
 #endif	/* RDATA_GENERIC_TXT_16_C */
diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c
index eb4e75a503..ec43043ff8 100644
--- a/lib/irs/getnameinfo.c
+++ b/lib/irs/getnameinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2011-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/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 7a41eb89ea..290299bb86 100644
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -195,11 +195,11 @@ struct in6_pktinfo {
 #ifdef ISC_PLATFORM_HAVESALEN
 #define _SS_PAD1SIZE (_SS_ALIGNSIZE - (2 * sizeof(isc_uint8_t)))
 #define _SS_PAD2SIZE (_SS_MAXSIZE - (_SS_ALIGNSIZE + _SS_PAD1SIZE \
-                       + 2 * sizeof(isc_uint8_t)))
+		       + 2 * sizeof(isc_uint8_t)))
 #else
 #define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(isc_uint16_t))
 #define _SS_PAD2SIZE (_SS_MAXSIZE - (_SS_ALIGNSIZE + _SS_PAD1SIZE \
-                        + sizeof(isc_uint16_t)))
+			+ sizeof(isc_uint16_t)))
 #endif
 
 struct sockaddr_storage {
diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
index cd63755986..82ef9c255f 100644
--- a/lib/isc/unix/stdio.c
+++ b/lib/isc/unix/stdio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011-2014  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/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index f1d272282d..e50c0a0607 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -1823,7 +1823,7 @@ socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
 	*socketp = sock;
 
 	iocompletionport_update(sock);
-	
+
 	if (dup_socket) {
 #ifndef ISC_ALLOW_MAPPED
 		isc__socket_ipv6only(sock, ISC_TRUE);