diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index c041c0f4845..9187ec81a52 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2000/11/13 16:21:42 jakob Exp $
+# $OpenBSD: Makefile,v 1.9 2001/01/18 09:32:00 jakob Exp $
 
-VERSION=	9.0.1
+VERSION=	9.1.0
 DISTNAME=	bind-${VERSION}
 CATEGORIES=	net
-NEED_VERSION=	1.305
-
+NEED_VERSION=	1.336
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${VERSION}/ \
 		ftp://ftp.sunet.se/pub/network/isc/bind9/${VERSION}
 
@@ -17,43 +16,54 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+SEPARATE_BUILD=		concurrent
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--prefix=${PREFIX} \
+CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--sysconfdir=/etc \
 			--localstatedir=/var \
+			--with-randomdev=/dev/srandom \
+			--with-openssl=/usr \
 			--with-libtool
-SEPARATE_BUILD=		concurrent
-FAKE_FLAGS+=		DESTDIR=${WRKINST} \
-			MAKEDEFS='DESTDIR=${WRKINST}'
+
+FLAVORS=		debug static threads
+FLAVOR?=
+
+.if ${FLAVOR:L:Mdebug}
+CFLAGS+=		"-g"
+.endif
+
+.if ${FLAVOR:L:Mstatic}
+CFLAGS+=		"-static"
+NO_SHARED_LIBS=		Yes
+.endif
+
+.if ${FLAVOR:L:Mthreads}
+CONFIGURE_ARGS+=	--enable-threads
+.else
+CONFIGURE_ARGS+=	--disable-threads
+.endif
 
 EXAMPLEFILES=		named.conf named.root \
 			named.localhost named.loopback
 
