diff --git a/dns/djbdns/files/patch-aa b/dns/djbdns/files/patch-dnscache-conf.c
similarity index 100%
rename from dns/djbdns/files/patch-aa
rename to dns/djbdns/files/patch-dnscache-conf.c
diff --git a/dns/djbdns/files/patch-ab b/dns/djbdns/files/patch-hier.c
similarity index 100%
rename from dns/djbdns/files/patch-ab
rename to dns/djbdns/files/patch-hier.c
diff --git a/dns/doc/Makefile b/dns/doc/Makefile
index 21442f8e5404..c9fd07f67d52 100644
--- a/dns/doc/Makefile
+++ b/dns/doc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Diagnose unhealthy DNS domains
 
 RUN_DEPENDS=	dig:${PORTSDIR}/dns/bind-tools
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 AUX_DIR=	lib/doc
 AUX_FILES=	doc-1.awk doc-3.awk doc-4.awk INFO RFC.XXXX
@@ -21,7 +21,7 @@ AUX_FILES=	doc-1.awk doc-3.awk doc-4.awk INFO RFC.XXXX
 do-build:
 	@${MV} ${WRKSRC}/doc ${WRKSRC}/doc.org
 	@${SED} -e 's|$${PREFIX}|${PREFIX}|g' -e 's|$${AUX_DIR}|${AUX_DIR}|g' ${WRKSRC}/doc.org \
-	> ${WRKSRC}/doc
+		> ${WRKSRC}/doc
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${AUX_DIR}
diff --git a/dns/doc/files/patch-aa b/dns/doc/files/patch-doc
similarity index 100%
rename from dns/doc/files/patch-aa
rename to dns/doc/files/patch-doc
diff --git a/dns/nsping/files/patch-aa b/dns/nsping/files/patch-Makefile
similarity index 100%
rename from dns/nsping/files/patch-aa
rename to dns/nsping/files/patch-Makefile
diff --git a/dns/nsping/files/patch-ab b/dns/nsping/files/patch-nsping.c
similarity index 100%
rename from dns/nsping/files/patch-ab
rename to dns/nsping/files/patch-nsping.c