diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 522bf1cd5903..5b1360066330 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -201,9 +201,9 @@
             ..
         ..
         certs
-            blacklisted
+            blacklisted tags=package=caroot
             ..
-            trusted
+            trusted tags=package=caroot
             ..
         ..
         dict
diff --git a/release/packages/caroot.ucl b/release/packages/caroot.ucl
new file mode 100644
index 000000000000..923601ea0f3e
--- /dev/null
+++ b/release/packages/caroot.ucl
@@ -0,0 +1,31 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+scripts: {
+	# XXX If pkg picks up a mechanism to detect in the post-install script
+	# files being added or removed, we should use it instead to gate the
+	# rehash.
+	post-install = <<EOD
+	[ -x /usr/sbin/certctl ] && /usr/sbin/certctl rehash
+EOD
+}
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index bcf71e9919f6..eff7e3ab8504 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -34,6 +34,9 @@ main() {
 	outname="$(echo ${outname} | tr '-' '_')"
 
 	case "${outname}" in
+		caroot)
+			pkgdeps="utilities"
+			;;
 		runtime)
 			outname="runtime"
 			uclfile="${uclfile}"
diff --git a/secure/caroot/Makefile b/secure/caroot/Makefile
index 7c0831d2ac2f..50f92ecc6542 100644
--- a/secure/caroot/Makefile
+++ b/secure/caroot/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	caroot
-
 CLEANFILES+=	certdata.txt
 
 SUBDIR+=	trusted
diff --git a/secure/caroot/Makefile.inc b/secure/caroot/Makefile.inc
new file mode 100644
index 000000000000..9475e35f5854
--- /dev/null
+++ b/secure/caroot/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+PACKAGE=	caroot