diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 36f1c529d48..9911fba3172 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2001/01/09 15:25:25 camield Exp $
+# $OpenBSD: Makefile,v 1.8 2001/01/11 12:33:24 camield Exp $
 
 DISTNAME=	djbdns-1.03
 HOMEPAGE=	http://cr.yp.to/djbdns.html
@@ -7,6 +7,9 @@ MAINTAINER=	Camiel Dobbelaar <cd@sentia.nl>
 
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://ftp.id.wustl.edu/pub/qmail/
+MASTER_SITES0=	ftp://ftp.innominate.org/gpa/djb/
+
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-man${EXTRACT_SUFX}:0
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -19,26 +22,6 @@ INSTALL_TARGET=	setup check
 RUN_DEPENDS=	supervise::sysutils/daemontools \
 		tcpclient::net/ucspi-tcp
 
-FLAVORS=	man
-FLAVOR?=
-
-pre-build:
-	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@echo ${PREFIX} > ${WRKSRC}/conf-home
-
-pre-install:
-	@echo ${PREFIX} > ${WRKSRC}/conf-home
-
-
-# Start of -man specific overrides
-.if ${FLAVOR:L:Mman}
-
-MASTER_SITES0=	ftp://ftp.innominate.org/gpa/djb/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-man${EXTRACT_SUFX}:0
-
-PERMIT_PACKAGE_CDROM=	No
-PERMIT_PACKAGE_FTP=	No
-
 MAN5LIST=	qualification
 MAN1LIST=	dnsfilter dnsipq dnsname dnsqr dnstxt dnsip \
 		dnsmx dnsq dnstrace dnstracesort
@@ -47,6 +30,13 @@ MAN8LIST=	axfr-get dnscache pickdns rbldns tinydns axfrdns \
 		dnscache-conf pickdns-data rbldns-data tinydns-data \
 		walldns
 
+pre-build:
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX} > ${WRKSRC}/conf-home
+
+pre-install:
+	@echo ${PREFIX} > ${WRKSRC}/conf-home
+
 post-install:
 .for mtype in 1 5 8
 .  for file in ${MAN${mtype}LIST}
@@ -55,7 +45,4 @@ post-install:
 .  endfor
 .endfor
 
-.endif
-# End of -man specific overrides
-
 .include <bsd.port.mk>
diff --git a/net/djbdns/pkg/PFRAG.man b/net/djbdns/pkg/PFRAG.man
deleted file mode 100644
index a42f75aa347..00000000000
--- a/net/djbdns/pkg/PFRAG.man
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $OpenBSD: PFRAG.man,v 1.1 2001/01/09 15:25:26 camield Exp $
-man/man1/dnsfilter.1
-man/man1/dnsip.1
-man/man1/dnsipq.1
-man/man1/dnsmx.1
-man/man1/dnsname.1
-man/man1/dnsq.1
-man/man1/dnsqr.1
-man/man1/dnstrace.1
-man/man1/dnstracesort.1
-man/man1/dnstxt.1
-man/man5/qualification.5
-man/man8/axfr-get.8
-man/man8/axfrdns.8
-man/man8/dnscache-conf.8
-man/man8/dnscache.8
-man/man8/pickdns-conf.8
-man/man8/pickdns-data.8
-man/man8/pickdns.8
-man/man8/rbldns-conf.8
-man/man8/rbldns-data.8
-man/man8/rbldns.8
-man/man8/tinydns-conf.8
-man/man8/tinydns-data.8
-man/man8/tinydns.8
-man/man8/walldns-conf.8
-man/man8/walldns.8
diff --git a/net/djbdns/pkg/PLIST b/net/djbdns/pkg/PLIST
index 70b034b04be..7fc184e93ff 100644
--- a/net/djbdns/pkg/PLIST
+++ b/net/djbdns/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2001/01/09 15:25:26 camield Exp $
+@comment $OpenBSD: PLIST,v 1.6 2001/01/11 12:33:25 camield Exp $
 bin/axfr-get
 bin/axfrdns
 bin/axfrdns-conf
@@ -27,6 +27,31 @@ bin/tinydns-edit
 bin/tinydns-get
 bin/walldns
 bin/walldns-conf
-%%man%%
+man/man1/dnsfilter.1
+man/man1/dnsip.1
+man/man1/dnsipq.1
+man/man1/dnsmx.1
+man/man1/dnsname.1
+man/man1/dnsq.1
+man/man1/dnsqr.1
+man/man1/dnstrace.1
+man/man1/dnstracesort.1
+man/man1/dnstxt.1
+man/man5/qualification.5
+man/man8/axfr-get.8
+man/man8/axfrdns.8
+man/man8/dnscache-conf.8
+man/man8/dnscache.8
+man/man8/pickdns-conf.8
+man/man8/pickdns-data.8
+man/man8/pickdns.8
+man/man8/rbldns-conf.8
+man/man8/rbldns-data.8
+man/man8/rbldns.8
+man/man8/tinydns-conf.8
+man/man8/tinydns-data.8
+man/man8/tinydns.8
+man/man8/walldns-conf.8
+man/man8/walldns.8
 share/djbdns/dnsroots.global
 @dirrm share/djbdns