diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
index a9f1e194389a..38c9963680ee 100644
--- a/release/scripts/mtree-to-plist.awk
+++ b/release/scripts/mtree-to-plist.awk
@@ -1,90 +1,84 @@
 #!/usr/bin/awk
 /^[^#]/ {
 	gsub(/^\./,"", $1)
 	uname = gname = mode = flags = tags = type = ""
 	for (i=2; i<=NF; i++) {
 		if ($i ~ /^uname=/) {
 			uname=$i
 			gsub(/uname=/, "", uname)
 		} else if ($i ~ /^gname=/) {
 			gname=$i
 			gsub(/gname=/, "", gname)
 		} else if ($i ~ /^mode=/) {
 			mode=$i
 			gsub(/mode=/,"", mode)
 		} else if ($i ~ /^flags=/) {
 			flags=$i
 			gsub(/flags=/, "", flags)
 		} else if ($i ~ /^tags=/) {
 			tags=$i
 			gsub(/tags=/, "", tags)
 		} else if ($i ~ /^type=dir/) {
 			type="dir"
 		}
 	}
 	if (kernel != "") {
 		if ($1 ~ /^\/boot\/dtb\//) {
 			tags="package=dtb"
 		} else {
 			tags="package=kernel"
 			if (_kernconf != "") {
 				tags=tags""_kernconf
 			}
 		}
 	}
 	if (length(tags) == 0)
 		next
 	if (tags ~ /package=/) {
 		ext = pkgname = pkgend = ""
 		split(tags, a, ",");
 		for (i in a) {
 			if (a[i] ~ /^package=/) {
 				pkgname=a[i]
-				if ($1 ~ /^\/boot\//) {
-					if (kernel != "" && $1 ~ /^\/boot\/dtb\//)
-						pkgname="dtb"
-					else if ($1 !~ /^\/boot\/firmware\//)
-						pkgname="bootloader"
-				}
 				gsub(/package=/, "", pkgname)
 			} else if (a[i] == "config") {
 				type="config"
 			} else if (a[i] == "development" || a[i] == "debug" || a[i] == "docs") {
 				pkgend=a[i]
 			} else {
 				if (ext != "")
 					ext=ext"-"a[i]
 				else
 					ext=a[i]
 			}
 		}
 		if (ext != "") {
 			pkgname=pkgname"-"ext
 		}
 		if (pkgend != "") {
 			if (pkgend == "docs") {
 				pkgname=pkgend
 			} else {
 				pkgname=pkgname"-"pkgend
 			}
 		}
 	} else {
 		print "No packages specified in line: $0"
 		next
 	}
 	if (kernel != "" && pkgname != "dtb") {
 		output="kernel"
 		if (_kernconf != "") {
 			output=output"."_kernconf
 		}
 		if ($1 ~ /^\/usr\/lib\/debug\/boot/) {
 			output=output"-dbg.plist"
 		} else {
 			output=output".plist"
 		}
 	} else {
 		output=pkgname".plist"
 	}
 
 	print "@"type"("uname","gname","mode","flags") " $1 > output
 }
diff --git a/stand/Makefile.inc b/stand/Makefile.inc
index 5d55c4e4a16f..2866ebd20af3 100644
--- a/stand/Makefile.inc
+++ b/stand/Makefile.inc
@@ -1,6 +1,8 @@
 SUBDIR_PARALLEL=	yes
 
+PACKAGE=		bootloader
+
 # Firmware may not be able to handle branch protection failures
 MK_BRANCH_PROTECTION=	no
 
 .include "defs.mk"
diff --git a/stand/userboot/Makefile.inc b/stand/userboot/Makefile.inc
index 01b5f23410c8..392fd59a115f 100644
--- a/stand/userboot/Makefile.inc
+++ b/stand/userboot/Makefile.inc
@@ -1 +1,5 @@
 .include "../Makefile.inc"
+
+# userboot.so should be installed in the base bootloader package,
+# not bootloader-dev.
+NO_DEV_PACKAGE=
diff --git a/sys/conf/dtb.mk b/sys/conf/dtb.mk
index ec3df525d1e7..2050be7560a4 100644
--- a/sys/conf/dtb.mk
+++ b/sys/conf/dtb.mk
@@ -1,44 +1,46 @@
 #
 # The include file <dtb.mk> handles building and installing dtb files.
 #
 # +++ variables +++
 #
 # DTC		The Device Tree Compiler to use
 #
 # DTS		List of the dts files to build and install.
 #
 # DTSO		List of the dts overlay files to build and install.
 #
 # DTBDIR	Base path for dtb modules [/boot/dtb]
 #
 # DTBOWN	.dtb file owner. [${BINOWN}]
 #
 # DTBGRP	.dtb file group. [${BINGRP}]
 #
 # DTBMODE	Module file mode. [${BINMODE}]
 #
 # DESTDIR	The tree where the module gets installed. [not set]
 #
 # +++ targets +++
 #
 #	install:
 #               install the kernel module; if the Makefile
 #               does not itself define the target install, the targets
 #               beforeinstall and afterinstall may also be used to cause
 #               actions immediately before and after the install target
 #		is executed.
 #
 
 .include "dtb.build.mk"
 
+PACKAGE?=	dtb
+
 .if !target(install) && !target(realinstall)
 all: ${DTB} ${DTBO}
 realinstall: _dtbinstall
 .ORDER: beforeinstall _dtbinstall
 
 CLEANFILES+=${DTB} ${DTBO}
 .endif # !target(install) && !target(realinstall)
 
 .include <bsd.dep.mk>
 .include <bsd.obj.mk>
 .include <bsd.links.mk>