-FLAVORS=		debug static
-FLAVOR?=
-
-.if ${FLAVOR:L} == "debug"
-CONFIGURE_ENV+=		CFLAGS=-g
-.endif
-
-.if ${FLAVOR:L} == "static"
-CONFIGURE_ENV+=		CFLAGS="-O2 -static"
-NO_SHARED_LIBS=		Yes
-.endif
-
 post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/arm
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/misc
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bind9
 	${INSTALL_MAN} ${WRKSRC}/doc/man/bin/*.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/man/bin/*.5 ${PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/doc/man/bin/*.8 ${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/doc/man/dnssec/*.8 ${PREFIX}/man/man8
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/arm
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/misc
-	${INSTALL_DATA} ${WRKSRC}/doc/arm/* ${PREFIX}/share/doc/bind9/arm
+	${INSTALL_MAN} ${WRKSRC}/doc/man/lwres/*.3 ${PREFIX}/man/man3
+	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${PREFIX}/share/doc/bind9/arm
+	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.gif  ${PREFIX}/share/doc/bind9/arm
 	${INSTALL_DATA} ${WRKSRC}/doc/misc/* ${PREFIX}/share/doc/bind9/misc
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bind9
 .for file in ${EXAMPLEFILES}
 	${INSTALL_DATA} ${FILESDIR}/${file} ${PREFIX}/share/examples/bind9
 .endfor
+	sed s,y0y0y0,${TRUEPREFIX}, <${FILESDIR}/bind9-enable >${PREFIX}/sbin/bind9-enable
+	${CHMOD} 555 ${PREFIX}/sbin/bind9-enable
+	${CHOWN} root:wheel ${PREFIX}/sbin/bind9-enable
 
 .include <bsd.port.mk>
diff --git a/net/bind9/files/md5 b/net/bind9/files/md5
index 102a84dfb8c..164e61ae346 100644
--- a/net/bind9/files/md5
+++ b/net/bind9/files/md5
@@ -1,3 +1,3 @@
-MD5 (bind-9.0.1.tar.gz) = 3f1a238dc06dfda2f8426ef5d1ea539b
-RMD160 (bind-9.0.1.tar.gz) = 14d09b19c316cebe14b9dbf66740280fe1180d58
-SHA1 (bind-9.0.1.tar.gz) = b8917c208ea99b15479769331502784939cc089f
+MD5 (bind-9.1.0.tar.gz) = 28f30cfbe60b91c6ec1a0e51c24db889
+RMD160 (bind-9.1.0.tar.gz) = cf86d06c48b14d04df48b5fe381fa2fed077deb9
+SHA1 (bind-9.1.0.tar.gz) = 762bf290f0ee364106477c6aad7fc1fc6fdd55c6
diff --git a/net/bind9/files/named.conf b/net/bind9/files/named.conf
index d359383024d..bbfe575be4c 100644
--- a/net/bind9/files/named.conf
+++ b/net/bind9/files/named.conf
@@ -1,4 +1,4 @@
-// $OpenBSD: named.conf,v 1.1.1.1 2000/09/16 07:36:53 jakob Exp $
+// $OpenBSD: named.conf,v 1.2 2001/01/18 09:32:01 jakob Exp $
 
 // NOTE: If you are not chroot'ing named, change directory to
 //       /var/named as OpenBSD chroot's named by default
diff --git a/net/bind9/files/named.localhost b/net/bind9/files/named.localhost
index 0fbe6ac7c5c..decf3eb7136 100644
--- a/net/bind9/files/named.localhost
+++ b/net/bind9/files/named.localhost
@@ -1,4 +1,4 @@
-; $OpenBSD: named.localhost,v 1.1.1.1 2000/09/16 07:36:53 jakob Exp $
+; $OpenBSD: named.localhost,v 1.2 2001/01/18 09:32:01 jakob Exp $
 ;
 $ORIGIN localhost.
 $TTL 6h
diff --git a/net/bind9/files/named.loopback b/net/bind9/files/named.loopback
index d2da4b2dff4..6ac1a07f711 100644
--- a/net/bind9/files/named.loopback
+++ b/net/bind9/files/named.loopback
@@ -1,4 +1,4 @@
-; $OpenBSD: named.loopback,v 1.1.1.1 2000/09/16 07:36:53 jakob Exp $
+; $OpenBSD: named.loopback,v 1.2 2001/01/18 09:32:01 jakob Exp $
 ;
 $ORIGIN 0.0.127.in-addr.arpa.
 $TTL 6h
diff --git a/net/bind9/patches/patch-randomdev b/net/bind9/patches/patch-randomdev
deleted file mode 100644
index 3b80e19a047..00000000000
--- a/net/bind9/patches/patch-randomdev
+++ /dev/null
@@ -1,32 +0,0 @@
---- bin/dnssec/dnssectool.c.orig	Mon Aug  7 18:41:38 2000
-+++ bin/dnssec/dnssectool.c	Thu Aug 17 13:20:17 2000
-@@ -187,7 +187,7 @@
- 		if (!wantkeyboard) {
- 			fprintf(stderr, "You must use the keyboard to create "
- 				"entropy, since your system is lacking\n");
--			fprintf(stderr, "/dev/random\n\n");
-+			fprintf(stderr, "/dev/srandom\n\n");
- 		}
- 		first = ISC_FALSE;
- 	}
-@@ -257,7 +257,7 @@
- 	else {
- 		if (randomfile == NULL) {
- 			result = isc_entropy_createfilesource(*ectx,
--							      "/dev/random");
-+							      "/dev/srandom");
- 			if (result == ISC_R_SUCCESS)
- 				return;
- 		}
-
---- bin/named/main.c.orig	Tue Jul 11 19:23:02 2000
-+++ bin/named/main.c	Thu Aug 17 13:20:21 2000
-@@ -378,7 +378,7 @@
- 		return (ISC_R_UNEXPECTED);
- 	}
- 
--	(void)isc_entropy_createfilesource(ns_g_entropy, "/dev/random");
-+	(void)isc_entropy_createfilesource(ns_g_entropy, "/dev/srandom");
- 
- 	return (ISC_R_SUCCESS);
- }
diff --git a/net/bind9/pkg/DESCR b/net/bind9/pkg/DESCR
index c4a9e230f5b..a9570f76dd1 100644
--- a/net/bind9/pkg/DESCR
+++ b/net/bind9/pkg/DESCR
@@ -63,3 +63,4 @@ organizations:
 	Stichting NLnet - NLnet Foundation
 
 WWW: ${HOMEPAGE}
+
diff --git a/net/bind9/pkg/PFRAG.shared b/net/bind9/pkg/PFRAG.shared
index 7216a09a74f..daa50c307d8 100644
--- a/net/bind9/pkg/PFRAG.shared
+++ b/net/bind9/pkg/PFRAG.shared
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2000/11/15 23:58:01 brad Exp $
-lib/libdns.so.2.0
-lib/libisc.so.2.0
-lib/liblwres.so.1.0
-lib/libomapi.so.1.0
-DYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared,v 1.4 2001/01/18 09:32:02 jakob Exp $
+lib/libdns.so.3.0
+lib/libisc.so.3.0
+lib/liblwres.so.2.0
+lib/libomapi.so.3.0
+DYNLIBDIR(%D/lib)
diff --git a/net/bind9/pkg/PLIST b/net/bind9/pkg/PLIST
index 5cf7565531f..5fb697da784 100644
--- a/net/bind9/pkg/PLIST
+++ b/net/bind9/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2000/11/15 23:58:01 brad Exp $
+@comment $OpenBSD: PLIST,v 1.6 2001/01/18 09:32:02 jakob Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -6,7 +6,6 @@ bin/nslookup
 bin/nsupdate
 include/dns/a6.h
 include/dns/acl.h
-include/dns/aclconf.h
 include/dns/adb.h
 include/dns/byaddr.h
 include/dns/cache.h
@@ -22,6 +21,7 @@ include/dns/confip.h
 include/dns/confkeys.h
 include/dns/conflog.h
 include/dns/conflsn.h
+include/dns/conflwres.h
 include/dns/confparser.h
 include/dns/confresolv.h
 include/dns/confrrset.h
@@ -30,6 +30,7 @@ include/dns/confzone.h
 include/dns/db.h
 include/dns/dbiterator.h
 include/dns/dbtable.h
+include/dns/diff.h
 include/dns/dispatch.h
 include/dns/dnssec.h
 include/dns/enumclass.h
@@ -64,13 +65,13 @@ include/dns/request.h
 include/dns/resolver.h
 include/dns/result.h
 include/dns/rootns.h
+include/dns/sdb.h
 include/dns/secalg.h
 include/dns/secproto.h
 include/dns/ssu.h
 include/dns/tcpmsg.h
 include/dns/time.h
 include/dns/tkey.h
-include/dns/tkeyconf.h
 include/dns/tsig.h
 include/dns/ttl.h
 include/dns/types.h
@@ -78,7 +79,6 @@ include/dns/validator.h
 include/dns/view.h
 include/dns/xfrin.h
 include/dns/zone.h
-include/dns/zoneconf.h
 include/dns/zt.h
 include/dst/dst.h
 include/dst/lib.h
@@ -93,6 +93,7 @@ include/isc/bufferlist.h
 include/isc/commandline.h
 include/isc/condition.h
 include/isc/dir.h
+include/isc/entropy.h
 include/isc/error.h
 include/isc/event.h
 include/isc/eventclass.h
@@ -100,6 +101,8 @@ include/isc/file.h
 include/isc/formatcheck.h
 include/isc/fsaccess.h
 include/isc/heap.h
+include/isc/hex.h
+include/isc/hmacmd5.h
 include/isc/int.h
 include/isc/interfaceiter.h
 include/isc/lang.h
@@ -112,6 +115,7 @@ include/isc/magic.h
 include/isc/md5.h
 include/isc/mem.h
 include/isc/msgcat.h
+include/isc/msgs.h
 include/isc/mutex.h
 include/isc/mutexblock.h
 include/isc/net.h
@@ -127,6 +131,7 @@ include/isc/quota.h
 include/isc/random.h
 include/isc/ratelimiter.h
 include/isc/region.h
+include/isc/resource.h
 include/isc/result.h
 include/isc/resultclass.h
 include/isc/rwlock.h
@@ -171,9 +176,95 @@ lib/liblwres.a
 lib/liblwres.la
 lib/libomapi.a
 lib/libomapi.la
-%%SHARED%%
 man/man1/dig.1
 man/man1/host.1
+man/man1/named-checkconf.1
+man/man1/named-checkzone.1
+man/man3/lwres.3
+man/man3/lwres_addr_parse.3
+man/man3/lwres_buffer.3
+man/man3/lwres_buffer_add.3
+man/man3/lwres_buffer_back.3
+man/man3/lwres_buffer_clear.3
+man/man3/lwres_buffer_first.3
+man/man3/lwres_buffer_forward.3
+man/man3/lwres_buffer_getmem.3
+man/man3/lwres_buffer_getuint16.3
+man/man3/lwres_buffer_getuint32.3
+man/man3/lwres_buffer_getuint8.3
+man/man3/lwres_buffer_init.3
+man/man3/lwres_buffer_invalidate.3
+man/man3/lwres_buffer_putmem.3
+man/man3/lwres_buffer_putuint16.3
+man/man3/lwres_buffer_putuint32.3
+man/man3/lwres_buffer_putuint8.3
+man/man3/lwres_buffer_subtract.3
+man/man3/lwres_conf_clear.3
+man/man3/lwres_conf_get.3
+man/man3/lwres_conf_init.3
+man/man3/lwres_conf_parse.3
+man/man3/lwres_conf_print.3
+man/man3/lwres_config.3
+man/man3/lwres_context.3
+man/man3/lwres_context_allocmem.3
+man/man3/lwres_context_create.3
+man/man3/lwres_context_destroy.3
+man/man3/lwres_context_freemem.3
+man/man3/lwres_context_initserial.3
+man/man3/lwres_context_nextserial.3
+man/man3/lwres_context_sendrecv.3
+man/man3/lwres_endhostent.3
+man/man3/lwres_endhostent_r.3
+man/man3/lwres_freeaddrinfo.3
+man/man3/lwres_freehostent.3
+man/man3/lwres_gabn.3
+man/man3/lwres_gabnrequest_free.3
+man/man3/lwres_gabnrequest_parse.3
+man/man3/lwres_gabnrequest_render.3
+man/man3/lwres_gabnresponse_free.3
+man/man3/lwres_gabnresponse_parse.3
+man/man3/lwres_gabnresponse_render.3
+man/man3/lwres_gai_strerror.3
+man/man3/lwres_getaddrinfo.3
+man/man3/lwres_getaddrsbyname.3
+man/man3/lwres_gethostbyaddr.3
+man/man3/lwres_gethostbyaddr_r.3
+man/man3/lwres_gethostbyname.3
+man/man3/lwres_gethostbyname2.3
+man/man3/lwres_gethostbyname_r.3
+man/man3/lwres_gethostent.3
+man/man3/lwres_gethostent_r.3
+man/man3/lwres_getipnode.3
+man/man3/lwres_getipnodebyaddr.3
+man/man3/lwres_getipnodebyname.3
+man/man3/lwres_getnamebyaddr.3
+man/man3/lwres_getnameinfo.3
+man/man3/lwres_getrrsetbyname.3
+man/man3/lwres_gnba.3
+man/man3/lwres_gnbarequest_free.3
+man/man3/lwres_gnbarequest_parse.3
+man/man3/lwres_gnbarequest_render.3
+man/man3/lwres_gnbaresponse_free.3
+man/man3/lwres_gnbaresponse_parse.3
+man/man3/lwres_gnbaresponse_render.3
+man/man3/lwres_herror.3
+man/man3/lwres_hstrerror.3
+man/man3/lwres_inetntop.3
+man/man3/lwres_lwpacket_parseheader.3
+man/man3/lwres_lwpacket_renderheader.3
+man/man3/lwres_net_ntop.3
+man/man3/lwres_noop.3
+man/man3/lwres_nooprequest_free.3
+man/man3/lwres_nooprequest_parse.3
+man/man3/lwres_nooprequest_render.3
+man/man3/lwres_noopresponse_free.3
+man/man3/lwres_noopresponse_parse.3
+man/man3/lwres_noopresponse_render.3
+man/man3/lwres_packet.3
+man/man3/lwres_resutil.3
+man/man3/lwres_sethostent.3
+man/man3/lwres_sethostent_r.3
+man/man3/lwres_string_parse.3
 man/man5/rndc.conf.5
 man/man8/dnssec-keygen.8
 man/man8/dnssec-makekeyset.8
@@ -183,14 +274,16 @@ man/man8/lwresd.8
 man/man8/named.8
 man/man8/nsupdate.8
 man/man8/rndc.8
+sbin/bind9-enable
 sbin/dnssec-keygen
 sbin/dnssec-makekeyset
 sbin/dnssec-signkey
 sbin/dnssec-signzone
 sbin/lwresd
 sbin/named
+sbin/named-checkconf
+sbin/named-checkzone
 sbin/rndc
-share/doc/bind9/arm/Bv9ARM-book.xml
 share/doc/bind9/arm/Bv9ARM.ch01.html
 share/doc/bind9/arm/Bv9ARM.ch02.html
 share/doc/bind9/arm/Bv9ARM.ch03.html
@@ -201,21 +294,21 @@ share/doc/bind9/arm/Bv9ARM.ch07.html
 share/doc/bind9/arm/Bv9ARM.ch08.html
 share/doc/bind9/arm/Bv9ARM.ch09.html
 share/doc/bind9/arm/Bv9ARM.html
-share/doc/bind9/arm/README-SGML
-share/doc/bind9/arm/nominum-docbook-html.dsl
 share/doc/bind9/arm/isc.color.gif
 share/doc/bind9/misc/dnssec
 share/doc/bind9/misc/ipv6
 share/doc/bind9/misc/migration
 share/doc/bind9/misc/options
+share/doc/bind9/misc/sdb
 share/examples/bind9/named.conf
-share/examples/bind9/named.root
 share/examples/bind9/named.localhost
 share/examples/bind9/named.loopback
+share/examples/bind9/named.root
+%%SHARED%%
+@dirrm share/examples/bind9
 @dirrm share/doc/bind9/misc
 @dirrm share/doc/bind9/arm
 @dirrm share/doc/bind9
-@dirrm share/examples/bind9
 @dirrm include/omapi
 @dirrm include/lwres
 @dirrm include/isc