diff --git a/util/copyrights b/util/copyrights
index fd3e129842..8a639b52fe 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -536,37 +536,38 @@
 ./bin/tests/system/acl/ns2/named4.conf		CONF-C	2008
 ./bin/tests/system/acl/setup.sh			SH	2008
 ./bin/tests/system/acl/tests.sh			SH	2008
-./bin/tests/system/autosign/clean.sh		SH	2009
+./bin/tests/system/autosign/clean.sh		SH	2009,2010
 ./bin/tests/system/autosign/ns1/.cvsignore	X	2009
-./bin/tests/system/autosign/ns1/keygen.sh	SH	2009
+./bin/tests/system/autosign/ns1/keygen.sh	SH	2009,2010
 ./bin/tests/system/autosign/ns1/named.conf	CONF-C	2009
-./bin/tests/system/autosign/ns1/root.db.in	ZONE	2009
+./bin/tests/system/autosign/ns1/root.db.in	ZONE	2009,2010
 ./bin/tests/system/autosign/ns2/.cvsignore	X	2009
+./bin/tests/system/autosign/ns2/bar.db.in	ZONE	2010
 ./bin/tests/system/autosign/ns2/child.nsec3.example.db	ZONE	2009
 ./bin/tests/system/autosign/ns2/child.optout.example.db	ZONE	2009
 ./bin/tests/system/autosign/ns2/dst.example.db.in	ZONE	2009
-./bin/tests/system/autosign/ns2/example.db.in	ZONE	2009
+./bin/tests/system/autosign/ns2/example.db.in	ZONE	2009,2010
 ./bin/tests/system/autosign/ns2/insecure.secure.example.db	ZONE	2009
-./bin/tests/system/autosign/ns2/keygen.sh	SH	2009
-./bin/tests/system/autosign/ns2/named.conf	CONF-C	2009
+./bin/tests/system/autosign/ns2/keygen.sh	SH	2009,2010
+./bin/tests/system/autosign/ns2/named.conf	CONF-C	2009,2010
 ./bin/tests/system/autosign/ns2/private.secure.example.db.in	ZONE	2009
-./bin/tests/system/autosign/ns2/revkeys.shar    X       2010
+./bin/tests/system/autosign/ns2/revkeys.shar	X	2010
 ./bin/tests/system/autosign/ns3/.cvsignore	X	2009
 ./bin/tests/system/autosign/ns3/insecure.example.db	ZONE	2009
-./bin/tests/system/autosign/ns3/keygen.sh	SH	2009
-./bin/tests/system/autosign/ns3/named.conf	CONF-C	2009
-./bin/tests/system/autosign/ns3/nsec.example.db.in      ZONE    2010
-./bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in     ZONE    2010
+./bin/tests/system/autosign/ns3/keygen.sh	SH	2009,2010
+./bin/tests/system/autosign/ns3/named.conf	CONF-C	2009,2010
+./bin/tests/system/autosign/ns3/nsec.example.db.in	ZONE	2010
+./bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in	ZONE	2010
 ./bin/tests/system/autosign/ns3/nsec3.example.db.in	ZONE	2009
 ./bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in	ZONE	2009
 ./bin/tests/system/autosign/ns3/nsec3.optout.example.db.in	ZONE	2009
-./bin/tests/system/autosign/ns3/oldsigs.example.db.in   ZONE    2010
+./bin/tests/system/autosign/ns3/oldsigs.example.db.in	ZONE	2010
 ./bin/tests/system/autosign/ns3/optout.example.db.in	ZONE	2009
 ./bin/tests/system/autosign/ns3/optout.nsec3.example.db.in	ZONE	2009
 ./bin/tests/system/autosign/ns3/optout.optout.example.db.in	ZONE	2009
 ./bin/tests/system/autosign/ns3/rsasha256.example.db.in	ZONE	2009
 ./bin/tests/system/autosign/ns3/rsasha512.example.db.in	ZONE	2009
