diff --git a/bin/named/client.c b/bin/named/client.c
index ae2fe3f2bb..e8c1da679e 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.279 2011/10/11 00:09:01 each Exp $ */
+/* $Id: client.c,v 1.280 2011/10/11 23:46:44 tbox Exp $ */
 
 #include <config.h>
 
@@ -2856,7 +2856,7 @@ ns_client_qnamereplace(ns_client_t *client, dns_name_t *name) {
 isc_result_t
 ns_client_sourceip(dns_clientinfo_t *ci, isc_sockaddr_t **addrp) {
 	ns_client_t *client = (ns_client_t *) ci->data;
-		
+
 	REQUIRE(NS_CLIENT_VALID(client));
 	REQUIRE(addrp != NULL);
 
diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h
index 4f689d56df..3481256da4 100644
--- a/bin/named/include/named/client.h
+++ b/bin/named/include/named/client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.h,v 1.93 2011/10/11 00:09:01 each Exp $ */
+/* $Id: client.h,v 1.94 2011/10/11 23:46:44 tbox Exp $ */
 
 #ifndef NAMED_CLIENT_H
 #define NAMED_CLIENT_H 1
diff --git a/bin/named/query.c b/bin/named/query.c
index b78b9e8d68..b52f9cb271 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.370 2011/10/11 00:09:01 each Exp $ */
+/* $Id: query.c,v 1.371 2011/10/11 23:46:44 tbox Exp $ */
 
 /*! \file */
 
@@ -1278,7 +1278,7 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
 	}
 	result = dns_db_findext(db, name, version, type,
 				client->query.dboptions |
-			         DNS_DBFIND_GLUEOK | DNS_DBFIND_ADDITIONALOK,
+				 DNS_DBFIND_GLUEOK | DNS_DBFIND_ADDITIONALOK,
 				client->now, &node, fname, &cm, &ci,
 				rdataset, sigrdataset);
 	if (result == DNS_R_GLUE &&
@@ -1771,7 +1771,7 @@ query_addadditional2(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
 
 	result = dns_db_findext(db, name, version, type,
 				client->query.dboptions |
-			 	 DNS_DBFIND_GLUEOK | DNS_DBFIND_ADDITIONALOK,
+				 DNS_DBFIND_GLUEOK | DNS_DBFIND_ADDITIONALOK,
 				client->now, &node, fname, &cm, &ci,
 				NULL, NULL);
 	if (result == ISC_R_SUCCESS)
diff --git a/contrib/sdb/dir/dirdb.c b/contrib/sdb/dir/dirdb.c
index 70e18bd3a8..efaf892c27 100644
--- a/contrib/sdb/dir/dirdb.c
+++ b/contrib/sdb/dir/dirdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dirdb.c,v 1.13 2011/10/11 00:09:02 each Exp $ */
+/* $Id: dirdb.c,v 1.14 2011/10/11 23:46:45 tbox Exp $ */
 
 /*
  * A simple database driver that returns basic information about
@@ -91,7 +91,7 @@ dirdb_lookup(const char *zone, const char *name, void *dbdata,
 		snprintf(filename, sizeof(filename), "%s/%s",
 			 (char *)dbdata, name);
 	CHECKN(lstat(filename, &statbuf));
-	
+
 	if (S_ISDIR(statbuf.st_mode))
 		CHECK(dns_sdb_putrr(lookup, "txt", 3600, "dir"));
 	else if (S_ISCHR(statbuf.st_mode) || S_ISBLK(statbuf.st_mode)) {
diff --git a/contrib/sdb/pgsql/pgsqldb.c b/contrib/sdb/pgsql/pgsqldb.c
index bf09282487..fa3d453d81 100644
--- a/contrib/sdb/pgsql/pgsqldb.c
+++ b/contrib/sdb/pgsql/pgsqldb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: pgsqldb.c,v 1.16 2011/10/11 00:09:02 each Exp $ */
+/* $Id: pgsqldb.c,v 1.17 2011/10/11 23:46:45 tbox Exp $ */
 
 #include <config.h>
 
@@ -43,7 +43,7 @@
  * connection to the database per zone, which is inefficient.  It also may
  * not handle quoting correctly.
  *
- * The table must contain the fields "name", "rdtype", and "rdata", and 
+ * The table must contain the fields "name", "rdtype", and "rdata", and
  * is expected to contain a properly constructed zone.  The program "zonetodb"
  * creates such a table.
  */
diff --git a/contrib/sdb/tcl/tcldb.c b/contrib/sdb/tcl/tcldb.c
index d57e1efbd7..9035600e72 100644
--- a/contrib/sdb/tcl/tcldb.c
+++ b/contrib/sdb/tcl/tcldb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tcldb.c,v 1.11 2011/10/11 00:09:02 each Exp $ */
+/* $Id: tcldb.c,v 1.12 2011/10/11 23:46:45 tbox Exp $ */
 
 /*
  * A simple database driver that calls a Tcl procedure to define
@@ -85,7 +85,7 @@ tcldb_driver_create(isc_mem_t *mctx, tcldb_driver_t **driverp) {
  cleanup:
 	isc_mem_put(mctx, driver, sizeof(tcldb_driver_t));
 	return (result);
-	
+
 }
 
 static void
@@ -195,13 +195,13 @@ tcldb_create(const char *zone, int argc, char **argv,
 	tcldb_driver_t *driver = (tcldb_driver_t *) driverdata;
 
 	char *list = Tcl_Merge(argc, argv);
-	
+
 	Tcl_SetVar2(driver->interp, (char *) "dbargs", (char *) zone, list, 0);
 
 	Tcl_Free(list);
 
 	*dbdata = driverdata;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -223,11 +223,11 @@ isc_result_t
 tcldb_init(void) {
 	isc_result_t result;
 	int flags = DNS_SDBFLAG_RELATIVEOWNER | DNS_SDBFLAG_RELATIVERDATA;
-	
+
 	result = tcldb_driver_create(ns_g_mctx, &the_driver);
 	if (result != ISC_R_SUCCESS)
 		return (result);
-	
+
 	return (dns_sdb_register("tcl", &tcldb_methods, the_driver, flags,
 				 ns_g_mctx, &tcldb));
 }
diff --git a/contrib/sdb/time/timedb.c b/contrib/sdb/time/timedb.c
index b2311c0b4c..704014f13e 100644
--- a/contrib/sdb/time/timedb.c
+++ b/contrib/sdb/time/timedb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timedb.c,v 1.11 2011/10/11 00:09:03 each Exp $ */
+/* $Id: timedb.c,v 1.12 2011/10/11 23:46:45 tbox Exp $ */
 
 /*
  * A simple database driver that enables the server to return the
@@ -43,10 +43,10 @@ static dns_sdbimplementation_t *timedb = NULL;
 /*
  * This database operates on relative names.
  *
- * "time" and "@" return the time in a TXT record.  
+ * "time" and "@" return the time in a TXT record.
  * "clock" is a CNAME to "time"
  * "current" is a DNAME to "@" (try time.current.time)
- */ 
+ */
 #ifdef DNS_CLIENTINFO_VERSION
 static isc_result_t
 timedb_lookup(const char *zone, const char *name, void *dbdata,
diff --git a/lib/dns/include/dns/clientinfo.h b/lib/dns/include/dns/clientinfo.h
index b947197ffd..4f2b89cda4 100644
--- a/lib/dns/include/dns/clientinfo.h
+++ b/lib/dns/include/dns/clientinfo.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: clientinfo.h,v 1.2 2011/10/11 00:09:03 each Exp $ */
+/* $Id: clientinfo.h,v 1.3 2011/10/11 23:46:45 tbox Exp $ */
 
 #ifndef DNS_CLIENTINFO_H
 #define DNS_CLIENTINFO_H 1
@@ -31,7 +31,7 @@
  * The clientinfo interface is used by the DNS DB and DLZ interfaces;
  * it allows databases to modify their answers on the basis of information
  * about the client, such as source IP address.
- * 
+ *
  * dns_clientinfo_t contains a pointer to an opaque structure containing
  * client information in some form.  dns_clientinfomethods_t contains a
  * list of methods which operate on that opaque structure to return
diff --git a/lib/dns/include/dns/dlz_dlopen.h b/lib/dns/include/dns/dlz_dlopen.h
index 7975f902ce..c101a56919 100644
--- a/lib/dns/include/dns/dlz_dlopen.h
+++ b/lib/dns/include/dns/dlz_dlopen.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlz_dlopen.h,v 1.3 2011/10/11 00:09:03 each Exp $ */
+/* $Id: dlz_dlopen.h,v 1.4 2011/10/11 23:46:45 tbox Exp $ */
 
 /*! \file dns/dlz_open.h */
 
@@ -123,7 +123,7 @@ typedef isc_result_t dlz_dlopen_configure_t (dns_view_t *view,
  * before sending a replay.
  */
 typedef isc_result_t dlz_dlopen_setclientcallback_t (dns_view_t *view,
-                                                     void *dbdata);
+						     void *dbdata);
 
 
 /*
diff --git a/lib/dns/include/dns/sdb.h b/lib/dns/include/dns/sdb.h
index b6b3a79b1e..1f142bee88 100644
--- a/lib/dns/include/dns/sdb.h
+++ b/lib/dns/include/dns/sdb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb.h,v 1.24 2011/10/11 00:09:03 each Exp $ */
+/* $Id: sdb.h,v 1.25 2011/10/11 23:46:45 tbox Exp $ */
 
 #ifndef DNS_SDB_H
 #define DNS_SDB_H 1