diff --git a/lib/isccc/include/.cvsignore b/lib/isccc/include/.cvsignore
index 177889918b..f3c7a7c5da 100644
--- a/lib/isccc/include/.cvsignore
+++ b/lib/isccc/include/.cvsignore
@@ -1,18 +1 @@
-# Copyright (C) 2001  Internet Software Consortium.
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
-# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-# $Id: .cvsignore,v 1.1 2001/03/27 00:44:49 bwelling Exp $
-
 Makefile
diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 3178589352..377da4022e 100644
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2001/03/27 00:44:52 bwelling Exp $
+# $Id: Makefile.in,v 1.5 2001/03/27 02:06:07 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isccfg/api b/lib/isccfg/api
index 494278e7f5..32abeef1ae 100644
--- a/lib/isccfg/api
+++ b/lib/isccfg/api
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2001  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id: api,v 1.2 2001/03/27 02:06:08 bwelling Exp $ */
+
 LIBINTERFACE = 0
 LIBREVISION = 0
 LIBAGE = 0
diff --git a/lib/isccfg/include/Makefile.in b/lib/isccfg/include/Makefile.in
index bd5b13daf7..7c8278b20b 100644
--- a/lib/isccfg/include/Makefile.in
+++ b/lib/isccfg/include/Makefile.in
@@ -1,21 +1,4 @@
-/*
- * Copyright (C) 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-# Copyright (C) 1998-2001  Internet Software Consortium.
+# Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -30,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2001/03/27 00:44:53 bwelling Exp $
+# $Id: Makefile.in,v 1.4 2001/03/27 02:23:57 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isccfg/include/isccfg/Makefile.in b/lib/isccfg/include/isccfg/Makefile.in
index dda97a6407..f47fa35ac1 100644
--- a/lib/isccfg/include/isccfg/Makefile.in
+++ b/lib/isccfg/include/isccfg/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2001/03/27 00:44:55 bwelling Exp $
+# $Id: Makefile.in,v 1.4 2001/03/27 02:06:11 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index 28a848a619..9049abf853 100644
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cfg.h,v 1.21 2001/03/27 00:44:56 bwelling Exp $ */
+/* $Id: cfg.h,v 1.22 2001/03/27 02:06:12 bwelling Exp $ */
 
 #ifndef ISCCFG_CFG_H
 #define ISCCFG_CFG_H 1
diff --git a/util/copyrights b/util/copyrights
index 44324e4e6c..6ab2ce1dcc 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -107,13 +107,9 @@
 ./bin/tests/.cvsignore				X	1999,2000,2001
 ./bin/tests/Kchild.example.+003+04017.key	X	2000,2001
 ./bin/tests/Kchild.example.+003+04017.private	X	2000,2001
-./bin/tests/Kclient.+002+02982.key		X	1999,2000,2001
-./bin/tests/Kclient.+002+02982.private		X	1999,2000,2001
 ./bin/tests/Makefile.in				MAKE	1998,1999,2000,2001
 ./bin/tests/adb_test.c				C	1999,2000,2001
-./bin/tests/b8status.pl				PERL	1999,2000,2001
 ./bin/tests/b8t.mk				MAKE	1999,2000,2001
-./bin/tests/b9status.pl				PERL	1999,2000,2001
 ./bin/tests/b9t.mk				MAKE	1999,2000,2001
 ./bin/tests/byaddr_test.c			C	2000,2001
 ./bin/tests/byname_test.c			C	2000,2001
@@ -172,8 +168,6 @@
 ./bin/tests/db/dns_db_origin_data		X	1999,2000,2001
 ./bin/tests/db/t_db.c				C	1999,2000,2001
 ./bin/tests/db_test.c				C	1999,2000,2001
-./bin/tests/dispatch_tcp_test.c			C	1998,1999,2000,2001
-./bin/tests/dispatch_test.c			C	1998,1999,2000,2001
 ./bin/tests/dst/.cvsignore			X	1999,2000,2001
 ./bin/tests/dst/Kdh.+002+18088.key		X	1999,2000,2001
 ./bin/tests/dst/Kdh.+002+18088.private		X	1999,2000,2001
@@ -281,7 +275,6 @@
 ./bin/tests/names/wire_test8.data		X	1999,2000,2001
 ./bin/tests/names/wire_test9.data		X	1999,2000,2001
 ./bin/tests/ndc.conf				CONF-C	2000,2001
-./bin/tests/ndcconf_test.c			C	2000,2001
 ./bin/tests/net/.cvsignore			X	2000,2001
 ./bin/tests/net/Makefile.in			MAKE	2000,2001
 ./bin/tests/net/driver.c			C	2000,2001
@@ -627,7 +620,6 @@
 ./bin/tests/timers/.cvsignore			X	1999,2000,2001
 ./bin/tests/timers/Makefile.in			MAKE	1999,2000,2001
 ./bin/tests/timers/t_timers.c			C	1999,2000,2001
-./bin/tests/tkey_test.c				C	1999,2000,2001
 ./bin/tests/wire_test.c				C	1999,2000,2001
 ./bin/tests/wire_test.data			X	1999,2000,2001
 ./bin/tests/wire_test.data2			X	1999,2000,2001
@@ -773,8 +765,8 @@
 ./contrib/sdb/timedb.c				C	2000,2001
 ./contrib/sdb/timedb.h				C	2000,2001
 ./contrib/sdb/zonetodb.c			C	2000,2001
-./contrib/sdb/zonetoldap.c			X	2001
-./contrib/sdb/zonetoldap.1			X	2001
+./contrib/sdb/zone2ldap.c			X	2001
+./contrib/sdb/zone2ldap.1			X	2001
 ./doc/.cvsignore				X	2000,2001
 ./doc/Makefile.in				MAKE	2000,2001
 ./doc/arm/.cvsignore				X	2000,2001
@@ -1310,7 +1302,7 @@
 ./lib/isccc/include/isccc/symtype.h		C	2001
 ./lib/isccc/include/isccc/types.h		C	2001
 ./lib/isccc/include/isccc/util.h		C	2001
-./lib/isccc/include/.cvsignore			MAKE	2001
+./lib/isccc/include/.cvsignore			X	2001
 ./lib/isccc/include/Makefile.in			MAKE	2001
 ./lib/isccc/lib.c				C	2001
 ./lib/isccc/result.c				C	2001
@@ -1320,15 +1312,15 @@
 ./lib/isccfg/Makefile.in			MAKE	2001
 ./lib/isccfg/api				X	2001
 ./lib/isccfg/check.c				C	2001
-./lib/isccfg/log.c				C	2001
-./lib/isccfg/parser.c				C	2000,2001
 ./lib/isccfg/include/.cvsignore			X	2001
-./lib/isccfg/include/Makefile.in		C	2001
+./lib/isccfg/include/Makefile.in		MAKE	2001
 ./lib/isccfg/include/isccfg/.cvsignore		X	2001
 ./lib/isccfg/include/isccfg/Makefile.in		MAKE	2001
 ./lib/isccfg/include/isccfg/cfg.h		C	2000,2001
 ./lib/isccfg/include/isccfg/check.h		C	2001
 ./lib/isccfg/include/isccfg/log.h		C	2001
+./lib/isccfg/log.c				C	2001
+./lib/isccfg/parser.c				C	2000,2001
 ./lib/lwres/.cvsignore				X	2000,2001
 ./lib/lwres/Makefile.in				MAKE	2000,2001
 ./lib/lwres/api					X	2000,2001