diff --git a/sysutils/Makefile b/sysutils/Makefile
index 7a283c71f714..99aee2207854 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1040,6 +1040,7 @@
     SUBDIR += qchroot
     SUBDIR += qdirstat
     SUBDIR += qjail
+    SUBDIR += qjail54
     SUBDIR += qlogtools
     SUBDIR += qsudo
     SUBDIR += qt5-qtdiag
diff --git a/sysutils/qjail54/Makefile b/sysutils/qjail54/Makefile
new file mode 100644
index 000000000000..f38a8a2d2fd7
--- /dev/null
+++ b/sysutils/qjail54/Makefile
@@ -0,0 +1,45 @@
+# Created by: Joe Barbish
+# $FreeBSD$
+
+PORTNAME=	qjail
+PORTVERSION=	5.4
+CATEGORIES=	sysutils
+MASTER_SITES=	SF/${PORTNAME}
+PKGNAMESUFFIX=	54
+
+MAINTAINER=	qjail1@a1poweruser.com
+COMMENT=	Utility to quickly deploy and manage jails
+
+LICENSE=	BERNE-CONVENTION
+LICENSE_NAME=	Berne Convention
+LICENSE_TEXT=	As per the international "Berne Convention" this work is \
+		protected and all rights reserved. \
+		Before qjail may be forked, written permission must be \
+		obtained from the author <qjail1@a1poweruser.com>. \
+		This work is provided 'AS IS' and you use it at your own risk. \
+		Redistribution and use is permitted providing this license \
+		notice is retained.
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+USES=		tar:bzip2
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/qjail                      \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/qjail.bootime              \
+		${STAGEDIR}${PREFIX}/etc/rc.d
+	${INSTALL_DATA}   ${WRKSRC}/qjail.portsnap.conf        \
+		${STAGEDIR}${PREFIX}/etc/qjail.portsnap.conf.sample
+.for i in qjail qjail-intro qjail-howto qjail-vnet-howto \
+	qjail-ipv6-testing
+	${INSTALL_MAN}   ${WRKSRC}/${i}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+.endfor
+
+# note examples are mandatory. qjail will not function without them
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples/ \
+		&& ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
+
+.include <bsd.port.mk>
diff --git a/sysutils/qjail54/distinfo b/sysutils/qjail54/distinfo
new file mode 100644
index 000000000000..06dd953e6ba4
--- /dev/null
+++ b/sysutils/qjail54/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503771345
+SHA256 (qjail-5.4.tar.bz2) = 91da2c2685ee298b2f39a4643ee6c545ca5317404c61153f5089b05e9f08dcb3
+SIZE (qjail-5.4.tar.bz2) = 65689
diff --git a/sysutils/qjail54/pkg-descr b/sysutils/qjail54/pkg-descr
new file mode 100644
index 000000000000..faaeaf2c68ce
--- /dev/null
+++ b/sysutils/qjail54/pkg-descr
@@ -0,0 +1,34 @@
+This qjail version only supports RELEASE-11.0 and newer.
+
+Qjail [ q = quick ] is a 4th generation wrapper for the basic chroot jail
+system that includes security and performance enhancements. Plus a new level
+of "user friendliness" enhancements dealing with deploying just a few jails or
+large scale jail environments consisting of 100's of jails.
+
+Qjail uses the jail(8) jail.conf method. This provides the ability to enable
+the following options on a per-jail basis. exec.fib, securelevel, allow.sysvipc,
+devfs_rulesets, allow.raw_sockets, allow.quotas, allow.mount.nullfs,
+allow.mount.tmpfs, allow.mount.zfs, vnet.interface, and vnet. The vnet option
+gives a jail its own network stack using the experimental vimage kernel module.
+The vnet option has only been tested on i386 and amd64 equipment.
+
+Qjail requires no knowledge of the jail command usage. It uses "nullfs" for
+read-only system executables, sharing one copy of them with all the jails.
+
+Uses "mdconfig" to create sparse image jails. Sparse image jails provide a
+method to limit the total disk space a jail can consume, while only occupying
+the physical disk space of the sum size of the files in the image jail.
+
+Ability to assign ip address with their network device name,
+so aliases are auto created on jail start and auto removed on jail stop.
+
+Ability to create "ZONE"s of identical qjail systems, each with their own
+group of jails.
+
+Ability to designate a portion of the jail name as a group prefix so the
+command being executed will apply to only those jail names matching that prefix.
+
+Qjail has been incorporated into the Finch open source project,
+see http://dreamcat4.github.io/finch/ for details.
+
+WWW: http://qjail.sourceforge.net/
diff --git a/sysutils/qjail54/pkg-message b/sysutils/qjail54/pkg-message
new file mode 100644
index 000000000000..cf3bc8823978
--- /dev/null
+++ b/sysutils/qjail54/pkg-message
@@ -0,0 +1,15 @@
+[
+{ type: install
+  message: <<EOM
+Use the qjail utility to deploy small or large numbers of jails quickly.
+
+First issue "rehash" command to enable the qjail command (if using csh).
+Then issue
+"man qjail-intro" To read the qjail introduction.
+"man qjail"       For qjail usage details.
+"man qjail-howto" For example of driving public traffic to non-vnet jails.
+"man qjail-vnet-howto"   For example of creating vnet jails.
+"man qjail-ipv6-testing" For example of testing jails with ipv6 addresses.
+EOM
+}
+]
diff --git a/sysutils/qjail54/pkg-plist b/sysutils/qjail54/pkg-plist
new file mode 100644
index 000000000000..310de2cc3ad5
--- /dev/null
+++ b/sysutils/qjail54/pkg-plist
@@ -0,0 +1,49 @@
+bin/qjail
+@sample etc/qjail.portsnap.conf.sample
+etc/rc.d/qjail.bootime
+man/man8/qjail.8.gz
+man/man8/qjail-intro.8.gz
+man/man8/qjail-howto.8.gz
+man/man8/qjail-vnet-howto.8.gz
+man/man8/qjail-ipv6-testing.8.gz
+%%EXAMPLESDIR%%/vnet/ipfw.host.rules
+%%EXAMPLESDIR%%/vnet/ipfw.vnet.rules
+%%EXAMPLESDIR%%/vnet/ipf.host.rules
+%%EXAMPLESDIR%%/vnet/ipf.vnet.boot.rules
+%%EXAMPLESDIR%%/vnet/ipf.vnet.run.rules
+%%EXAMPLESDIR%%/vnet/pf.host.rules
+%%EXAMPLESDIR%%/vnet/pf.vnet.rules.script
+%%EXAMPLESDIR%%/vnet/devfsrules_vjail_pf70
+%%EXAMPLESDIR%%/vnet/devfsrules_vjail_ipf60
+%%EXAMPLESDIR%%/vnet/devfsrules_qjail_bpf50
+%%EXAMPLESDIR%%/vnet/dot.cshrc
+%%EXAMPLESDIR%%/default/etc/make.conf
+%%EXAMPLESDIR%%/default/etc/motd
+%%EXAMPLESDIR%%/default/etc/periodic.conf
+%%EXAMPLESDIR%%/default/etc/newsyslog.conf
+%%EXAMPLESDIR%%/default/etc/rc.conf
+%%EXAMPLESDIR%%/default/root/.cshrc
+%%EXAMPLESDIR%%/default/usr/local/etc/pkg.conf
+%%EXAMPLESDIR%%/default/usr/local/etc/sudoers
+%%EXAMPLESDIR%%/ssh-default/etc/group
+%%EXAMPLESDIR%%/ssh-default/etc/make.conf
+%%EXAMPLESDIR%%/ssh-default/etc/master.passwd
+%%EXAMPLESDIR%%/ssh-default/etc/motd
+%%EXAMPLESDIR%%/ssh-default/etc/passwd
+%%EXAMPLESDIR%%/ssh-default/etc/periodic.conf
+%%EXAMPLESDIR%%/ssh-default/etc/newsyslog.conf
+%%EXAMPLESDIR%%/ssh-default/etc/pwd.db
+%%EXAMPLESDIR%%/ssh-default/etc/rc.conf
+%%EXAMPLESDIR%%/ssh-default/etc/spwd.db
+%%EXAMPLESDIR%%/ssh-default/etc/ssh/sshd_config
+%%EXAMPLESDIR%%/ssh-default/root/.cshrc
+%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.cshrc
+%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.login
+%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.login_conf
+%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.mail_aliases
+%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.mailrc
+%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.profile
+%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.rhosts
+%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.shrc
+%%EXAMPLESDIR%%/ssh-default/usr/local/etc/pkg.conf
+%%EXAMPLESDIR%%/ssh-default/usr/local/etc/sudoers