diff --git a/util/copyrights b/util/copyrights
index 9a368c8fa1..53547d8377 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -120,7 +120,7 @@
 ./bin/named/lwderror.c				C	2000,2001,2004,2005
 ./bin/named/lwdgabn.c				C	2000,2001,2004,2005,2006
 ./bin/named/lwdgnba.c				C	2000,2001,2002,2004,2005
-./bin/named/lwdgrbn.c				C	2000,2001,2003,2004,2005
+./bin/named/lwdgrbn.c				C	2000,2001,2003,2004,2005,2006
 ./bin/named/lwdnoop.c				C	2000,2001,2004,2005
 ./bin/named/lwresd.8				MAN	DOCBOOK
 ./bin/named/lwresd.c				C	2000,2001,2002,2003,2004,2005,2006
@@ -338,7 +338,7 @@
 ./bin/tests/names/dns_name_fromwire_5_data	X	1999,2000,2001
 ./bin/tests/names/dns_name_fromwire_6_data	X	1999,2000,2001
 ./bin/tests/names/dns_name_fromwire_7_data	X	1999,2000,2001
-./bin/tests/names/dns_name_fromwire_8_data	X	1999,2000,2001
+./bin/tests/names/dns_name_fromwire_8_data	X	1999,2000,2001,2006
 ./bin/tests/names/dns_name_fromwire_9_data	X	1999,2000,2001
 ./bin/tests/names/dns_name_fullcompare_data	X	1999,2000,2001
 ./bin/tests/names/dns_name_getlabel_data	X	1999,2000,2001
@@ -351,7 +351,7 @@
 ./bin/tests/names/dns_name_totext_data		X	1999,2000,2001
 ./bin/tests/names/dns_name_towire_1_data	X	1999,2000,2001
 ./bin/tests/names/dns_name_towire_2_data	X	1999,2000,2001
-./bin/tests/names/t_names.c			C	1998,1999,2000,2001,2002,2003,2004,2005
+./bin/tests/names/t_names.c			C	1998,1999,2000,2001,2002,2003,2004,2005,2006
 ./bin/tests/names/wire_test1.data		X	1999,2000,2001
 ./bin/tests/names/wire_test2.data		X	1999,2000,2001
 ./bin/tests/names/wire_test3_1.data		X	1999,2000,2001
@@ -1398,7 +1398,7 @@
 ./lib/bind/irs/irp.c				X	2001,2005,2006
 ./lib/bind/irs/irp_gr.c				X	2001,2005
 ./lib/bind/irs/irp_ho.c				X	2001,2005
-./lib/bind/irs/irp_ng.c				X	2001,2005
+./lib/bind/irs/irp_ng.c				X	2001,2005,2006
 ./lib/bind/irs/irp_nw.c				X	2001,2005,2006
 ./lib/bind/irs/irp_p.h				X	2001,2005
 ./lib/bind/irs/irp_pr.c				X	2001,2005
@@ -1439,7 +1439,7 @@
 ./lib/bind/isc/ctl_clnt.c			X	2001,2005
 ./lib/bind/isc/ctl_p.c				X	2001,2005
 ./lib/bind/isc/ctl_p.h				X	2001,2005
-./lib/bind/isc/ctl_srvr.c			X	2001,2005
+./lib/bind/isc/ctl_srvr.c			X	2001,2005,2006
 ./lib/bind/isc/ev_connects.c			X	2001,2005,2006
 ./lib/bind/isc/ev_files.c			X	2001,2005
 ./lib/bind/isc/ev_streams.c			X	2001,2005
@@ -1495,7 +1495,7 @@
 ./lib/bind/port/aix5/include/.cvsignore		X	2001
 ./lib/bind/port/aix5/include/Makefile.in	MAKE	2001,2004
 ./lib/bind/port/aix5/include/sys/bitypes.h	X	2001
-./lib/bind/port/aix5/include/sys/cdefs.h	X	2001
+./lib/bind/port/aix5/include/sys/cdefs.h	X	2001,2006
 ./lib/bind/port/aux3/.cvsignore			X	2001
 ./lib/bind/port/aux3/Makefile.in		MAKE	2001,2004
 ./lib/bind/port/aux3/include/.cvsignore		X	2001
@@ -1838,7 +1838,7 @@
 ./lib/dns/lib.c					C	1999,2000,2001,2004,2005
 ./lib/dns/log.c					C	1999,2000,2001,2003,2004,2005
 ./lib/dns/lookup.c				C	2000,2001,2003,2004,2005
-./lib/dns/master.c				C	1999,2000,2001,2002,2003,2004,2005
+./lib/dns/master.c				C	1999,2000,2001,2002,2003,2004,2005,2006
 ./lib/dns/masterdump.c				C	1999,2000,2001,2002,2003,2004,2005,2006
 ./lib/dns/message.c				C	1999,2000,2001,2002,2003,2004,2005,2006
 ./lib/dns/name.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006
@@ -1948,6 +1948,8 @@
 ./lib/dns/rdata/in_1/aaaa_28.h			C	1999,2000,2001,2004,2005
 ./lib/dns/rdata/in_1/apl_42.c			C	2002,2004,2005
 ./lib/dns/rdata/in_1/apl_42.h			C	2002,2004,2005
+./lib/dns/rdata/in_1/dhcid_49.c			C	2006
+./lib/dns/rdata/in_1/dhcid_49.h			C	2006
 ./lib/dns/rdata/in_1/kx_36.c			C	1999,2000,2001,2003,2004,2005
 ./lib/dns/rdata/in_1/kx_36.h			C	1999,2000,2001,2004,2005
 ./lib/dns/rdata/in_1/naptr_35.c			C	1999,2000,2001,2003,2004,2005
@@ -1973,8 +1975,8 @@
 ./lib/dns/resolver.c				C	1999,2000,2001,2002,2003,2004,2005,2006
 ./lib/dns/result.c				C	1998,1999,2000,2001,2002,2003,2004,2005
 ./lib/dns/rootns.c				C	1999,2000,2001,2002,2004,2005
-./lib/dns/sdb.c					C	2000,2001,2003,2004,2005
-./lib/dns/sdlz.c				C.PORTION	1999,2000,2001,2005
+./lib/dns/sdb.c					C	2000,2001,2003,2004,2005,2006
+./lib/dns/sdlz.c				C.PORTION	1999,2000,2001,2005,2006
 ./lib/dns/soa.c					C	2000,2001,2004,2005
 ./lib/dns/spnego.asn1				X	2006
 ./lib/dns/spnego.c				C	2006
@@ -2271,7 +2273,7 @@
 ./lib/isccc/alist.c				C.NOM	2001,2004,2005
 ./lib/isccc/api					X	2001
 ./lib/isccc/base64.c				C.NOM	2001,2004,2005
-./lib/isccc/cc.c				C.NOM	2001,2002,2003,2004,2005
+./lib/isccc/cc.c				C.NOM	2001,2002,2003,2004,2005,2006
 ./lib/isccc/ccmsg.c				C.NOM	2001,2004,2005
 ./lib/isccc/include/.cvsignore			X	2001
 ./lib/isccc/include/Makefile.in			MAKE	2001,2004