diff --git a/release/packages/sets/base-jail.ucl b/release/packages/sets/base-jail.ucl
--- a/release/packages/sets/base-jail.ucl
+++ b/release/packages/sets/base-jail.ucl
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-comment = "Base jail system (metapackage)"
+comment = "Base system for jails (metapackage)"
 
 vital = true
 
@@ -30,6 +30,10 @@
 		version = "${VERSION}"
 		origin = "base"
 	},
+	"set-optional-jail" {
+		version = "${VERSION}"
+		origin = "base"
+	},
 	"set-devel" {
 		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
@@ -21,7 +21,11 @@
 vital = true
 
 desc = <<EOD
-This metapackage installs all packages which are part of the base system.
+This metapackage installs all packages which are part of the base system,
+excluding 32-bit compatibility libraries, tests, debugging symbols, and
+source code.
+
+This is equivalent to installing the legacy "base.txz" distribution set.
 EOD
 
 deps {
@@ -29,6 +33,10 @@
 		version = "${VERSION}"
 		origin = "base"
 	},
+	"set-optional" {
+		version = "${VERSION}"
+		origin = "base"
+	},
 	"set-devel" {
 		version = "${VERSION}"
 		origin = "base"
diff --git a/release/packages/sets/base.ucl b/release/packages/sets/optional-dbg.ucl
copy from release/packages/sets/base.ucl
copy to release/packages/sets/optional-dbg.ucl
--- a/release/packages/sets/base.ucl
+++ b/release/packages/sets/optional-dbg.ucl
@@ -16,21 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-comment = "Base system (metapackage)"
-
-vital = true
+comment = "Optional software debug symbols (metapackage)"
 
 desc = <<EOD
-This metapackage installs all packages which are part of the base system.
+This metapackage installs debugging symbols for optional software
+which is not part of the minimal set.
 EOD
 
 deps {
-	"set-minimal" {
+	"set-minimal-dbg" {
 		version = "${VERSION}"
 		origin = "base"
 	},
-	"set-devel" {
-		version = "${VERSION}"
-		origin = "base"
-	}
 }
diff --git a/release/packages/sets/base.ucl b/release/packages/sets/optional-jail-dbg.ucl
copy from release/packages/sets/base.ucl
copy to release/packages/sets/optional-jail-dbg.ucl
--- a/release/packages/sets/base.ucl
+++ b/release/packages/sets/optional-jail-dbg.ucl
@@ -16,21 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-comment = "Base system (metapackage)"
-
-vital = true
+comment = "Optional software debug symbols for jails (metapackage)"
 
 desc = <<EOD
-This metapackage installs all packages which are part of the base system.
+This metapackage installs debugging symbols for optional software
+which is not part of the minimal set.
 EOD
 
 deps {
-	"set-minimal" {
+	"set-minimal-jail-dbg" {
 		version = "${VERSION}"
 		origin = "base"
 	},
-	"set-devel" {
-		version = "${VERSION}"
-		origin = "base"
-	}
 }
diff --git a/release/packages/sets/base-jail.ucl b/release/packages/sets/optional-jail.ucl
copy from release/packages/sets/base-jail.ucl
copy to release/packages/sets/optional-jail.ucl
--- a/release/packages/sets/base-jail.ucl
+++ b/release/packages/sets/optional-jail.ucl
@@ -16,13 +16,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-comment = "Base jail system (metapackage)"
+comment = "Optional base system software for jails (metapackage)"
 
 vital = true
 
 desc = <<EOD
-This metapackage installs the complete base system, excluding packages which
-are not generally useful in a jail(8) environment.
+This metapackage installs all optional software which is part of the
+base system but not installed by the minimal set, other than compilers
+and software which is not generally useful in a jail(8) environment.
 EOD
 
 deps {
@@ -30,8 +31,4 @@
 		version = "${VERSION}"
 		origin = "base"
 	},
-	"set-devel" {
-		version = "${VERSION}"
-		origin = "base"
-	}
 }
diff --git a/release/packages/sets/base.ucl b/release/packages/sets/optional.ucl
copy from release/packages/sets/base.ucl
copy to release/packages/sets/optional.ucl
--- a/release/packages/sets/base.ucl
+++ b/release/packages/sets/optional.ucl
@@ -16,12 +16,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-comment = "Base system (metapackage)"
+comment = "Optional base system software (metapackage)"
 
 vital = true
 
 desc = <<EOD
-This metapackage installs all packages which are part of the base system.
+This metapackage installs all optional software, other than compilers,
+which is part of the base system but not installed by the minimal set.
 EOD
 
 deps {
@@ -29,8 +30,4 @@
 		version = "${VERSION}"
 		origin = "base"
 	},
-	"set-devel" {
-		version = "${VERSION}"
-		origin = "base"
-	}
 }
diff --git a/release/packages/ucl/acct-all.ucl b/release/packages/ucl/acct-all.ucl
--- a/release/packages/ucl/acct-all.ucl
+++ b/release/packages/ucl/acct-all.ucl
@@ -31,5 +31,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/acpi-all.ucl b/release/packages/ucl/acpi-all.ucl
--- a/release/packages/ucl/acpi-all.ucl
+++ b/release/packages/ucl/acpi-all.ucl
@@ -34,3 +34,7 @@
 * acpidump(8) dumps the system's raw ACPI data.
 * iasl(8) is the Intel ACPI compiler/decompiler
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/apm-all.ucl b/release/packages/ucl/apm-all.ucl
--- a/release/packages/ucl/apm-all.ucl
+++ b/release/packages/ucl/apm-all.ucl
@@ -27,3 +27,7 @@
 state and change the system power mode, and the /etc/rc.d/apm service which
 can enable and disable APM at system startup and shutdown.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/atf-all.ucl b/release/packages/ucl/atf-all.ucl
--- a/release/packages/ucl/atf-all.ucl
+++ b/release/packages/ucl/atf-all.ucl
@@ -35,5 +35,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/audit-all.ucl b/release/packages/ucl/audit-all.ucl
--- a/release/packages/ucl/audit-all.ucl
+++ b/release/packages/ucl/audit-all.ucl
@@ -44,5 +44,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/autofs-all.ucl b/release/packages/ucl/autofs-all.ucl
--- a/release/packages/ucl/autofs-all.ucl
+++ b/release/packages/ucl/autofs-all.ucl
@@ -29,5 +29,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/bhyve-all.ucl b/release/packages/ucl/bhyve-all.ucl
--- a/release/packages/ucl/bhyve-all.ucl
+++ b/release/packages/ucl/bhyve-all.ucl
@@ -42,5 +42,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/blocklist-all.ucl b/release/packages/ucl/blocklist-all.ucl
--- a/release/packages/ucl/blocklist-all.ucl
+++ b/release/packages/ucl/blocklist-all.ucl
@@ -28,5 +28,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/bluetooth-all.ucl b/release/packages/ucl/bluetooth-all.ucl
--- a/release/packages/ucl/bluetooth-all.ucl
+++ b/release/packages/ucl/bluetooth-all.ucl
@@ -24,3 +24,7 @@
 the Bluetooth stack when Bluetooth devices are attached or removed, and
 the rfcomm_pppd(8) daemon which manages PPP connections over Bluetooth.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/bsdconfig-all.ucl b/release/packages/ucl/bsdconfig-all.ucl
--- a/release/packages/ucl/bsdconfig-all.ucl
+++ b/release/packages/ucl/bsdconfig-all.ucl
@@ -27,5 +27,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/bsdinstall-all.ucl b/release/packages/ucl/bsdinstall-all.ucl
--- a/release/packages/ucl/bsdinstall-all.ucl
+++ b/release/packages/ucl/bsdinstall-all.ucl
@@ -37,5 +37,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/bsnmp-all.ucl b/release/packages/ucl/bsnmp-all.ucl
--- a/release/packages/ucl/bsnmp-all.ucl
+++ b/release/packages/ucl/bsnmp-all.ucl
@@ -42,5 +42,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/ccdconfig-all.ucl b/release/packages/ucl/ccdconfig-all.ucl
--- a/release/packages/ucl/ccdconfig-all.ucl
+++ b/release/packages/ucl/ccdconfig-all.ucl
@@ -22,3 +22,7 @@
 ccdconfig(8) is used to configure the concatenated disk driver, ccd(4).
 ccdconfig(8) may also be started on boot using the "ccd" rc(8) service.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/console-tools-all.ucl b/release/packages/ucl/console-tools-all.ucl
--- a/release/packages/ucl/console-tools-all.ucl
+++ b/release/packages/ucl/console-tools-all.ucl
@@ -29,3 +29,7 @@
 * moused(8) can be used to interface with a mouse and provide a graphical
   mouse cursor on the video console.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/csh-all.ucl b/release/packages/ucl/csh-all.ucl
--- a/release/packages/ucl/csh-all.ucl
+++ b/release/packages/ucl/csh-all.ucl
@@ -40,5 +40,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/ctl-all.ucl b/release/packages/ucl/ctl-all.ucl
--- a/release/packages/ucl/ctl-all.ucl
+++ b/release/packages/ucl/ctl-all.ucl
@@ -39,3 +39,7 @@
 performing authentication and passing connections to the kernel part of the
 native iSCSI target.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/cxgbe-tools-all.ucl b/release/packages/ucl/cxgbe-tools-all.ucl
--- a/release/packages/ucl/cxgbe-tools-all.ucl
+++ b/release/packages/ucl/cxgbe-tools-all.ucl
@@ -25,3 +25,7 @@
 as the hardware packet filter, Quality-of-Service (QoS) scheduler, and
 TCP offload engine.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/dma-all.ucl b/release/packages/ucl/dma-all.ucl
--- a/release/packages/ucl/dma-all.ucl
+++ b/release/packages/ucl/dma-all.ucl
@@ -48,5 +48,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/dtrace-all.ucl b/release/packages/ucl/dtrace-all.ucl
--- a/release/packages/ucl/dtrace-all.ucl
+++ b/release/packages/ucl/dtrace-all.ucl
@@ -27,3 +27,7 @@
 in the D language, the utilities lockstat(1) and plockstat(1), and several
 example D scripts installed in /usr/share/dtrace.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/dwatch-all.ucl b/release/packages/ucl/dwatch-all.ucl
--- a/release/packages/ucl/dwatch-all.ucl
+++ b/release/packages/ucl/dwatch-all.ucl
@@ -35,3 +35,7 @@
 [optionally] probe-specific data.  dwatch also includes a set of pre-defined
 profiles for tracing common system operations.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/ee-all.ucl b/release/packages/ucl/ee-all.ucl
--- a/release/packages/ucl/ee-all.ucl
+++ b/release/packages/ucl/ee-all.ucl
@@ -25,5 +25,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/examples-all.ucl b/release/packages/ucl/examples-all.ucl
--- a/release/packages/ucl/examples-all.ucl
+++ b/release/packages/ucl/examples-all.ucl
@@ -26,5 +26,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/fd-all.ucl b/release/packages/ucl/fd-all.ucl
--- a/release/packages/ucl/fd-all.ucl
+++ b/release/packages/ucl/fd-all.ucl
@@ -26,3 +26,7 @@
 * fdformat(8) is used to format disks.
 * fdread(1) and fdwrite(1) read and write data to or from floppy disks.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/ftp-all.ucl b/release/packages/ucl/ftp-all.ucl
--- a/release/packages/ucl/ftp-all.ucl
+++ b/release/packages/ucl/ftp-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/games-all.ucl b/release/packages/ucl/games-all.ucl
--- a/release/packages/ucl/games-all.ucl
+++ b/release/packages/ucl/games-all.ucl
@@ -28,5 +28,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/ggate-all.ucl b/release/packages/ucl/ggate-all.ucl
--- a/release/packages/ucl/ggate-all.ucl
+++ b/release/packages/ucl/ggate-all.ucl
@@ -30,3 +30,7 @@
 This package provides the ggated(8) server used to export devices, and
 the ggatec(8) client used to access them.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/gssd-all.ucl b/release/packages/ucl/gssd-all.ucl
--- a/release/packages/ucl/gssd-all.ucl
+++ b/release/packages/ucl/gssd-all.ucl
@@ -30,5 +30,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/hast-all.ucl b/release/packages/ucl/hast-all.ucl
--- a/release/packages/ucl/hast-all.ucl
+++ b/release/packages/ucl/hast-all.ucl
@@ -23,3 +23,7 @@
 storage devices between two machines on a network.  HAST can be used by itself
 or as part of an HA cluster to provide redundant cluster storage.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/hostapd-all.ucl b/release/packages/ucl/hostapd-all.ucl
--- a/release/packages/ucl/hostapd-all.ucl
+++ b/release/packages/ucl/hostapd-all.ucl
@@ -24,3 +24,7 @@
 mode.  hostapd can authenticate clients itself via 802.11i (WPA), or via
 802.1X (EAP) using an external RADIUS server.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/inetd-all.ucl b/release/packages/ucl/inetd-all.ucl
--- a/release/packages/ucl/inetd-all.ucl
+++ b/release/packages/ucl/inetd-all.ucl
@@ -25,5 +25,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/ipf-all.ucl b/release/packages/ucl/ipf-all.ucl
--- a/release/packages/ucl/ipf-all.ucl
+++ b/release/packages/ucl/ipf-all.ucl
@@ -27,5 +27,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/ipfw-all.ucl b/release/packages/ucl/ipfw-all.ucl
--- a/release/packages/ucl/ipfw-all.ucl
+++ b/release/packages/ucl/ipfw-all.ucl
@@ -30,5 +30,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/iscsi-all.ucl b/release/packages/ucl/iscsi-all.ucl
--- a/release/packages/ucl/iscsi-all.ucl
+++ b/release/packages/ucl/iscsi-all.ucl
@@ -24,3 +24,7 @@
 initiator, the iscsictl(8) utility used to monitor and configure the initiator,
 and rc(8) services to configure the initiator during system startup.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/jail-all.ucl b/release/packages/ucl/jail-all.ucl
--- a/release/packages/ucl/jail-all.ucl
+++ b/release/packages/ucl/jail-all.ucl
@@ -32,5 +32,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/kerberos-all.ucl b/release/packages/ucl/kerberos-all.ucl
--- a/release/packages/ucl/kerberos-all.ucl
+++ b/release/packages/ucl/kerberos-all.ucl
@@ -34,5 +34,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/kerberos-kdc-all.ucl b/release/packages/ucl/kerberos-kdc-all.ucl
--- a/release/packages/ucl/kerberos-kdc-all.ucl
+++ b/release/packages/ucl/kerberos-kdc-all.ucl
@@ -29,5 +29,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/kyua-all.ucl b/release/packages/ucl/kyua-all.ucl
--- a/release/packages/ucl/kyua-all.ucl
+++ b/release/packages/ucl/kyua-all.ucl
@@ -54,5 +54,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "devel"
 }
diff --git a/release/packages/ucl/lib9p-all.ucl b/release/packages/ucl/lib9p-all.ucl
--- a/release/packages/ucl/lib9p-all.ucl
+++ b/release/packages/ucl/lib9p-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libarchive-all.ucl b/release/packages/ucl/libarchive-all.ucl
--- a/release/packages/ucl/libarchive-all.ucl
+++ b/release/packages/ucl/libarchive-all.ucl
@@ -34,5 +34,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libbegemot-all.ucl b/release/packages/ucl/libbegemot-all.ucl
--- a/release/packages/ucl/libbegemot-all.ucl
+++ b/release/packages/ucl/libbegemot-all.ucl
@@ -46,5 +46,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libblocksruntime-all.ucl b/release/packages/ucl/libblocksruntime-all.ucl
--- a/release/packages/ucl/libblocksruntime-all.ucl
+++ b/release/packages/ucl/libblocksruntime-all.ucl
@@ -25,5 +25,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libbsdstat-all.ucl b/release/packages/ucl/libbsdstat-all.ucl
--- a/release/packages/ucl/libbsdstat-all.ucl
+++ b/release/packages/ucl/libbsdstat-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libbsm-all.ucl b/release/packages/ucl/libbsm-all.ucl
--- a/release/packages/ucl/libbsm-all.ucl
+++ b/release/packages/ucl/libbsm-all.ucl
@@ -36,5 +36,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libcasper-all.ucl b/release/packages/ucl/libcasper-all.ucl
--- a/release/packages/ucl/libcasper-all.ucl
+++ b/release/packages/ucl/libcasper-all.ucl
@@ -26,5 +26,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libcompat-all.ucl b/release/packages/ucl/libcompat-all.ucl
--- a/release/packages/ucl/libcompat-all.ucl
+++ b/release/packages/ucl/libcompat-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libcompiler_rt-all.ucl b/release/packages/ucl/libcompiler_rt-all.ucl
--- a/release/packages/ucl/libcompiler_rt-all.ucl
+++ b/release/packages/ucl/libcompiler_rt-all.ucl
@@ -4,5 +4,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libcuse-all.ucl b/release/packages/ucl/libcuse-all.ucl
--- a/release/packages/ucl/libcuse-all.ucl
+++ b/release/packages/ucl/libcuse-all.ucl
@@ -35,5 +35,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libdwarf-all.ucl b/release/packages/ucl/libdwarf-all.ucl
--- a/release/packages/ucl/libdwarf-all.ucl
+++ b/release/packages/ucl/libdwarf-all.ucl
@@ -34,5 +34,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libevent1-all.ucl b/release/packages/ucl/libevent1-all.ucl
--- a/release/packages/ucl/libevent1-all.ucl
+++ b/release/packages/ucl/libevent1-all.ucl
@@ -23,5 +23,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libexecinfo-all.ucl b/release/packages/ucl/libexecinfo-all.ucl
--- a/release/packages/ucl/libexecinfo-all.ucl
+++ b/release/packages/ucl/libexecinfo-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libipt-all.ucl b/release/packages/ucl/libipt-all.ucl
--- a/release/packages/ucl/libipt-all.ucl
+++ b/release/packages/ucl/libipt-all.ucl
@@ -6,5 +6,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libldns-all.ucl b/release/packages/ucl/libldns-all.ucl
--- a/release/packages/ucl/libldns-all.ucl
+++ b/release/packages/ucl/libldns-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/liblzma-all.ucl b/release/packages/ucl/liblzma-all.ucl
--- a/release/packages/ucl/liblzma-all.ucl
+++ b/release/packages/ucl/liblzma-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libmagic-all.ucl b/release/packages/ucl/libmagic-all.ucl
--- a/release/packages/ucl/libmagic-all.ucl
+++ b/release/packages/ucl/libmagic-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libmilter-all.ucl b/release/packages/ucl/libmilter-all.ucl
--- a/release/packages/ucl/libmilter-all.ucl
+++ b/release/packages/ucl/libmilter-all.ucl
@@ -7,5 +7,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libpathconv-all.ucl b/release/packages/ucl/libpathconv-all.ucl
--- a/release/packages/ucl/libpathconv-all.ucl
+++ b/release/packages/ucl/libpathconv-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/librpcsec_gss-all.ucl b/release/packages/ucl/librpcsec_gss-all.ucl
--- a/release/packages/ucl/librpcsec_gss-all.ucl
+++ b/release/packages/ucl/librpcsec_gss-all.ucl
@@ -43,5 +43,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/librss-all.ucl b/release/packages/ucl/librss-all.ucl
--- a/release/packages/ucl/librss-all.ucl
+++ b/release/packages/ucl/librss-all.ucl
@@ -6,5 +6,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libsdp-all.ucl b/release/packages/ucl/libsdp-all.ucl
--- a/release/packages/ucl/libsdp-all.ucl
+++ b/release/packages/ucl/libsdp-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libsqlite3-all.ucl b/release/packages/ucl/libsqlite3-all.ucl
--- a/release/packages/ucl/libsqlite3-all.ucl
+++ b/release/packages/ucl/libsqlite3-all.ucl
@@ -23,5 +23,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libstdbuf-all.ucl b/release/packages/ucl/libstdbuf-all.ucl
--- a/release/packages/ucl/libstdbuf-all.ucl
+++ b/release/packages/ucl/libstdbuf-all.ucl
@@ -35,5 +35,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libstdthreads-all.ucl b/release/packages/ucl/libstdthreads-all.ucl
--- a/release/packages/ucl/libstdthreads-all.ucl
+++ b/release/packages/ucl/libstdthreads-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libthread_db-all.ucl b/release/packages/ucl/libthread_db-all.ucl
--- a/release/packages/ucl/libthread_db-all.ucl
+++ b/release/packages/ucl/libthread_db-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libucl-all.ucl b/release/packages/ucl/libucl-all.ucl
--- a/release/packages/ucl/libucl-all.ucl
+++ b/release/packages/ucl/libucl-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libvgl-all.ucl b/release/packages/ucl/libvgl-all.ucl
--- a/release/packages/ucl/libvgl-all.ucl
+++ b/release/packages/ucl/libvgl-all.ucl
@@ -47,5 +47,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libvmmapi-all.ucl b/release/packages/ucl/libvmmapi-all.ucl
--- a/release/packages/ucl/libvmmapi-all.ucl
+++ b/release/packages/ucl/libvmmapi-all.ucl
@@ -23,5 +23,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/liby-all.ucl b/release/packages/ucl/liby-all.ucl
--- a/release/packages/ucl/liby-all.ucl
+++ b/release/packages/ucl/liby-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/libyaml-all.ucl b/release/packages/ucl/libyaml-all.ucl
--- a/release/packages/ucl/libyaml-all.ucl
+++ b/release/packages/ucl/libyaml-all.ucl
@@ -24,5 +24,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/lp-all.ucl b/release/packages/ucl/lp-all.ucl
--- a/release/packages/ucl/lp-all.ucl
+++ b/release/packages/ucl/lp-all.ucl
@@ -29,5 +29,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/mlx-tools-all.ucl b/release/packages/ucl/mlx-tools-all.ucl
--- a/release/packages/ucl/mlx-tools-all.ucl
+++ b/release/packages/ucl/mlx-tools-all.ucl
@@ -33,3 +33,7 @@
 6 network adapters in the aspects not covered by the generic ifconfig(8)
 command, mostly related to the PCIe attachment and internal card working.
 EOD
+
+annotations {
+	set = "optional"
+}
diff --git a/release/packages/ucl/natd-all.ucl b/release/packages/ucl/natd-all.ucl
--- a/release/packages/ucl/natd-all.ucl
+++ b/release/packages/ucl/natd-all.ucl
@@ -28,5 +28,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/netmap-all.ucl b/release/packages/ucl/netmap-all.ucl
--- a/release/packages/ucl/netmap-all.ucl
+++ b/release/packages/ucl/netmap-all.ucl
@@ -29,5 +29,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/nfs-all.ucl b/release/packages/ucl/nfs-all.ucl
--- a/release/packages/ucl/nfs-all.ucl
+++ b/release/packages/ucl/nfs-all.ucl
@@ -34,5 +34,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/ntp-all.ucl b/release/packages/ucl/ntp-all.ucl
--- a/release/packages/ucl/ntp-all.ucl
+++ b/release/packages/ucl/ntp-all.ucl
@@ -39,5 +39,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/nvme-tools-all.ucl b/release/packages/ucl/nvme-tools-all.ucl
--- a/release/packages/ucl/nvme-tools-all.ucl
+++ b/release/packages/ucl/nvme-tools-all.ucl
@@ -23,3 +23,7 @@
 and configure NVMe devices connected to the local system, and to discover
 and connect to remote NVMe over Fabrics (NVMe-oF) targets.
 EOD
+
+annotations {
+	set = optional
+}
diff --git a/release/packages/ucl/openssl-all.ucl b/release/packages/ucl/openssl-all.ucl
--- a/release/packages/ucl/openssl-all.ucl
+++ b/release/packages/ucl/openssl-all.ucl
@@ -37,5 +37,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/pf-all.ucl b/release/packages/ucl/pf-all.ucl
--- a/release/packages/ucl/pf-all.ucl
+++ b/release/packages/ucl/pf-all.ucl
@@ -34,5 +34,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/pmc-all.ucl b/release/packages/ucl/pmc-all.ucl
--- a/release/packages/ucl/pmc-all.ucl
+++ b/release/packages/ucl/pmc-all.ucl
@@ -12,5 +12,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/quotacheck-all.ucl b/release/packages/ucl/quotacheck-all.ucl
--- a/release/packages/ucl/quotacheck-all.ucl
+++ b/release/packages/ucl/quotacheck-all.ucl
@@ -43,5 +43,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/rcmds-all.ucl b/release/packages/ucl/rcmds-all.ucl
--- a/release/packages/ucl/rcmds-all.ucl
+++ b/release/packages/ucl/rcmds-all.ucl
@@ -26,5 +26,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/rdma-all.ucl b/release/packages/ucl/rdma-all.ucl
--- a/release/packages/ucl/rdma-all.ucl
+++ b/release/packages/ucl/rdma-all.ucl
@@ -25,5 +25,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/rip-all.ucl b/release/packages/ucl/rip-all.ucl
--- a/release/packages/ucl/rip-all.ucl
+++ b/release/packages/ucl/rip-all.ucl
@@ -27,5 +27,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/sendmail-all.ucl b/release/packages/ucl/sendmail-all.ucl
--- a/release/packages/ucl/sendmail-all.ucl
+++ b/release/packages/ucl/sendmail-all.ucl
@@ -34,5 +34,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/smbutils-all.ucl b/release/packages/ucl/smbutils-all.ucl
--- a/release/packages/ucl/smbutils-all.ucl
+++ b/release/packages/ucl/smbutils-all.ucl
@@ -26,3 +26,7 @@
 This facility only supports SMB version 1, which is strongly deprecated
 and not supported by most SMB servers.
 EOD
+
+annotations {
+	set = optional
+}
diff --git a/release/packages/ucl/ssh-all.ucl b/release/packages/ucl/ssh-all.ucl
--- a/release/packages/ucl/ssh-all.ucl
+++ b/release/packages/ucl/ssh-all.ucl
@@ -37,5 +37,5 @@
 licenses = [ ISCL ]
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/syscons-data-all.ucl b/release/packages/ucl/syscons-data-all.ucl
--- a/release/packages/ucl/syscons-data-all.ucl
+++ b/release/packages/ucl/syscons-data-all.ucl
@@ -21,3 +21,7 @@
 desc = <<EOD
 Fonts and keymaps for use with the legacy syscons(4) video console driver.
 EOD
+
+annotations {
+	set = optional
+}
diff --git a/release/packages/ucl/tcpd-all.ucl b/release/packages/ucl/tcpd-all.ucl
--- a/release/packages/ucl/tcpd-all.ucl
+++ b/release/packages/ucl/tcpd-all.ucl
@@ -33,5 +33,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/telnet-all.ucl b/release/packages/ucl/telnet-all.ucl
--- a/release/packages/ucl/telnet-all.ucl
+++ b/release/packages/ucl/telnet-all.ucl
@@ -29,5 +29,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/unbound-all.ucl b/release/packages/ucl/unbound-all.ucl
--- a/release/packages/ucl/unbound-all.ucl
+++ b/release/packages/ucl/unbound-all.ucl
@@ -31,5 +31,5 @@
 licenses = [ BSD4CLAUSE ]
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
diff --git a/release/packages/ucl/yp-all.ucl b/release/packages/ucl/yp-all.ucl
--- a/release/packages/ucl/yp-all.ucl
+++ b/release/packages/ucl/yp-all.ucl
@@ -26,5 +26,5 @@
 EOD
 
 annotations {
-	set = "base,base-jail"
+	set = "optional,optional-jail"
 }
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,8 @@
 	local descriptions = {
 		["kernel-dbg"] = "Debug symbols for the kernel",
 		["devel"] = "C/C++ compilers and related utilities",
-		["base"] = "The complete base system (includes devel)",
+		["optional"] = "Optional software (excluding compilers)",
+		["base"] = "The complete base system (includes devel and optional)",
 		["src"] = "System source tree",
 		["tests"] = "Test suite",
 		["lib32"] = "32-bit compatibility libraries",