diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 7f3c47107329..1daf182d3812 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	djbdns
 PORTVERSION?=	${DJBDNS_VER}
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES?=	dns
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
@@ -16,8 +16,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 .if !defined(WITHOUT_MAN)
 MANDATE=	-20031023
-MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:1
-DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:1
+MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:manpages
+DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:manpages
 
 MAN1=		dnsfilter.1 dnsip.1 dnsipq.1 dnsmx.1 dnsname.1 \
 		dnsq.1 dnsqr.1 dnstrace.1 dnstracesort.1 dnstxt.1 \
@@ -32,8 +32,8 @@ MANCOMPRESSED=	no
 .if defined(WITH_IPV6)
 PKGNAMESUFFIX=	-ipv6
 PORTVERSION=	${DJBDNS_VER}.${DJBDNS_V6_VER:S/test/b/:S/diff//}
-PATCH_SITES+=	http://www.fefe.de/dns/
-PATCHFILES+=	${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2
+PATCH_SITES+=	http://www.fefe.de/dns/:ipv6
+PATCHFILES+=	${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2:ipv6
 PATCH_DIST_STRIP=	-p1
 .endif
 
@@ -41,12 +41,18 @@ PATCH_DIST_STRIP=	-p1
 .if defined(WITH_IPV6)
 BROKEN=		The IPv6 and dnscache-dumpcache patches are currently in conflict.
 .endif
-PATCH_SITES+=	http://efge.free.fr/djbdns/
-PATCHFILES+=	patch-dnscache-dumpcache-v4.txt
+PATCH_SITES+=	http://efge.free.fr/djbdns/:dumpcache
+PATCHFILES+=	patch-dnscache-dumpcache-v4.txt:dumpcache
 PATCH_DIST_STRIP=	-p1
 CFLAGS+=	-DDUMPCACHE
 .endif
 
+.if defined(WITH_IGNOREIP)
+PATCH_SITES+=	http://tinydns.org/:ignoreip
+PATCHFILES+=	djbdns-1.05-ignoreip2.patch:ignoreip
+PATCH_DIST_STRIP=	-p1
+.endif
+
 DJBDNS_VER=	1.05
 DJBDNS_V6_VER=	test14
 
@@ -76,6 +82,8 @@ pre-fetch:
 	@${ECHO} "                            http://efge.free.fr/djbdns/"
 	@${ECHO} "- WITHOUT_MAN             - do NOT install Gerritt Pape's manual pages"
 	@${ECHO} "                            http://smarden.org/pape/djb/manpages/"
+	@${ECHO} "- WITH_IGNOREIP           - build with Russel Nelson's ignoreip2 patch"
+	@${ECHO} "                            http://tinydns.org/djbdns-1.05-ignoreip2.patch"
 
 post-patch:
 	@echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
diff --git a/dns/djbdns/distinfo b/dns/djbdns/distinfo
index 1f129654c917..36fab1295e6f 100644
--- a/dns/djbdns/distinfo
+++ b/dns/djbdns/distinfo
@@ -2,3 +2,4 @@ MD5 (djbdns-1.05.tar.gz) = 3147c5cd56832aa3b41955c7a51cbeb2
 MD5 (djbdns-1.05-man-20031023.tar.gz) = 14d7329cff69f604fac607436eb8485e
 MD5 (djbdns-1.05-test14.diff.bz2) = 52bec93d7ce6226281082367e49157d3
 MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542
+MD5 (djbdns-1.05-ignoreip2.patch) = c032250b209d055847a763c8d9c7e865