diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua
index 80d215d0e82..5e65f0f998c 100755
--- a/release/scripts/pkgbase-stage.lua
+++ b/release/scripts/pkgbase-stage.lua
@@ -46,7 +46,6 @@ local function select_packages(pkg, media, all_libcompats)
 	end
 	assert(components["kernel"])
 	assert(components["base"])
-	assert(components["base-jail"])
 	assert(components["pkg"])
 
 	local selected = {}
@@ -65,8 +64,9 @@ local function select_packages(pkg, media, all_libcompats)
 		assert(media == "dvd")
 		table.insert(selected, components["pkg"])
 		table.insert(selected, components["base"])
-		table.insert(selected, components["base-jail"])
 		table.insert(selected, components["base-dbg"])
+		table.insert(selected, components["base-jail"])
+		table.insert(selected, components["base-jail-dbg"])
 		table.insert(selected, components["kernel"])
 		table.insert(selected, components["kernel-dbg"])
 		table.insert(selected, components["src"])