diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 9bd2994c882a..e1256e02b2ad 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -26,10 +26,14 @@ bsdinstall_COMMENT= 	BSDInstall Utilities
 bsdinstall_DESC= 	BSDInstall Utilities
 bsnmp_COMMENT= 		BSNMP Utilities
 bsnmp_DESC= 		BSNMP Utilities
+caroot_COMMENT= 	SSL Certificates
+caroot_DESC= 		SSL Certificates
 clang_COMMENT= 		Clang Utilities
 clang_DESC= 		Clang Utilities
 clibs_COMMENT= 		Core C Libraries
 clibs_DESC= 		Core C Libraries
+certctl_COMMENT= 	SSL Certificate Utility
+certctl_DESC=		SSL Certificate Utility
 console-tools_COMMENT=	Console Utilities
 console-tools_DESC=	Console Utilities
 csh_COMMENT=		C Shell
@@ -113,8 +117,10 @@ nfs_COMMENT=		NFS Utilities
 nfs_DESC= 		NFS Utilities
 nvme-tools_COMMENT=	NVME Utilities
 nvme-tools_DESC=	NVME Utilities
-openssl_COMMENT=	OpenSSL Library and Utility
-openssl_DESC=		OpenSSL Library and Utility
+openssl_COMMENT=	OpenSSL Utility
+openssl_DESC=		OpenSSL Utility
+openssl-lib_COMMENT=	OpenSSL Libraries
+openssl-lib_DESC=	OpenSSL Libraries
 pkg-bootstrap_COMMENT=	pkg bootstrap Utility
 pkg-bootstrap_DESC=	pkg bootstrap Utility
 periodic_COMMENT=	Periodic Utility
diff --git a/release/packages/caroot.ucl b/release/packages/certctl.ucl
similarity index 100%
rename from release/packages/caroot.ucl
rename to release/packages/certctl.ucl
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 2b1f71e95c11..0c90a9ec4553 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -42,8 +42,8 @@ main() {
 			# clibs should not have any dependencies or anything
 			# else imposed on it.
 			;;
-		caroot)
-			pkgdeps="openssl"
+		certctl)
+			pkgdeps="caroot openssl"
 			;;
 
 		# -dev packages that have no corresponding non-dev package
@@ -139,14 +139,16 @@ main() {
 
 	cp "${uclsource}" "${uclfile}"
 	if [ ! -z "${pkgdeps}" ]; then
-		cat <<EOF >> ${uclfile}
-deps: {
-	FreeBSD-${pkgdeps}: {
+		echo 'deps: {' >> ${uclfile}
+		for dep in ${pkgdeps}; do
+			cat <<EOF >> ${uclfile}
+	FreeBSD-${dep}: {
 		origin: "base",
 		version: "${PKG_VERSION}"
 	}
-}
 EOF
+		done
+		echo '}' >> ${uclfile}
 	fi
 	cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )"
 	sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 89f330ca2800..6b2a1f3bd157 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -6,7 +6,7 @@ SUBDIR=		engines modules
 .include <bsd.own.mk>
 .include <src.opts.mk>
 
-PACKAGE=	openssl
+PACKAGE=	openssl-lib
 LIB=		crypto
 SHLIB_MAJOR=	30
 VERSION_MAP=	${.CURDIR}/Version.map
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index 4cf17b8d5c51..dc308bcfb146 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -5,7 +5,7 @@
 LIB=		ssl
 SHLIB_MAJOR=	30
 VERSION_MAP=	${.CURDIR}/Version.map
-PACKAGE=	openssl
+PACKAGE=	openssl-lib
 
 NO_LINT=
 
diff --git a/usr.sbin/certctl/Makefile b/usr.sbin/certctl/Makefile
index df5acb606143..d583bf3055bd 100644
--- a/usr.sbin/certctl/Makefile
+++ b/usr.sbin/certctl/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	caroot
+PACKAGE=	certctl
 SCRIPTS=certctl.sh
 MAN=	certctl.8