diff --git a/shells/jailkit/Makefile b/shells/jailkit/Makefile
index 40021bddb8ce..948f7a2a776d 100644
--- a/shells/jailkit/Makefile
+++ b/shells/jailkit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jailkit
 PORTVERSION=	2.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	shells
 MASTER_SITES=	http://olivier.sessink.nl/jailkit/ \
 		http://www.sfr-fresh.com/unix/privat/
@@ -19,7 +19,14 @@ CONFIGURE_ENV=	PYTHONINTERPRETER=${PYTHON_CMD}
 
 PORTDOCS=	COPYRIGHT README.txt
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS PROCMAIL
+OPTIONS_SUB=	yes
+
+PROCMAIL_DESC=	Build procmail(1) wrapper
+
+PROCMAIL_CONFIGURE_ENV_OFF=	ac_cv_path_PROCMAILPATH=no
+PROCMAIL_BUILD_DEPENDS=	procmail:mail/procmail
+PROCMAIL_RUN_DEPENDS=	procmail:mail/procmail
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -30,4 +37,7 @@ post-install:
 		${STAGEDIR}${PREFIX}/sbin/jk_chrootsh \
 		${STAGEDIR}${PREFIX}/sbin/jk_lsh
 
+post-install-PROCMAIL-on:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/jk_procmailwrapper
+
 .include <bsd.port.mk>
diff --git a/shells/jailkit/pkg-plist b/shells/jailkit/pkg-plist
index 7f74c4210349..106c23c63336 100644
--- a/shells/jailkit/pkg-plist
+++ b/shells/jailkit/pkg-plist
@@ -16,6 +16,7 @@ man/man8/jk_init.8.gz
 man/man8/jk_jailuser.8.gz
 man/man8/jk_list.8.gz
 man/man8/jk_lsh.8.gz
+%%PROCMAIL%%man/man8/jk_procmailwrapper.8.gz
 man/man8/jk_socketd.8.gz
 man/man8/jk_uchroot.8.gz
 man/man8/jk_update.8.gz
@@ -28,6 +29,7 @@ sbin/jk_init
 sbin/jk_jailuser
 sbin/jk_list
 sbin/jk_lsh
+%%PROCMAIL%%sbin/jk_procmailwrapper
 sbin/jk_socketd
 sbin/jk_update
 %%DATADIR%%/jk_lib.py