diff --git a/FAQ.xml b/FAQ.xml
index d25380007b..7b21689ce9 100644
--- a/FAQ.xml
+++ b/FAQ.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []>
 <!--
- - Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: FAQ.xml,v 1.53 2010/01/19 06:57:37 marka Exp $ -->
+<!-- $Id: FAQ.xml,v 1.54 2010/01/19 23:48:55 tbox Exp $ -->
 
 <article class="faq">
   <title>Frequently Asked Questions about BIND 9</title>
@@ -29,6 +29,7 @@
       <year>2007</year>
       <year>2008</year>
       <year>2009</year>
+      <year>2010</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>
diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c
index eddc13a75f..b9d2ed4859 100644
--- a/bin/dnssec/dnssec-keyfromlabel.c
+++ b/bin/dnssec/dnssec-keyfromlabel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2007-2010  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-keyfromlabel.c,v 1.30 2010/01/19 20:26:07 each Exp $ */
+/* $Id: dnssec-keyfromlabel.c,v 1.31 2010/01/19 23:48:55 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/dnssec/dnssec-keyfromlabel.docbook b/bin/dnssec/dnssec-keyfromlabel.docbook
index 1d32f83933..2284f46478 100644
--- a/bin/dnssec/dnssec-keyfromlabel.docbook
+++ b/bin/dnssec/dnssec-keyfromlabel.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2010  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
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-keyfromlabel.docbook,v 1.16 2010/01/19 20:26:07 each Exp $ -->
+<!-- $Id: dnssec-keyfromlabel.docbook,v 1.17 2010/01/19 23:48:55 tbox Exp $ -->
 <refentry id="man.dnssec-keyfromlabel">
   <refentryinfo>
     <date>February 8, 2008</date>
@@ -38,6 +38,7 @@
     <copyright>
       <year>2008</year>
       <year>2009</year>
+      <year>2010</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 46651b770e..28ed05adea 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-keygen.c,v 1.111 2010/01/19 20:26:07 each Exp $ */
+/* $Id: dnssec-keygen.c,v 1.112 2010/01/19 23:48:55 tbox Exp $ */
 
 /*! \file */
 
@@ -826,9 +826,9 @@ main(int argc, char **argv) {
 				  alg, mctx, NULL)) {
 			conflict = ISC_TRUE;
 			if (null_key) {
-                                dst_key_free(&key);
+				dst_key_free(&key);
 				break;
-                        }
+			}
 
 			if (verbose > 0) {
 				isc_buffer_clear(&buf);
diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index 79b56352f0..c2195822fe 100644
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 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: dnssectool.c,v 1.59 2010/01/19 20:26:07 each Exp $ */
+/* $Id: dnssectool.c,v 1.60 2010/01/19 23:48:56 tbox Exp $ */
 
 /*! \file */
 
@@ -414,7 +414,7 @@ key_collision(isc_uint16_t id, dns_name_t *name, const char *dir,
 	dns_dnsseckeylist_t matchkeys;
 	dns_dnsseckey_t *key = NULL;
 	isc_uint16_t oldid, diff;
-        isc_uint16_t bits = DNS_KEYFLAG_REVOKE;   /* flag bits to look for */
+	isc_uint16_t bits = DNS_KEYFLAG_REVOKE;   /* flag bits to look for */
 
 	if (exact != NULL)
 		*exact = ISC_FALSE;
@@ -435,16 +435,16 @@ key_collision(isc_uint16_t id, dns_name_t *name, const char *dir,
 			conflict = ISC_TRUE;
 			if (diff != 0) {
 				if (verbose > 1)
-                                        fprintf(stderr, "Key ID %d could "
+					fprintf(stderr, "Key ID %d could "
 						"collide with %d\n",
 						id, oldid);
 			} else {
 				if (exact != NULL)
 					*exact = ISC_TRUE;
 				if (verbose > 1)
-                                        fprintf(stderr, "Key ID %d exists\n",
+					fprintf(stderr, "Key ID %d exists\n",
 						id);
-                        }
+			}
 		}
 
  next:
@@ -452,7 +452,7 @@ key_collision(isc_uint16_t id, dns_name_t *name, const char *dir,
 		dns_dnsseckey_destroy(mctx, &key);
 	}
 
-        /* Finish freeing the list */
+	/* Finish freeing the list */
 	while (!ISC_LIST_EMPTY(matchkeys)) {
 		key = ISC_LIST_HEAD(matchkeys);
 		ISC_LIST_UNLINK(matchkeys, key, link);
diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h
index e0982fc349..2215e7213c 100644
--- a/bin/dnssec/dnssectool.h
+++ b/bin/dnssec/dnssectool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 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: dnssectool.h,v 1.30 2010/01/19 20:26:07 each Exp $ */
+/* $Id: dnssectool.h,v 1.31 2010/01/19 23:48:56 tbox Exp $ */
 
 #ifndef DNSSECTOOL_H
 #define DNSSECTOOL_H 1