diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile
index b6ddffb6d068..cd5a76106369 100644
--- a/mail/mess822/Makefile
+++ b/mail/mess822/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	mess822
 PORTVERSION=	0.58
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.jp.qmail.org/qmail/ \
 		ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/ \
 		ftp://mirror.pipex.net/pub/unix/mail/qmail/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RFC 822 mail message parsing library and rewriting utilities
 WWW=		https://cr.yp.to/mess822.html
 
 USES=		groff qmail:vars
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
 NO_MTREE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|.var.qmail|${QMAIL_PREFIX}|" ${WRKSRC}/conf-qmail
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} ${STAGEDIR}${PREFIX} > ${WRKSRC}/conf-home
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/man
 
 .include <bsd.port.mk>
diff --git a/mail/mess822/files/patch-cdb__seek.c b/mail/mess822/files/patch-cdb__seek.c
new file mode 100644
index 000000000000..167a43dfcb3f
--- /dev/null
+++ b/mail/mess822/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/mess822/files/patch-error.h b/mail/mess822/files/patch-error.h
new file mode 100644
index 000000000000..e35ddb04802a
--- /dev/null
+++ b/mail/mess822/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;
diff --git a/mail/mess822/files/patch-leapsecs__read.c b/mail/mess822/files/patch-leapsecs__read.c
new file mode 100644
index 000000000000..60cacfbe6e32
--- /dev/null
+++ b/mail/mess822/files/patch-leapsecs__read.c
@@ -0,0 +1,10 @@
+--- leapsecs_read.c.orig
++++ leapsecs_read.c
+@@ -2,7 +2,6 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
+-extern int errno;
+ #include "tai.h"
+ #include "leapsecs.h"
+