-./bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in        ZONE    2010
+./bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in	ZONE	2010
 ./bin/tests/system/autosign/ns3/secure.example.db.in	ZONE	2009
 ./bin/tests/system/autosign/ns3/secure.nsec3.example.db.in	ZONE	2009
 ./bin/tests/system/autosign/ns3/secure.optout.example.db.in	ZONE	2009
@@ -574,9 +575,9 @@
 ./bin/tests/system/autosign/ns4/named.conf	CONF-C	2009
 ./bin/tests/system/autosign/ns5/.cvsignore	X	2009
 ./bin/tests/system/autosign/ns5/named.conf	CONF-C	2009
-./bin/tests/system/autosign/prereq.sh		SH	2009
-./bin/tests/system/autosign/setup.sh		SH	2009
-./bin/tests/system/autosign/tests.sh		SH	2009
+./bin/tests/system/autosign/prereq.sh		SH	2009,2010
+./bin/tests/system/autosign/setup.sh		SH	2009,2010
+./bin/tests/system/autosign/tests.sh		SH	2009,2010
 ./bin/tests/system/cacheclean/clean.sh		SH	2001,2004,2007
 ./bin/tests/system/cacheclean/dig.batch		X	2001
 ./bin/tests/system/cacheclean/knowngood.dig.out	X	2001
@@ -611,7 +612,7 @@
 ./bin/tests/system/common/controls.conf		CONF-C	2000,2001,2004,2007
 ./bin/tests/system/common/rndc.conf		CONF-C	2000,2001,2004,2007
 ./bin/tests/system/common/root.hint		ZONE	2000,2001,2004,2007
-./bin/tests/system/conf.sh.in			SH	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
+./bin/tests/system/conf.sh.in			SH	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
 ./bin/tests/system/dialup/ns1/.cvsignore	X	2000,2001
 ./bin/tests/system/dialup/ns1/example.db	ZONE	2000,2001,2004,2007
 ./bin/tests/system/dialup/ns1/named.conf	CONF-C	2000,2001,2004,2007
@@ -657,12 +658,12 @@
 ./bin/tests/system/dnssec/ns2/child.optout.example.db	ZONE	2006,2008
 ./bin/tests/system/dnssec/ns2/dlv.db.in		ZONE	2004,2007
 ./bin/tests/system/dnssec/ns2/dst.example.db.in	ZONE	2004,2007
-./bin/tests/system/dnssec/ns2/example.db.in	ZONE	2000,2001,2002,2004,2007,2008,2009
+./bin/tests/system/dnssec/ns2/example.db.in	ZONE	2000,2001,2002,2004,2007,2008,2009,2010
 ./bin/tests/system/dnssec/ns2/insecure.secure.example.db	ZONE	2000,2001,2004,2007
 ./bin/tests/system/dnssec/ns2/named.conf	CONF-C	2000,2001,2002,2004,2006,2007,2008
 ./bin/tests/system/dnssec/ns2/private.secure.example.db.in	ZONE	2000,2001,2004,2007
 ./bin/tests/system/dnssec/ns2/rfc2335.example.db	X	2004
-./bin/tests/system/dnssec/ns2/sign.sh		SH	2000,2001,2002,2003,2004,2006,2007,2008,2009
+./bin/tests/system/dnssec/ns2/sign.sh		SH	2000,2001,2002,2003,2004,2006,2007,2008,2009,2010
 ./bin/tests/system/dnssec/ns3/.cvsignore	X	2000,2001
 ./bin/tests/system/dnssec/ns3/bogus.example.db.in	ZONE	2000,2001,2004,2007
 ./bin/tests/system/dnssec/ns3/dynamic.example.db.in	ZONE	2002,2004,2007
@@ -670,9 +671,9 @@
 ./bin/tests/system/dnssec/ns3/insecure.nsec3.example.db	ZONE	2008
 ./bin/tests/system/dnssec/ns3/insecure.optout.example.db	ZONE	2008
 ./bin/tests/system/dnssec/ns3/keyless.example.db.in	ZONE	2001,2002,2004,2007
