diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile
index 0641f07f85aa..021a567060cc 100644
--- a/mail/queue-fix/Makefile
+++ b/mail/queue-fix/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	queue-fix
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.netmeridian.com/e-huss/ \
 		GENTOO
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Repairs or generates a qmail queue structure
 WWW=		https://cr.yp.to/qmail.html
 
 USES=		qmail:run
 
 PREFIX?=	${QMAIL_PREFIX}
 
 CONFIGURE_SCRIPT=	# empty
 ALL_TARGET=	# empty
 
 PLIST_FILES=	bin/queue-fix
 
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS BIG_TODO
 
 BIG_TODO_DESC=	Use big_todo patch
 
 .include <bsd.port.pre.mk>
 
 .if (${PREFIX} == ${LOCALBASE})
 DOCSDIR=	${PREFIX}/share/doc/qmail/queue-fix
 .else
 DOCSDIR=	${PREFIX}/doc/queue-fix
 .endif
 
 .if ${PORT_OPTIONS:MBIG_TODO}
 PATCH_SITES+=		http://www.qmail.org/
 PATCHFILES+=		queue-fix-todo.patch
 PATCH_DIST_STRIP+=	-p1
 .endif
 
 post-patch:
 	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/queue-fix ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/mail/queue-fix/files/patch-error.h b/mail/queue-fix/files/patch-error.h
new file mode 100644
index 000000000000..e35ddb04802a
--- /dev/null
+++ b/mail/queue-fix/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;