diff --git a/util/copyrights b/util/copyrights
index 986d72a863..91df69a2cd 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -154,7 +154,7 @@
 ./bin/named/include/named/config.h		C	2001,2002,2004,2005,2006,2007,2009
 ./bin/named/include/named/control.h		C	2001,2002,2003,2004,2005,2006,2007,2009,2010,2011
 ./bin/named/include/named/globals.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
-./bin/named/include/named/interfacemgr.h	C	1999,2000,2001,2002,2004,2005,2007
+./bin/named/include/named/interfacemgr.h	C	1999,2000,2001,2002,2004,2005,2007,2011
 ./bin/named/include/named/listenlist.h		C	2000,2001,2004,2005,2007
 ./bin/named/include/named/log.h			C	1999,2000,2001,2002,2004,2005,2007,2009
 ./bin/named/include/named/logconf.h		C	1999,2000,2001,2004,2005,2006,2007
@@ -863,7 +863,7 @@
 ./bin/tests/system/dnssec/signer/example.db.in	ZONE	2010
 ./bin/tests/system/dnssec/tests.sh		SH	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011
 ./bin/tests/system/filter-aaaa/.cvsignore	X	2010
-./bin/tests/system/filter-aaaa/Makefile.in	MAKE	2010
+./bin/tests/system/filter-aaaa/Makefile.in	MAKE	2010,2011
 ./bin/tests/system/filter-aaaa/clean.sh		SH	2010
 ./bin/tests/system/filter-aaaa/conf/bad1.conf	CONF-C	2010
 ./bin/tests/system/filter-aaaa/conf/bad2.conf	CONF-C	2010
@@ -879,7 +879,7 @@
 ./bin/tests/system/filter-aaaa/conf/good6.conf	CONF-C	2010
 ./bin/tests/system/filter-aaaa/conf/good7.conf	CONF-C	2010
 ./bin/tests/system/filter-aaaa/conf/good8.conf	CONF-C	2010
-./bin/tests/system/filter-aaaa/filter-aaaa.c	C	2010
+./bin/tests/system/filter-aaaa/filter-aaaa.c	C	2010,2011
 ./bin/tests/system/filter-aaaa/ns1/named.conf	CONF-C	2010
 ./bin/tests/system/filter-aaaa/ns1/root.db	ZONE	2010
 ./bin/tests/system/filter-aaaa/ns1/sign.sh	SH	2010
@@ -2073,7 +2073,7 @@
 ./install-sh					X	1998,1999,2000,2001
 ./isc-config.sh.1				MAN	2009
 ./isc-config.sh.docbook				SGML	2009
-./isc-config.sh.html				HTML	2009
+./isc-config.sh.html				HTML	2009,2011
 ./isc-config.sh.in				SH	2000,2001,2003,2004,2007
 ./lib/.cvsignore				X	1998,1999,2000,2001
 ./lib/Atffile					X	2011
@@ -2151,7 +2151,7 @@
 ./lib/dns/include/dns/dbiterator.h		C	1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/dbtable.h			C	1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/diff.h			C	2000,2001,2004,2005,2006,2007,2008,2009,2010
-./lib/dns/include/dns/dispatch.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
+./lib/dns/include/dns/dispatch.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011
 ./lib/dns/include/dns/dlz.h			C.PORTION	1999,2000,2001,2005,2006,2007,2009,2010,2011
 ./lib/dns/include/dns/dlz_dlopen.h		C	2011
 ./lib/dns/include/dns/dns64.h			C	2010
@@ -2601,7 +2601,7 @@
 ./lib/isc/include/isc/msgcat.h			C	1999,2000,2001,2004,2005,2007
 ./lib/isc/include/isc/msgs.h			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
 ./lib/isc/include/isc/mutexblock.h		C	1999,2000,2001,2004,2005,2006,2007
-./lib/isc/include/isc/namespace.h		C	2009,2010
+./lib/isc/include/isc/namespace.h		C	2009,2010,2011
 ./lib/isc/include/isc/netaddr.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2009
 ./lib/isc/include/isc/netscope.h		C	2002,2004,2005,2006,2007,2009
 ./lib/isc/include/isc/ondestroy.h		C	2000,2001,2004,2005,2006,2007
@@ -2624,7 +2624,7 @@
 ./lib/isc/include/isc/sha1.h			C	2000,2001,2004,2005,2006,2007,2009
 ./lib/isc/include/isc/sha2.h			C	2005,2006,2007,2009
 ./lib/isc/include/isc/sockaddr.h		C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009
-./lib/isc/include/isc/socket.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009
+./lib/isc/include/isc/socket.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011
 ./lib/isc/include/isc/stats.h			C	2009
 ./lib/isc/include/isc/stdio.h			C	2000,2001,2004,2005,2006,2007
 ./lib/isc/include/isc/stdlib.h			C	2003,2004,2005,2006,2007
@@ -2717,7 +2717,7 @@
 ./lib/isc/sha1.c				C	2000,2001,2003,2004,2005,2007,2009,2011
 ./lib/isc/sha2.c				C	2005,2006,2007,2009,2011
 ./lib/isc/sockaddr.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2010,2011
-./lib/isc/socket_api.c				C	2009
+./lib/isc/socket_api.c				C	2009,2011
 ./lib/isc/sparc64/.cvsignore			X	2007
 ./lib/isc/sparc64/Makefile.in			MAKE	2007
 ./lib/isc/sparc64/include/.cvsignore		X	2007
@@ -2738,6 +2738,7 @@
 ./lib/isc/tests/Makefile.in			MAKE	2011
 ./lib/isc/tests/isctest.c			C	2011
 ./lib/isc/tests/isctest.h			C	2011
+./lib/isc/tests/socket_test.c			C	2011
 ./lib/isc/tests/taskpool_test.c			C	2011
 ./lib/isc/timer.c				C	1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011
 ./lib/isc/timer_api.c				C	2009
@@ -2835,7 +2836,7 @@
 ./lib/isc/win32/once.c				C	1999,2000,2001,2004,2007
 ./lib/isc/win32/os.c				C	2000,2001,2002,2004,2007
 ./lib/isc/win32/resource.c			C	2000,2001,2004,2007,2008
-./lib/isc/win32/socket.c			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
+./lib/isc/win32/socket.c			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
 ./lib/isc/win32/stdio.c				C	2000,2001,2004,2007
 ./lib/isc/win32/stdtime.c			C	1999,2000,2001,2004,2007
 ./lib/isc/win32/strerror.c			C	2001,2002,2004,2007