diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index 5d406d8f7f66..cab0a791cb96 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	serialmail
 PORTVERSION=	0.75
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.gbnet.net/pub/qmail/ \
 		ftp://ftp.de.uu.net/pub/unix/mail/qmail/ \
 		ftp://ftp.iway.fr/pub/unix/mail/qmail/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools for passing mail across serial links
 WWW=		https://cr.yp.to/serialmail.html
 
 # Converted from LEGAL_TEXT
 LICENSE=	djb
 LICENSE_NAME=	djb
 LICENSE_TEXT=	No license -- see http://cr.yp.to/softwarelaw.html
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	tcpserver:sysutils/ucspi-tcp
 UCSPI_SSL_RUN_DEPENDS=	sslclient:sysutils/ucspi-ssl
 
 USES=		qmail:run
 OPTIONS_SUB=	yes
 
 ALL_TARGET=	it
 
 OPTIONS_DEFINE=	AUTH DOCS UCSPI_SSL
 AUTH_DESC=	Add CRAM-MD5, PLAIN and LOGIN authentication
 UCSPI_SSL_DESC=	ucspi-ssl SMTP SSL transport layer support
 
 PROGRAMS=	serialqmtp serialsmtp maildirserial setlock
 SCRIPTS=	maildirqmtp maildirsmtp
 MAN=		maildirqmtp.1 maildirserial.1 maildirsmtp.1 serialqmtp.1 \
 		serialsmtp.1 setlock.1
 PORTDOCS=	AUTOTURN BLURB CHANGES FROMISP README TODO TOISP THANKS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAUTH}
 PATCH_SITES=	http://www.ingorohloff.de/soft/
 PATCHFILES=	serialmail-auth.patch
 PATCH_DIST_STRIP=	-p1
 .endif
 
 post-patch:
 .if ${PORT_OPTIONS:MUCSPI_SSL}
 	@${SED} -E \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|%%PREFIX%%|${PREFIX}|' \
 		-e 's|%%SH%%|${SH}|' \
 		${FILESDIR}/maildirsmtps \
 		> ${WRKDIR}/maildirsmtps
 .endif
 
 post-configure:
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
 	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} ${QMAIL_PREFIX} > ${WRKSRC}/conf-qmail
 
 do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} ${PROGRAMS} ${STAGEDIR}${PREFIX}/bin && \
 		${INSTALL_SCRIPT} ${SCRIPTS} ${STAGEDIR}${PREFIX}/bin && \
 		${INSTALL_MAN} ${MAN} ${STAGEDIR}${PREFIX}/share/man/man1
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MUCSPI_SSL}
 	@${INSTALL_SCRIPT} ${WRKDIR}/maildirsmtps ${STAGEDIR}${PREFIX}/bin
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/serialmail/files/patch-error.h b/mail/serialmail/files/patch-error.h
new file mode 100644
index 000000000000..e35ddb04802a
--- /dev/null
+++ b/mail/serialmail/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/serialmail/files/patch-leapsecs__read.c b/mail/serialmail/files/patch-leapsecs__read.c
new file mode 100644
index 000000000000..60cacfbe6e32
--- /dev/null
+++ b/mail/serialmail/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"
+