diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 127da5dc05cd..40faed84ea03 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -26,10 +26,6 @@ clang_COMMENT= 		Clang Utilities
 clang_DESC= 		Clang Utilities
 clibs_COMMENT= 		Core C Libraries
 clibs_DESC= 		Core C Libraries
-debug_COMMENT= 		FreeBSD Base System (Debugging Symbols)
-debug_DESC= 		FreeBSD Base System (Debugging Symbols)
-development_COMMENT= 	FreeBSD Base System (Development Files)
-development_DESC= 	FreeBSD Base System (Development Files)
 dma_COMMENT= 		DMA Mail Agent Utilities
 dma_DESC= 		DMA Mail Agent Utilities
 docs_COMMENT= 		Documentation
@@ -46,18 +42,21 @@ jail_COMMENT= 		Jail Utilities
 jail_DESC= 		Jail Utilities
 kernel_COMMENT= 	FreeBSD Kernel
 kernel_DESC= 		FreeBSD Kernel
-lib32_COMMENT= 		FreeBSD Base System (32-bit Libraries)
-lib32_DESC= 		FreeBSD Base System (32-bit Libraries)
 manuals_COMMENT= 	Manual Pages
 manuals_DESC= 		Manual Pages
-profile_COMMENT= 	FreeBSD Base System (Profiling Libraries)
-profile_DESC= 		FreeBSD Base System (Profiling Libraries)
 rcmds_COMMENT= 		Remote Command Utilities
 rcmds_DESC= 		Remote Command Utilities
 rescue_COMMENT= 	Rescue Utilities
 rescue_DESC= 		Rescue Utilities
 runtime_COMMENT= 	FreeBSD Base System
 runtime_DESC= 		FreeBSD Base System
+runtime-debug_DESCR= 	Debugging Symbols
+runtime-development_DESCR=Development Files
+runtime-profile_DESCR= 	Profiling Libraries
+runtime-lib32_DESCR= 	32-bit Libraries
+runtime-lib32-debug_DESCR=32-bit Debugging Symbols
+runtime-lib32-development_DESCR=32-bit Development Files
+runtime-lib32-profile_DESCR=32-bit Profiling Libraries
 sendmail_COMMENT= 	Sendmail Utilities
 sendmail_DESC= 		Sendmail Utilities
 ssh_COMMENT= 		Secure Shell Utilities
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index c395ffdeaa21..9a963f00125b 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -34,6 +34,20 @@ main() {
 	outname="$(echo ${outname} | tr '-' '_')"
 
 	case "${outname}" in
+		runtime)
+			outname="runtime"
+			uclfile="${uclfile}"
+			;;
+		runtime_manuals)
+			outname="${origname}"
+			pkgdeps="runtime"
+			;;
+		runtime_*)
+			outname="${origname}"
+			uclfile="${outname##*}${uclfile}"
+			pkgdeps="runtime"
+			_descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)"
+			;;
 		*_lib32_development)
 			outname="${outname%%_lib32_development}"
 			_descr="32-bit Libraries, Development Files"
@@ -69,20 +83,9 @@ main() {
 			_descr="Debugging Symbols"
 			pkgdeps="${outname}"
 			;;
-		*_manuals)
-			outname="${origname}"
-			pkgdeps="runtime"
-			;;
-		runtime)
-			outname="runtime"
-			uclfile="${uclfile}"
-			;;
 		${origname})
 			pkgdeps="runtime"
 			;;
-		debug|development|lib32|profile)
-			uclfile="${outname##*}${uclfile}"
-			;;
 		*)
 			uclfile="${outname##*}${origname}"
 			outname="${outname##*}${origname}"
diff --git a/release/packages/debug.ucl b/release/packages/runtime-debug.ucl
similarity index 100%
rename from release/packages/debug.ucl
rename to release/packages/runtime-debug.ucl
diff --git a/release/packages/development.ucl b/release/packages/runtime-development.ucl
similarity index 100%
rename from release/packages/development.ucl
rename to release/packages/runtime-development.ucl
diff --git a/release/packages/lib32.ucl b/release/packages/runtime-lib32.ucl
similarity index 100%
rename from release/packages/lib32.ucl
rename to release/packages/runtime-lib32.ucl
diff --git a/release/packages/profile.ucl b/release/packages/runtime-profile.ucl
similarity index 100%
rename from release/packages/profile.ucl
rename to release/packages/runtime-profile.ucl
diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
index 51dea0df8629..a499b94f5f3c 100644
--- a/release/scripts/mtree-to-plist.awk
+++ b/release/scripts/mtree-to-plist.awk
@@ -39,7 +39,7 @@
 				gsub(/package=/, "", pkgname)
 			} else if (a[i] == "config") {
 				type="config"
-			} else if (a[i] == "development" || a[i] == "profile" || a[i] == "debug") {
+			} else if (a[i] == "development" || a[i] == "profile" || a[i] == "debug" || a[i] == "docs") {
 				pkgend=a[i]
 			} else {
 				if (ext != "")
@@ -49,14 +49,10 @@
 			}
 		}
 		if (ext != "") {
-			if (pkgname == "runtime") {
-				pkgname=ext
-			} else {
-				pkgname=pkgname"-"ext
-			}
+			pkgname=pkgname"-"ext
 		}
 		if (pkgend != "") {
-			if (pkgname == "runtime") {
+			if (pkgend == "docs") {
 				pkgname=pkgend
 			} else {
 				pkgname=pkgname"-"pkgend