diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 96b896d507..390748cbed 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.261 2010/06/03 03:13:31 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.262 2010/06/03 23:51:04 tbox Exp $ */
 
 /*! \file */
 
@@ -2112,9 +2112,9 @@ nsecify(void) {
 				check_result(result, "dns_dbiterator_next()");
 			dns_db_detachnode(gdb, &node);
 			continue;
-		} 
+		}
 
-		if (dns_name_equal(name, gorigin)) 
+		if (dns_name_equal(name, gorigin))
 			remove_records(node, dns_rdatatype_nsec3param);
 
 		if (delegation(name, node, &nsttl)) {
@@ -2516,21 +2516,21 @@ nsec3ify(unsigned int hashalg, unsigned int iterations,
 	while (!done) {
 		result = dns_dbiterator_current(dbiter, &node, name);
 		check_dns_dbiterator_current(result);
-                /*
-                 * Skip out-of-zone records.
-                 */
-                if (!dns_name_issubdomain(name, gorigin)) {
-                        result = dns_dbiterator_next(dbiter);
-                        if (result == ISC_R_NOMORE)
-                                done = ISC_TRUE;
-                        else
-                                check_result(result, "dns_dbiterator_next()");
-                        dns_db_detachnode(gdb, &node);
-                        continue;
-                }
- 
-                if (dns_name_equal(name, gorigin))
-                        remove_records(node, dns_rdatatype_nsec);
+		/*
+		 * Skip out-of-zone records.
+		 */
+		if (!dns_name_issubdomain(name, gorigin)) {
+			result = dns_dbiterator_next(dbiter);
+			if (result == ISC_R_NOMORE)
+				done = ISC_TRUE;
+			else
+				check_result(result, "dns_dbiterator_next()");
+			dns_db_detachnode(gdb, &node);
+			continue;
+		}
+
+		if (dns_name_equal(name, gorigin))
+			remove_records(node, dns_rdatatype_nsec);
 
 		result = dns_dbiterator_next(dbiter);
 		nextnode = NULL;
@@ -2659,7 +2659,7 @@ nsec3ify(unsigned int hashalg, unsigned int iterations,
 				check_result(result, "dns_dbiterator_next()");
 			dns_db_detachnode(gdb, &node);
 			continue;
-		} 
+		}
 		result = dns_dbiterator_next(dbiter);
 		nextnode = NULL;
 		while (result == ISC_R_SUCCESS) {
diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index 0842eeaa7d..d8b338829c 100644
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007-2010  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.26 2010/06/03 03:13:32 marka Exp $
+# $Id: clean.sh,v 1.27 2010/06/03 23:51:05 tbox Exp $
 
 rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed */trusted.conf */tmp* */*.jnl */*.bk
 rm -f ns1/root.db ns2/example.db ns3/secure.example.db
diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index c392bb2bfd..02b8d868c6 100644
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  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: platform.h.in,v 1.54 2010/06/03 02:27:11 marka Exp $ */
+/* $Id: platform.h.in,v 1.55 2010/06/03 23:51:05 tbox Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1