diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index dbea5641d1..6001e49574 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -121,7 +121,7 @@ OBJS =		a6.@O@ callbacks.@O@ compress.@O@ db.@O@ dbiterator.@O@ \
 		rbtdb64.@O@ rdata.@O@ rdatalist.@O@ rdataset.@O@ \
 		rdatasetiter.@O@ rdataslab.@O@ resolver.@O@ result.@O@ \
 		version.@O@ masterdump.@O@ time.@O@ ttl.@O@ tcpmsg.@O@ \
-		tsig.@O@ view.@O@ journal.@O@ zone.@O@ nxt.@O@ \
+		tsig.@O@ view.@O@ journal.@O@ zone.@O@ nxt.@O@ address.@O@ \
 		${DSTOBJS} ${OPENSSLOBJS} ${DNSSAFEOBJS} ${CONFOBJS}
 
 SRCS =		a6.c callbacks.c compress.c db.c dbiterator.c \
@@ -130,7 +130,7 @@ SRCS =		a6.c callbacks.c compress.c db.c dbiterator.c \
 		rbtdb64.c rdata.c rdatalist.c rdataset.c \
 		rdatasetiter.c rdataslab.c resolver.c result.c \
 		version.c masterdump.c time.c ttl.c tcpmsg.c \
-		tsig.c view.c journal.c zone.c nxt.c
+		tsig.c view.c journal.c zone.c nxt.c address.c
 
 SUBDIRS =	include sec config
 TARGETS =	include/dns/enumtype.h include/dns/enumclass.h \
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
new file mode 100644
index 0000000000..7518163965
--- /dev/null
+++ b/lib/dns/adb.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 1999  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.
+ */
+
+#include <config.h>
+
+#include <dns/address.h>
+
+#define DNS_ADB_MAGIC		0x44616462	/* Dadb. */
+#define DNS_ADB_VALID(x)	((x) != NULL && (x)->magic == DNS_ADB_MAGIC)
+
+struct dns_adb {
+	unsigned int	magic;
+};
+
+struct dns_adbhandle {
+};
+
+struct dns_adbentry {
+};
+
+isc_result_t
+dns_adb_create(isc_mem_t *mem, dns_adb_t **newadb)
+{
+	return (ISC_R_NOTIMPLEMENTED);
+}
+
+void
+dns_adb_destroy(dns_adb_t **adb)
+{
+}
+
+isc_result_t
+dns_adb_lookup(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t *action,
+	       void *arg, dns_rdataset_t *nsdataset, dns_name_t *zone,
+	       dns_adbhandle_t **handle)
+{
+	return (ISC_R_NOTIMPLEMENTED);
+}
+
+void
+dns_adb_cancel(dns_adb_t *adb, dns_adbhandle_t *adbhandle)
+{
+}
+
+void
+dns_adb_done(dns_adb_t *adb, dns_adbhandle_t *adbhandle)
+{
+}
diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h
index 14cee26e7b..9b139e4e27 100644
--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -15,6 +15,9 @@
  * SOFTWARE.
  */
 
+#ifndef DNS_ADDRESS_H
+#define DNS_ADDRESS_H
+
 /***** 
  ***** Module Info 
  *****/ 
@@ -76,12 +79,25 @@
  *
  */
 
+/***
+ *** IMPORTS
+ ***/
+
+#include <isc/mem.h>
+#include <isc/task.h>
+#include <isc/lang.h>
+#include <isc/result.h>
+#include <isc/sockaddr.h>
+
+#include <dns/rdataset.h>
+
+ISC_LANG_BEGINDECLS
 
 /***
  *** TYPES
  ***/
 
-/* _The_ ADB */
+/* The ADB */
 typedef struct dns_adb dns_adb_t;
 
 /*
@@ -158,7 +174,7 @@ dns_adb_create(isc_mem_t *mem, dns_adb_t **newadb);
  *
  */
 void
-dns_adb_destroy(isc_adb_t **adb);
+dns_adb_destroy(dns_adb_t **adb);
 
 
 /*
@@ -214,7 +230,7 @@ dns_adb_destroy(isc_adb_t **adb);
  *	returns.
  */
 isc_result_t
-dns_adb_lookup(isc_adb_t *adb, isc_task_t *task, isc_taskaction_t *action,
+dns_adb_lookup(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t *action,
 	       void *arg, dns_rdataset_t *nsdataset, dns_name_t *zone,
 	       dns_adbhandle_t **handle);
 
@@ -273,3 +289,7 @@ dns_adb_done(dns_adb_t *adb, dns_adbhandle_t *adbhandle);
  *
  *	Mix in measured RTT values.
  */
+
+ISC_LANG_ENDDECLS
+
+#endif /* DNS_ADDRESS_H */
diff --git a/util/copyrights b/util/copyrights
index 76eb19bc66..9e35740c51 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -247,6 +247,7 @@
 ./lib/dns/.cvsignore				X	1999
 ./lib/dns/Makefile.in				MAKE	1998,1999
 ./lib/dns/a6.c					C	1999
+./lib/dns/address.c				C	1999
 ./lib/dns/api					X	1999
 ./lib/dns/callbacks.c				C	1999
 ./lib/dns/compress.c				C	1999