diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 10fe26b12a1b..216311857210 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -204,7 +204,8 @@ FILES+=		iscsid
 .endif
 
 .if ${MK_JAIL} != "no"
-FILES+=	jail
+FILESGROUPS+=	JAIL
+JAIL+=		jail
 .endif
 
 .if ${MK_LEGACY_CONSOLE} != "no"
@@ -307,4 +308,8 @@ BSNMPDIR=	/etc/rc.d
 BSNMPMODE=	${BINMODE}
 BSNMPPACKAGE=	bsnmp
 
+JAILDIR=	/etc/rc.d
+JAILMODE=	${BINMODE}
+JAILPACKAGE=	jail
+
 .include <bsd.prog.mk>
diff --git a/lib/libjail/Makefile b/lib/libjail/Makefile
index 442274ae35dd..7932e9f4882b 100644
--- a/lib/libjail/Makefile
+++ b/lib/libjail/Makefile
@@ -6,6 +6,8 @@ SHLIB_MAJOR= 1
 SRCS=	jail.c jail_getid.c
 INCS=	jail.h
 
+PACKAGE=jail
+
 MAN=	jail.3
 
 MLINKS+=jail.3 jail_getid.3
diff --git a/release/packages/jail-debug-lib32.ucl b/release/packages/jail-debug-lib32.ucl
new file mode 100644
index 000000000000..e7186d1d3b80
--- /dev/null
+++ b/release/packages/jail-debug-lib32.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail 32-bit libraries (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-debug.ucl b/release/packages/jail-debug.ucl
new file mode 100644
index 000000000000..4678e9040389
--- /dev/null
+++ b/release/packages/jail-debug.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail utilities (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-development.ucl b/release/packages/jail-development.ucl
new file mode 100644
index 000000000000..4b24294def1e
--- /dev/null
+++ b/release/packages/jail-development.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail utilities development"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-lib32-development.ucl b/release/packages/jail-lib32-development.ucl
new file mode 100644
index 000000000000..66805bec298e
--- /dev/null
+++ b/release/packages/jail-lib32-development.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail 32-bit development" 
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-lib32-profile.ucl b/release/packages/jail-lib32-profile.ucl
new file mode 100644
index 000000000000..3c4b592ff4e1
--- /dev/null
+++ b/release/packages/jail-lib32-profile.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail 32-bit libraries (profiling)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-lib32.ucl b/release/packages/jail-lib32.ucl
new file mode 100644
index 000000000000..0cee475d7097
--- /dev/null
+++ b/release/packages/jail-lib32.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail 32-bit libraries"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail-profile.ucl b/release/packages/jail-profile.ucl
new file mode 100644
index 000000000000..a919f58bd7f8
--- /dev/null
+++ b/release/packages/jail-profile.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail libraries (profiling)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/jail.ucl b/release/packages/jail.ucl
new file mode 100644
index 000000000000..a307a31dc3ef
--- /dev/null
+++ b/release/packages/jail.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Jail utilities"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index 9dfdee59deb7..1fb905b28479 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -8,6 +8,8 @@ SRCS=	jail.c command.c config.c state.c jailp.h jaillex.l jailparse.y y.tab.h
 
 LIBADD=	jail kvm util l
 
+PACKAGE=jail
+
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
 YFLAGS+=-v
diff --git a/usr.sbin/jexec/Makefile b/usr.sbin/jexec/Makefile
index 700da973904a..3ecf5676dc55 100644
--- a/usr.sbin/jexec/Makefile
+++ b/usr.sbin/jexec/Makefile
@@ -4,4 +4,6 @@ PROG=	jexec
 MAN=	jexec.8
 LIBADD=	jail util
 
+PACKAGE=jail
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/jls/Makefile b/usr.sbin/jls/Makefile
index 4c1de748ff90..34a5023516cb 100644
--- a/usr.sbin/jls/Makefile
+++ b/usr.sbin/jls/Makefile
@@ -6,6 +6,8 @@ PROG=	jls
 MAN=	jls.8
 LIBADD=	jail xo
 
+PACKAGE=jail
+
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
 .endif