diff --git a/release/packages/sets/base-dbg.ucl b/release/packages/sets/base-dbg.ucl
--- a/release/packages/sets/base-dbg.ucl
+++ b/release/packages/sets/base-dbg.ucl
@@ -9,8 +9,4 @@
 		version = "${VERSION}"
 		origin = "base"
 	},
-	"set-devel-dbg" {
-		version = "${VERSION}"
-		origin = "base"
-	}
 }
diff --git a/release/packages/sets/base.ucl b/release/packages/sets/base.ucl
--- a/release/packages/sets/base.ucl
+++ b/release/packages/sets/base.ucl
@@ -11,8 +11,4 @@
 		version = "${VERSION}"
 		origin = "base"
 	},
-	"set-devel" {
-		version = "${VERSION}"
-		origin = "base"
-	}
 }
diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua
--- a/release/scripts/pkgbase-stage.lua
+++ b/release/scripts/pkgbase-stage.lua
@@ -41,6 +41,7 @@
 	local selected = {}
 	if media == "disc" then
 		table.insert(selected, components["base"])
+		table.insert(selected, components["devel"])
 		table.insert(selected, components["kernel"])
 		table.insert(selected, components["kernel-dbg"])
 		table.insert(selected, components["src"])
@@ -52,6 +53,8 @@
 		assert(media == "dvd")
 		table.insert(selected, components["base"])
 		table.insert(selected, components["base-dbg"])
+		table.insert(selected, components["devel"])
+		table.insert(selected, components["devel-dbg"])
 		table.insert(selected, components["kernel"])
 		table.insert(selected, components["kernel-dbg"])
 		table.insert(selected, components["src"])
diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in
--- a/usr.sbin/bsdinstall/scripts/pkgbase.in
+++ b/usr.sbin/bsdinstall/scripts/pkgbase.in
@@ -79,7 +79,7 @@
 	local descriptions = {
 		["kernel-dbg"] = "Debug symbols for the kernel",
 		["devel"] = "C/C++ compilers and related utilities",
-		["base"] = "The complete base system (includes devel)",
+		["base"] = "The complete runtime base system",
 		["src"] = "System source tree",
 		["tests"] = "Test suite",
 		["lib32"] = "32-bit compatibility libraries",