diff --git a/mail/qmail-dk/Makefile b/mail/qmail-dk/Makefile
index 76ec823dc763..27e55fc91560 100644
--- a/mail/qmail-dk/Makefile
+++ b/mail/qmail-dk/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	dk
 PORTVERSION=	0.54
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	QMAIL
 PKGNAMEPREFIX=	qmail-
 DISTFILES=	qmail-1.03.tar.gz
 DIST_SUBDIR=	qmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DomainKeys implementation for qmail
 WWW=		https://cr.yp.to/qmail.html
 
 LIB_DEPENDS+=	libdomainkeys.so:mail/libdomainkeys
 
 PATCH_SITES=	QMAIL
 PATCHFILES=	qmail-1.03-dk-0.54.patch
 
 USES=		qmail ssl
 
 PREFIX?=	${QMAIL_PREFIX}
 
 WRKSRC=		${WRKDIR}/qmail-1.03
 PLIST_FILES=	"@(qmailq,,4711) bin/qmail-dk" \
 		share/man/man8/qmail-dk.8.gz
 ALL_TARGET=	qmail-dk qmail-dk.8
 CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	SMTP_AUTH
 OPTIONS_DEFAULT=SMTP_AUTH
 
 SMTP_AUTH_DESC=	Support SMTP_AUTH
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSMTP_AUTH}
 PATCH_SITES+=	http://jeremy.kister.net/code/:auth
 PATCHFILES+=	qmail-dk-0.54-auth.patch:auth
 .endif
 
 do-configure:
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-qmail
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,"../domainkeys.h",<domainkeys.h>,' \
 		${WRKSRC}/qmail-dk.c
 	@${REINPLACE_CMD} -E 's|( *c\(auto.*")qmail-smtpd(".*)$$|\1qmail-smtpd\2\1qmail-dk\2|' \
 		${WRKSRC}/hier.c
 	@${REINPLACE_CMD} \
 		-e 's|../libdomainkeys.a|${LOCALBASE}/lib/libdomainkeys.a|' \
 		-e 's|\(-lcrypto\)|-L${OPENSSLLIB} \1|' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's!nofiles!qnofiles!g' \
 		${WRKSRC}/conf-groups
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qmail-dk ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/qmail-dk.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/mail/qmail-dk/files/patch-cdb__seek.c b/mail/qmail-dk/files/patch-cdb__seek.c
new file mode 100644
index 000000000000..167a43dfcb3f
--- /dev/null
+++ b/mail/qmail-dk/files/patch-cdb__seek.c
@@ -0,0 +1,9 @@
+--- cdb_seek.c.orig
++++ cdb_seek.c
+@@ -1,6 +1,5 @@
+ #include <sys/types.h>
+ #include <errno.h>
+-extern int errno;
+ #include "cdb.h"
+ 
+ #ifndef SEEK_SET
diff --git a/mail/qmail-dk/files/patch-dns.c b/mail/qmail-dk/files/patch-dns.c
new file mode 100644
index 000000000000..568abd815d27
--- /dev/null
+++ b/mail/qmail-dk/files/patch-dns.c
@@ -0,0 +1,10 @@
+--- dns.c.orig
++++ dns.c
+@@ -7,7 +7,6 @@
+ #include <errno.h>
+ extern int res_query();
+ extern int res_search();
+-extern int errno;
+ extern int h_errno;
+ #include "ip.h"
+ #include "ipalloc.h"
diff --git a/mail/qmail-dk/files/patch-error.h b/mail/qmail-dk/files/patch-error.h
new file mode 100644
index 000000000000..e35ddb04802a
--- /dev/null
+++ b/mail/qmail-dk/files/patch-error.h
@@ -0,0 +1,11 @@
+--- error.h.orig
++++ error.h
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;