diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 5f8584184c..539b2a22a3 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -114,7 +114,7 @@ DNSSAFEOBJS =	sec/dnssafe/ahchdig.@O@ sec/dnssafe/ahchencr.@O@ \
 		sec/dnssafe/seccbce.@O@ sec/dnssafe/surrendr.@O@
 
 # Alphabetically
-OBJS =		a6.@O@ acl.@O@ aclconf.@O@ adb.@O@ \
+OBJS =		a6.@O@ acl.@O@ aclconf.@O@ adb.@O@ byaddr.@O@ \
 		cache.@O@ callbacks.@O@ compress.@O@ \
 		db.@O@ dbiterator.@O@ dbtable.@O@ dispatch.@O@ dnssec.@O@ \
 		journal.@O@ lib.@O@ log.@O@ \
@@ -128,7 +128,7 @@ OBJS =		a6.@O@ acl.@O@ aclconf.@O@ adb.@O@ \
 		${DSTOBJS} ${OPENSSLOBJS} ${DNSSAFEOBJS} ${CONFOBJS}
 
 # Alphabetically
-SRCS =		a6.c acl.c aclconf.c adb.c \
+SRCS =		a6.c acl.c aclconf.c adb.c byaddr.c \
 		cache.c callbacks.c compress.c \
 		db.c dbiterator.c dbtable.c dispatch.c dnssec.c \
 		journal.c lib.c log.c \
diff --git a/lib/dns/include/dns/events.h b/lib/dns/include/dns/events.h
index 88e67cbca2..a34c6171cb 100644
--- a/lib/dns/include/dns/events.h
+++ b/lib/dns/include/dns/events.h
@@ -43,6 +43,7 @@ ISC_LANG_BEGINDECLS
 #define DNS_EVENT_ADBEXPIRED			(ISC_EVENTCLASS_DNS + 13)
 #define DNS_EVENT_ADBCONTROL			(ISC_EVENTCLASS_DNS + 14)
 #define DNS_EVENT_CACHECLEAN			(ISC_EVENTCLASS_DNS + 15)
+#define DNS_EVENT_BYADDRDONE			(ISC_EVENTCLASS_DNS + 16)
 
 #define DNS_EVENT_FIRSTEVENT			(ISC_EVENTCLASS_DNS + 0)
 #define DNS_EVENT_LASTEVENT			(ISC_EVENTCLASS_DNS + 65535)
diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
index 2ba180495f..9380b6e907 100644
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -89,6 +89,7 @@ typedef struct dns_zt				dns_zt_t;
 typedef struct dns_cache			dns_cache_t;
 typedef struct dns_aclelement 			dns_aclelement_t;
 typedef struct dns_acl 				dns_acl_t;
+typedef struct dns_byaddr			dns_byaddr_t;
 
 typedef enum {
 	dns_labeltype_ordinary = 0,