-./bin/tests/system/dnssec/ns3/kskonly.example.db.in     ZONE    2010
+./bin/tests/system/dnssec/ns3/kskonly.example.db.in	ZONE	2010
 ./bin/tests/system/dnssec/ns3/multiple.example.db.in	ZONE	2006,2008
-./bin/tests/system/dnssec/ns3/named.conf	CONF-C	2000,2001,2002,2004,2006,2007,2008,2009
+./bin/tests/system/dnssec/ns3/named.conf	CONF-C	2000,2001,2002,2004,2006,2007,2008,2009,2010
 ./bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in	ZONE	2006,2008
 ./bin/tests/system/dnssec/ns3/nsec3.example.db.in	ZONE	2006,2008
 ./bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in	ZONE	2008
@@ -686,7 +687,7 @@
 ./bin/tests/system/dnssec/ns3/secure.example.db.in	ZONE	2000,2001,2004,2007,2008
 ./bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in	ZONE	2008
 ./bin/tests/system/dnssec/ns3/secure.optout.example.db.in	ZONE	2008
-./bin/tests/system/dnssec/ns3/sign.sh		SH	2000,2001,2002,2004,2006,2007,2008,2009
+./bin/tests/system/dnssec/ns3/sign.sh		SH	2000,2001,2002,2004,2006,2007,2008,2009,2010
 ./bin/tests/system/dnssec/ns4/.cvsignore	X	2000,2001
 ./bin/tests/system/dnssec/ns4/named.conf	CONF-C	2000,2001,2004,2006,2007
 ./bin/tests/system/dnssec/ns5/.cvsignore	X	2000,2001
@@ -698,7 +699,7 @@
 ./bin/tests/system/dnssec/ns7/named.conf	CONF-C	2006,2008
 ./bin/tests/system/dnssec/prereq.sh		SH	2000,2001,2002,2004,2006,2007,2009
 ./bin/tests/system/dnssec/setup.sh		SH	2000,2001,2004,2007,2009
-./bin/tests/system/dnssec/tests.sh		SH	2000,2001,2002,2004,2005,2006,2007,2008,2009
+./bin/tests/system/dnssec/tests.sh		SH	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010
 ./bin/tests/system/forward/clean.sh		SH	2000,2001,2004,2007
 ./bin/tests/system/forward/ns1/.cvsignore	X	2000,2001
 ./bin/tests/system/forward/ns1/example.db	X	2000,2001
@@ -823,7 +824,7 @@
 ./bin/tests/system/pending/ns1/named.conf	CONF-C	2009
 ./bin/tests/system/pending/ns1/root.db.in	ZONE	2009,2010
 ./bin/tests/system/pending/ns1/sign.sh		SH	2009,2010
-./bin/tests/system/pending/ns2/example.com.db.in	ZONE	2009
+./bin/tests/system/pending/ns2/example.com.db.in	ZONE	2009,2010
 ./bin/tests/system/pending/ns2/example.db.in	ZONE	2009,2010
 ./bin/tests/system/pending/ns2/forgery.db	ZONE	2010
 ./bin/tests/system/pending/ns2/named.conf	CONF-C	2009,2010
@@ -897,6 +898,12 @@
 ./bin/tests/system/runall.sh			SH	2000,2001,2004,2007
 ./bin/tests/system/send.pl			PERL	2001,2004,2007
 ./bin/tests/system/setup.sh			SH	2000,2001,2004,2007
+./bin/tests/system/smartsign/child.db		ZONE	2010
+./bin/tests/system/smartsign/clean.sh		SH	2010
+./bin/tests/system/smartsign/parent.db		ZONE	2010
+./bin/tests/system/smartsign/prereq.sh		SH	2010
+./bin/tests/system/smartsign/setup.sh		SH	2010
+./bin/tests/system/smartsign/tests.sh		SH	2010
 ./bin/tests/system/sortlist/clean.sh		SH	2000,2001,2004,2007,2009
 ./bin/tests/system/sortlist/ns1/.cvsignore	X	2000,2001
 ./bin/tests/system/sortlist/ns1/example.db	ZONE	2000,2001,2004,2007