diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index 337c28c266ef..c2e8842d3bbd 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	fastforward
 PORTVERSION=	0.51
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fastforward handles qmail forwarding according to a cdb database
 WWW=		https://cr.yp.to/fastforward.html
 
 USES=		gmake groff
 
 ALL_TARGET=	default
 
 FILES=	fastforward printforward setforward newaliases printmaillist setmaillist newinclude
 
 PORTDOCS=	ALIASES
 
 PLIST_FILES=	${FILES:S,^,bin/,} \
 		${FILES:S,^,share/man/man1/,:S,$,.1.gz,}
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 .for binfile in ${FILES}
 	${INSTALL_PROGRAM} ${WRKSRC}/${binfile} ${STAGEDIR}${PREFIX}/bin/${binfile}
 	${INSTALL_MAN} ${WRKSRC}/${binfile}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ALIASES ${STAGEDIR}${DOCSDIR}/ALIASES
 
 .include <bsd.port.mk>
diff --git a/mail/fastforward/files/patch-cdb__seek.c b/mail/fastforward/files/patch-cdb__seek.c
new file mode 100644
index 000000000000..167a43dfcb3f
--- /dev/null
+++ b/mail/fastforward/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/fastforward/files/patch-error.h b/mail/fastforward/files/patch-error.h
new file mode 100644
index 000000000000..e35ddb04802a
--- /dev/null
+++ b/mail/fastforward/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;