diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 79a8a4f6275f..5e1cc0177cd6 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -5,11 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	dnscache
-PORTVERSION=	1.00
+PORTNAME=	djbdns
+PORTVERSION=	1.02
 CATEGORIES=	net
-MASTER_SITES=	http://cr.yp.to/dnscache/ \
-		ftp://cr.yp.to/dnscache/
+MASTER_SITES=	http://cr.yp.to/djbdns/ \
+		ftp://cr.yp.to/djbdns/
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/dns/djbdns/distinfo b/dns/djbdns/distinfo
index 3aeb8d35fa58..37f4d77cb7f6 100644
--- a/dns/djbdns/distinfo
+++ b/dns/djbdns/distinfo
@@ -1 +1 @@
-MD5 (dnscache-1.00.tar.gz) = 67d51c5403c03f08d6ba8fff0108ab27
+MD5 (djbdns-1.02.tar.gz) = c27b7ffd4af1c93db96f40f6d5f793b6
diff --git a/dns/djbdns/files/patch-aa b/dns/djbdns/files/patch-aa
new file mode 100644
index 000000000000..4fb1e2a7abb4
--- /dev/null
+++ b/dns/djbdns/files/patch-aa
@@ -0,0 +1,20 @@
+--- dnscache-conf.orig	Sat Sep 23 17:39:21 2000
++++ dnscache-conf.c	Sat Sep 23 17:42:43 2000
+@@ -89,13 +89,13 @@
+   if (chdir(auto_home) == -1)
+     strerr_die4sys(111,FATAL,"unable to switch to ",auto_home,": ");
+ 
+-  fdrootservers = open_read("/etc/dnsroots.local");
++  fdrootservers = open_read("etc/dnsroots.local");
+   if (fdrootservers == -1) {
+     if (errno != error_noent)
+-      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.local: ");
+-    fdrootservers = open_read("/etc/dnsroots.global");
++      strerr_die4sys(111,FATAL,"unable to open ",auto_home,"/etc/dnsroots.local: ");
++    fdrootservers = open_read("etc/dnsroots.global");
+     if (fdrootservers == -1)
+-      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.global: ");
++      strerr_die4sys(111,FATAL,"unable to open ",auto_home,"/etc/dnsroots.global: ");
+   }
+ 
+   init(dir,FATAL);
diff --git a/dns/djbdns/files/patch-ab b/dns/djbdns/files/patch-ab
new file mode 100644
index 000000000000..e608a047589f
--- /dev/null
+++ b/dns/djbdns/files/patch-ab
@@ -0,0 +1,11 @@
+--- hier.c.orig	Sat Sep 23 17:37:08 2000
++++ hier.c	Sat Sep 23 17:37:52 2000
+@@ -2,7 +2,7 @@
+ 
+ void hier()
+ {
+-  c("/","etc","dnsroots.global",-1,-1,0644);
++  c(auto_home,"etc","dnsroots.global",-1,-1,0644);
+ 
+   h(auto_home,-1,-1,02755);
+   d(auto_home,"bin",-1,-1,02755);
diff --git a/dns/djbdns/pkg-descr b/dns/djbdns/pkg-descr
index 742eae2701f5..b36fa2c71760 100644
--- a/dns/djbdns/pkg-descr
+++ b/dns/djbdns/pkg-descr
@@ -1,4 +1,4 @@
-DNScache is a collection of Domain Name System tools. It includes
+DJBDNS is a collection of Domain Name System tools. It includes
 several components:
 
   * The dnscache program is a local DNS cache. It accepts recursive DNS
@@ -20,4 +20,4 @@ several components:
   * The dnsq and dnstrace programs are DNS debugging tools.
 
 Documentation is at the website below,
-WWW: http://cr.yp.to/dnscache.html
+WWW: http://cr.yp.to/djbdns.html
diff --git a/dns/djbdns/pkg-plist b/dns/djbdns/pkg-plist
index 755b744d5784..f9170da33f70 100644
--- a/dns/djbdns/pkg-plist
+++ b/dns/djbdns/pkg-plist
@@ -1,29 +1,29 @@
-etc/dnscache/VERSION
-etc/dnscache/@
-bin/dnscache-conf
-bin/tinydns-conf
-bin/walldns-conf
-bin/rbldns-conf
-bin/pickdns-conf
+bin/axfr-get
+bin/axfrdns
 bin/axfrdns-conf
 bin/dnscache
-bin/tinydns
-bin/walldns
-bin/rbldns
-bin/pickdns
-bin/axfrdns
-bin/tinydns-get
-bin/tinydns-data
-bin/tinydns-edit
-bin/rbldns-data
-bin/pickdns-data
-bin/axfr-get
+bin/dnscache-conf
+bin/dnsfilter
 bin/dnsip
 bin/dnsipq
-bin/dnsname
-bin/dnstxt
 bin/dnsmx
-bin/dnsfilter
+bin/dnsname
 bin/dnsq
-bin/random-ip
+bin/dnsqr
 bin/dnstrace
+bin/dnstxt
+bin/pickdns
+bin/pickdns-conf
+bin/pickdns-data
+bin/random-ip
+bin/rbldns
+bin/rbldns-conf
+bin/rbldns-data
+bin/tinydns
+bin/tinydns-conf
+bin/tinydns-data
+bin/tinydns-edit
+bin/tinydns-get
+bin/walldns
+bin/walldns-conf
+etc/dnsroots.global
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 79a8a4f6275f..5e1cc0177cd6 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -5,11 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	dnscache
-PORTVERSION=	1.00
+PORTNAME=	djbdns
+PORTVERSION=	1.02
 CATEGORIES=	net
-MASTER_SITES=	http://cr.yp.to/dnscache/ \
-		ftp://cr.yp.to/dnscache/
+MASTER_SITES=	http://cr.yp.to/djbdns/ \
+		ftp://cr.yp.to/djbdns/
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/net/djbdns/distinfo b/net/djbdns/distinfo
index 3aeb8d35fa58..37f4d77cb7f6 100644
--- a/net/djbdns/distinfo
+++ b/net/djbdns/distinfo
@@ -1 +1 @@
-MD5 (dnscache-1.00.tar.gz) = 67d51c5403c03f08d6ba8fff0108ab27
+MD5 (djbdns-1.02.tar.gz) = c27b7ffd4af1c93db96f40f6d5f793b6
diff --git a/net/djbdns/files/patch-aa b/net/djbdns/files/patch-aa
new file mode 100644
index 000000000000..4fb1e2a7abb4
--- /dev/null
+++ b/net/djbdns/files/patch-aa
@@ -0,0 +1,20 @@
+--- dnscache-conf.orig	Sat Sep 23 17:39:21 2000
++++ dnscache-conf.c	Sat Sep 23 17:42:43 2000
+@@ -89,13 +89,13 @@
+   if (chdir(auto_home) == -1)
+     strerr_die4sys(111,FATAL,"unable to switch to ",auto_home,": ");
+ 
+-  fdrootservers = open_read("/etc/dnsroots.local");
++  fdrootservers = open_read("etc/dnsroots.local");
+   if (fdrootservers == -1) {
+     if (errno != error_noent)
+-      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.local: ");
+-    fdrootservers = open_read("/etc/dnsroots.global");
++      strerr_die4sys(111,FATAL,"unable to open ",auto_home,"/etc/dnsroots.local: ");
++    fdrootservers = open_read("etc/dnsroots.global");
+     if (fdrootservers == -1)
+-      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.global: ");
++      strerr_die4sys(111,FATAL,"unable to open ",auto_home,"/etc/dnsroots.global: ");
+   }
+ 
+   init(dir,FATAL);
diff --git a/net/djbdns/files/patch-ab b/net/djbdns/files/patch-ab
new file mode 100644
index 000000000000..e608a047589f
--- /dev/null
+++ b/net/djbdns/files/patch-ab
@@ -0,0 +1,11 @@
+--- hier.c.orig	Sat Sep 23 17:37:08 2000
++++ hier.c	Sat Sep 23 17:37:52 2000
+@@ -2,7 +2,7 @@
+ 
+ void hier()
+ {
+-  c("/","etc","dnsroots.global",-1,-1,0644);
++  c(auto_home,"etc","dnsroots.global",-1,-1,0644);
+ 
+   h(auto_home,-1,-1,02755);
+   d(auto_home,"bin",-1,-1,02755);
diff --git a/net/djbdns/pkg-descr b/net/djbdns/pkg-descr
index 742eae2701f5..b36fa2c71760 100644
--- a/net/djbdns/pkg-descr
+++ b/net/djbdns/pkg-descr
@@ -1,4 +1,4 @@
-DNScache is a collection of Domain Name System tools. It includes
+DJBDNS is a collection of Domain Name System tools. It includes
 several components:
 
   * The dnscache program is a local DNS cache. It accepts recursive DNS
@@ -20,4 +20,4 @@ several components:
   * The dnsq and dnstrace programs are DNS debugging tools.
 
 Documentation is at the website below,
-WWW: http://cr.yp.to/dnscache.html
+WWW: http://cr.yp.to/djbdns.html
diff --git a/net/djbdns/pkg-plist b/net/djbdns/pkg-plist
index 755b744d5784..f9170da33f70 100644
--- a/net/djbdns/pkg-plist
+++ b/net/djbdns/pkg-plist
@@ -1,29 +1,29 @@
-etc/dnscache/VERSION
-etc/dnscache/@
-bin/dnscache-conf
-bin/tinydns-conf
-bin/walldns-conf
-bin/rbldns-conf
-bin/pickdns-conf
+bin/axfr-get
+bin/axfrdns
 bin/axfrdns-conf
 bin/dnscache
-bin/tinydns
-bin/walldns
-bin/rbldns
-bin/pickdns
-bin/axfrdns
-bin/tinydns-get
-bin/tinydns-data
-bin/tinydns-edit
-bin/rbldns-data
-bin/pickdns-data
-bin/axfr-get
+bin/dnscache-conf
+bin/dnsfilter
 bin/dnsip
 bin/dnsipq
-bin/dnsname
-bin/dnstxt
 bin/dnsmx
-bin/dnsfilter
+bin/dnsname
 bin/dnsq
-bin/random-ip
+bin/dnsqr
 bin/dnstrace
+bin/dnstxt
+bin/pickdns
+bin/pickdns-conf
+bin/pickdns-data
+bin/random-ip
+bin/rbldns
+bin/rbldns-conf
+bin/rbldns-data
+bin/tinydns
+bin/tinydns-conf
+bin/tinydns-data
+bin/tinydns-edit
+bin/tinydns-get
+bin/walldns
+bin/walldns-conf
+etc/dnsroots.global