diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index 16515f28d1f4..953f971b2004 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	checkpassword
 PORTVERSION=	0.90
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://cr.yp.to/checkpwd/ \
 		GENTOO
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Simple password-checking interface
 WWW=		https://cr.yp.to/checkpwd.html
 
 OPTIONS_DEFINE=	DOCS
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup
 
 PLIST_FILES=	bin/checkpassword
 PORTDOCS=	CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,gcc,${CC},g" ${WRKSRC}/find-systype.sh
 
 do-configure:
 	@${ECHO_CMD} '${CC} ${CFLAGS} -s -lcrypt' > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} '${CC} ${CFLAGS} -s -lcrypt' > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} ${STAGEDIR}${PREFIX} >${WRKSRC}/conf-home
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/security/checkpassword/files/patch-error.h b/security/checkpassword/files/patch-error.h
new file mode 100644
index 000000000000..e35ddb04802a
--- /dev/null
+++ b/security/checkpassword/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;