diff --git a/shells/jailkit/Makefile b/shells/jailkit/Makefile
index e21a013549c8..6b649bd08fb1 100644
--- a/shells/jailkit/Makefile
+++ b/shells/jailkit/Makefile
@@ -1,42 +1,41 @@
 # Created by: Sylvio Cesar <sylvio@FreeBSD.org>
 
 PORTNAME=	jailkit
-PORTVERSION=	2.21
+PORTVERSION=	2.22
 CATEGORIES=	shells
 MASTER_SITES=	http://olivier.sessink.nl/jailkit/ \
 		http://www.sfr-fresh.com/unix/privat/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities to limit user accounts to specific files and/or commands
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USES=		python
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHONINTERPRETER=${PYTHON_CMD}
 PORTDOCS=	COPYRIGHT README.txt
 
 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}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jk_uchroot \
 		${STAGEDIR}${PREFIX}/sbin/jk_socketd \
 		${STAGEDIR}${PREFIX}/sbin/jk_chrootlaunch \
 		${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/distinfo b/shells/jailkit/distinfo
index 79e60f3e83d4..77eefa57733a 100644
--- a/shells/jailkit/distinfo
+++ b/shells/jailkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575986065
-SHA256 (jailkit-2.21.tar.gz) = 7a020e07adf93860c538f0d98196aea33d461babdba8bb3eddf7081e57a29c14
-SIZE (jailkit-2.21.tar.gz) = 141341
+TIMESTAMP = 1619617299
+SHA256 (jailkit-2.22.tar.gz) = a7c979617206710b56bbbe0ddcdfb1e14b2bfc440030b0283713f4a43f284a71
+SIZE (jailkit-2.22.tar.gz) = 141724
diff --git a/shells/jailkit/files/patch-man_Makefile.in b/shells/jailkit/files/patch-man_Makefile.in
new file mode 100644
index 000000000000..cda814f0b52d
--- /dev/null
+++ b/shells/jailkit/files/patch-man_Makefile.in
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	2021-02-03 13:57:43 UTC
++++ man/Makefile.in
+@@ -20,7 +20,7 @@ SRCS = \
+ 
+ @HAVEPROCMAIL_TRUE@SRCS += jk_procmailwrapper.8
+ 
+-MANS = $(SRCS:.8=.8.gz)
++MANS = $(SRCS:N*.7:.8=.8.gz)
+ MANS7 = $(SRCS:.7=.7.gz)
+ 
+ 
diff --git a/shells/jailkit/pkg-descr b/shells/jailkit/pkg-descr
index 623d8596fb95..780d0dbd1d68 100644
--- a/shells/jailkit/pkg-descr
+++ b/shells/jailkit/pkg-descr
@@ -1,17 +1,17 @@
 Jailkit is a set of utilities to limit user accounts to specific files
-using chroot() and or specific commands. Setting up a chroot shell, a
+using chroot() and/or specific commands.  Setting up a chroot shell, a
 shell limited to some specific command, or a daemon inside a chroot jail
 is a lot easier and can be automated using these utilities.
 
 Jailkit is a specialized tool that is developed with a focus on security.
-It will abort in a secure way if the configuration, the system setup or the
-environment is not 100% secure, and it will send useful log messages that
-explain what is wrong to syslog.
+It will abort in a secure way if the configuration, the system setup or
+the environment is not 100% secure, and it will send useful log messages
+that explain what is wrong to syslog.
 
-Jailkit is known to be used in network security appliances from several leading
-IT security firms, internet servers from several large enterprise organizations,
-internet servers from internet service providers, as well as many smaller
-companies and private users that need to secure cvs, sftp, shell or daemon
-processes.
+Jailkit is known to be used in network security appliances from several
+leading IT security firms, internet servers from several large enterprise
+organizations, internet servers from internet service providers, as well
+as many smaller companies and private users that need to secure cvs,
+sftp, shell, or daemon processes.
 
 WWW: https://olivier.sessink.nl/jailkit/
diff --git a/shells/jailkit/pkg-plist b/shells/jailkit/pkg-plist
index 6db4e2536a18..a2e1e60a6d32 100644
--- a/shells/jailkit/pkg-plist
+++ b/shells/jailkit/pkg-plist
@@ -1,34 +1,34 @@
 bin/jk_uchroot
 %%ETCDIR%%/jk_check.ini
 %%ETCDIR%%/jk_chrootsh.ini
 %%ETCDIR%%/jk_init.ini
 %%ETCDIR%%/jk_lsh.ini
 %%ETCDIR%%/jk_socketd.ini
 %%ETCDIR%%/jk_uchroot.ini
 %%ETCDIR%%/jk_update.ini
-man/man8/jailkit.8.gz
+man/man7/jailkit.7.gz
 man/man8/jk_check.8.gz
 man/man8/jk_chrootlaunch.8.gz
 man/man8/jk_chrootsh.8.gz
 man/man8/jk_cp.8.gz
 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
 sbin/jk_check
 sbin/jk_chrootlaunch
 @shell sbin/jk_chrootsh
 sbin/jk_cp
 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
 %%DATADIR%%/jk_lib.pyc