diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua
index f7ca0a486ee4..8bc614378d5b 100644
--- a/stand/lua/menu.lua
+++ b/stand/lua/menu.lua
@@ -1,548 +1,553 @@
 --
 -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 --
 -- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
 -- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
 -- modification, are permitted provided that the following conditions
 -- are met:
 -- 1. Redistributions of source code must retain the above copyright
 --    notice, this list of conditions and the following disclaimer.
 -- 2. Redistributions in binary form must reproduce the above copyright
 --    notice, this list of conditions and the following disclaimer in the
 --    documentation and/or other materials provided with the distribution.
 --
 -- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 -- ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 -- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 -- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 -- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 -- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 -- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 -- SUCH DAMAGE.
 --
 -- $FreeBSD$
 --
 
 local cli = require("cli")
 local core = require("core")
 local color = require("color")
 local config = require("config")
 local screen = require("screen")
 local drawer = require("drawer")
 
 local menu = {}
 
 local drawn_menu
 local return_menu_entry = {
 	entry_type = core.MENU_RETURN,
 	name = "Back to main menu" .. color.highlight(" [Backspace]"),
 }
 
 local function OnOff(str, value)
 	if value then
 		return str .. color.escapefg(color.GREEN) .. "On" ..
 		    color.resetfg()
 	else
 		return str .. color.escapefg(color.RED) .. "off" ..
 		    color.resetfg()
 	end
 end
 
 local function bootenvSet(env)
 	loader.setenv("vfs.root.mountfrom", env)
 	loader.setenv("currdev", env .. ":")
 	config.reload()
 end
 
 -- Module exports
 menu.handlers = {
 	-- Menu handlers take the current menu and selected entry as parameters,
 	-- and should return a boolean indicating whether execution should
 	-- continue or not. The return value may be omitted if this entry should
 	-- have no bearing on whether we continue or not, indicating that we
 	-- should just continue after execution.
 	[core.MENU_ENTRY] = function(_, entry)
 		-- run function
 		entry.func()
 	end,
 	[core.MENU_CAROUSEL_ENTRY] = function(_, entry)
 		-- carousel (rotating) functionality
 		local carid = entry.carousel_id
 		local caridx = config.getCarouselIndex(carid)
 		local choices = entry.items
 		if type(choices) == "function" then
 			choices = choices()
 		end
 		if #choices > 0 then
 			caridx = (caridx % #choices) + 1
 			config.setCarouselIndex(carid, caridx)
 			entry.func(caridx, choices[caridx], choices)
 		end
 	end,
 	[core.MENU_SUBMENU] = function(_, entry)
 		menu.process(entry.submenu)
 	end,
 	[core.MENU_RETURN] = function(_, entry)
 		-- allow entry to have a function/side effect
 		if entry.func ~= nil then
 			entry.func()
 		end
 		return false
 	end,
 }
 -- loader menu tree is rooted at menu.welcome
 
 menu.boot_environments = {
 	entries = {
 		-- return to welcome menu
 		return_menu_entry,
 		{
 			entry_type = core.MENU_CAROUSEL_ENTRY,
 			carousel_id = "be_active",
 			items = core.bootenvList,
 			name = function(idx, choice, all_choices)
 				if #all_choices == 0 then
 					return "Active: "
 				end
 
 				local is_default = (idx == 1)
 				local bootenv_name = ""
 				local name_color
 				if is_default then
 					name_color = color.escapefg(color.GREEN)
 				else
 					name_color = color.escapefg(color.BLUE)
 				end
 				bootenv_name = bootenv_name .. name_color ..
 				    choice .. color.resetfg()
 				return color.highlight("A").."ctive: " ..
 				    bootenv_name .. " (" .. idx .. " of " ..
 				    #all_choices .. ")"
 			end,
 			func = function(_, choice, _)
 				bootenvSet(choice)
 			end,
 			alias = {"a", "A"},
 		},
 		{
 			entry_type = core.MENU_ENTRY,
 			visible = function()
 				return core.isRewinded() == false
 			end,
 			name = function()
 				return color.highlight("b") .. "ootfs: " ..
 				    core.bootenvDefault()
 			end,
 			func = function()
 				-- Reset active boot environment to the default
 				config.setCarouselIndex("be_active", 1)
 				bootenvSet(core.bootenvDefault())
 			end,
 			alias = {"b", "B"},
 		},
 	},
 }
 
 menu.boot_options = {
 	entries = {
 		-- return to welcome menu
 		return_menu_entry,
 		-- load defaults
 		{
 			entry_type = core.MENU_ENTRY,
 			name = "Load System " .. color.highlight("D") ..
 			    "efaults",
 			func = core.setDefaults,
 			alias = {"d", "D"},
 		},
 		{
 			entry_type = core.MENU_SEPARATOR,
 		},
 		{
 			entry_type = core.MENU_SEPARATOR,
 			name = "Boot Options:",
 		},
 		-- acpi
 		{
 			entry_type = core.MENU_ENTRY,
 			visible = core.isSystem386,
 			name = function()
 				return OnOff(color.highlight("A") ..
 				    "CPI       :", core.acpi)
 			end,
 			func = core.setACPI,
 			alias = {"a", "A"},
 		},
 		-- safe mode
 		{
 			entry_type = core.MENU_ENTRY,
 			name = function()
 				return OnOff("Safe " .. color.highlight("M") ..
 				    "ode  :", core.sm)
 			end,
 			func = core.setSafeMode,
 			alias = {"m", "M"},
 		},
 		-- single user
 		{
 			entry_type = core.MENU_ENTRY,
 			name = function()
 				return OnOff(color.highlight("S") ..
 				    "ingle user:", core.su)
 			end,
 			func = core.setSingleUser,
 			alias = {"s", "S"},
 		},
 		-- verbose boot
 		{
 			entry_type = core.MENU_ENTRY,
 			name = function()
 				return OnOff(color.highlight("V") ..
 				    "erbose    :", core.verbose)
 			end,
 			func = core.setVerbose,
 			alias = {"v", "V"},
 		},
 	},
 }
 
 menu.welcome = {
 	entries = function()
 		local menu_entries = menu.welcome.all_entries
 		local multi_user = menu_entries.multi_user
 		local single_user = menu_entries.single_user
 		local boot_entry_1, boot_entry_2
 		if core.isSingleUserBoot() then
 			-- Swap the first two menu items on single user boot.
 			-- We'll cache the alternate entries for performance.
 			local alts = menu_entries.alts
 			if alts == nil then
 				single_user = core.deepCopyTable(single_user)
 				multi_user = core.deepCopyTable(multi_user)
 				single_user.name = single_user.alternate_name
 				multi_user.name = multi_user.alternate_name
 				menu_entries.alts = {
 					single_user = single_user,
 					multi_user = multi_user,
 				}
 			else
 				single_user = alts.single_user
 				multi_user = alts.multi_user
 			end
 			boot_entry_1, boot_entry_2 = single_user, multi_user
 		else
 			boot_entry_1, boot_entry_2 = multi_user, single_user
 		end
 		return {
 			boot_entry_1,
 			boot_entry_2,
 			menu_entries.prompt,
 			menu_entries.reboot,
 			menu_entries.console,
 			{
 				entry_type = core.MENU_SEPARATOR,
 			},
 			{
 				entry_type = core.MENU_SEPARATOR,
 				name = "Options:",
 			},
 			menu_entries.kernel_options,
 			menu_entries.boot_options,
 			menu_entries.zpool_checkpoints,
 			menu_entries.boot_envs,
 			menu_entries.chainload,
+			menu_entries.vendor,
 		}
 	end,
 	all_entries = {
 		multi_user = {
 			entry_type = core.MENU_ENTRY,
 			name = color.highlight("B") .. "oot Multi user " ..
 			    color.highlight("[Enter]"),
 			-- Not a standard menu entry function!
 			alternate_name = color.highlight("B") ..
 			    "oot Multi user",
 			func = function()
 				core.setSingleUser(false)
 				core.boot()
 			end,
 			alias = {"b", "B"},
 		},
 		single_user = {
 			entry_type = core.MENU_ENTRY,
 			name = "Boot " .. color.highlight("S") .. "ingle user",
 			-- Not a standard menu entry function!
 			alternate_name = "Boot " .. color.highlight("S") ..
 			    "ingle user " .. color.highlight("[Enter]"),
 			func = function()
 				core.setSingleUser(true)
 				core.boot()
 			end,
 			alias = {"s", "S"},
 		},
 		console = {
 			entry_type = core.MENU_ENTRY,
 			name = function()
 				return color.highlight("C") .. "ons: " .. core.getConsoleName()
 			end,
 			func = function()
 				core.nextConsoleChoice()
 			end,
 			alias = {"c", "C"},
 		},
 		prompt = {
 			entry_type = core.MENU_RETURN,
 			name = color.highlight("Esc") .. "ape to loader prompt",
 			func = function()
 				loader.setenv("autoboot_delay", "NO")
 			end,
 			alias = {core.KEYSTR_ESCAPE},
 		},
 		reboot = {
 			entry_type = core.MENU_ENTRY,
 			name = color.highlight("R") .. "eboot",
 			func = function()
 				loader.perform("reboot")
 			end,
 			alias = {"r", "R"},
 		},
 		kernel_options = {
 			entry_type = core.MENU_CAROUSEL_ENTRY,
 			carousel_id = "kernel",
 			items = core.kernelList,
 			name = function(idx, choice, all_choices)
 				if #all_choices == 0 then
 					return "Kernel: "
 				end
 
 				local is_default = (idx == 1)
 				local kernel_name = ""
 				local name_color
 				if is_default then
 					name_color = color.escapefg(color.GREEN)
 					kernel_name = "default/"
 				else
 					name_color = color.escapefg(color.BLUE)
 				end
 				kernel_name = kernel_name .. name_color ..
 				    choice .. color.resetfg()
 				return color.highlight("K") .. "ernel: " ..
 				    kernel_name .. " (" .. idx .. " of " ..
 				    #all_choices .. ")"
 			end,
 			func = function(_, choice, _)
 				if loader.getenv("kernelname") ~= nil then
 					loader.perform("unload")
 				end
 				config.selectKernel(choice)
 			end,
 			alias = {"k", "K"},
 		},
 		boot_options = {
 			entry_type = core.MENU_SUBMENU,
 			name = "Boot " .. color.highlight("O") .. "ptions",
 			submenu = menu.boot_options,
 			alias = {"o", "O"},
 		},
 		zpool_checkpoints = {
 			entry_type = core.MENU_ENTRY,
 			name = function()
 				local rewind = "No"
 				if core.isRewinded() then
 					rewind = "Yes"
 				end
 				return "Rewind ZFS " .. color.highlight("C") ..
 					"heckpoint: " .. rewind
 			end,
 			func = function()
 				core.changeRewindCheckpoint()
 				if core.isRewinded() then
 					bootenvSet(
 					    core.bootenvDefaultRewinded())
 				else
 					bootenvSet(core.bootenvDefault())
 				end
 				config.setCarouselIndex("be_active", 1)
 			end,
 			visible = function()
 				return core.isZFSBoot() and
 				    core.isCheckpointed()
 			end,
 			alias = {"c", "C"},
 		},
 		boot_envs = {
 			entry_type = core.MENU_SUBMENU,
 			visible = function()
 				return core.isZFSBoot() and
 				    #core.bootenvList() > 1
 			end,
 			name = "Boot " .. color.highlight("E") .. "nvironments",
 			submenu = menu.boot_environments,
 			alias = {"e", "E"},
 		},
 		chainload = {
 			entry_type = core.MENU_ENTRY,
 			name = function()
 				return 'Chain' .. color.highlight("L") ..
 				    "oad " .. loader.getenv('chain_disk')
 			end,
 			func = function()
 				loader.perform("chain " ..
 				    loader.getenv('chain_disk'))
 			end,
 			visible = function()
 				return loader.getenv('chain_disk') ~= nil
 			end,
 			alias = {"l", "L"},
 		},
+		vendor = {
+			entry_type = core.MENU_ENTRY,
+			visible = false,
+		},
 	},
 }
 
 menu.default = menu.welcome
 -- current_alias_table will be used to keep our alias table consistent across
 -- screen redraws, instead of relying on whatever triggered the redraw to update
 -- the local alias_table in menu.process.
 menu.current_alias_table = {}
 
 function menu.draw(menudef)
 	-- Clear the screen, reset the cursor, then draw
 	screen.clear()
 	menu.current_alias_table = drawer.drawscreen(menudef)
 	drawn_menu = menudef
 	screen.defcursor()
 end
 
 -- 'keypress' allows the caller to indicate that a key has been pressed that we
 -- should process as our initial input.
 function menu.process(menudef, keypress)
 	assert(menudef ~= nil)
 
 	if drawn_menu ~= menudef then
 		menu.draw(menudef)
 	end
 
 	while true do
 		local key = keypress or io.getchar()
 		keypress = nil
 
 		-- Special key behaviors
 		if (key == core.KEY_BACKSPACE or key == core.KEY_DELETE) and
 		    menudef ~= menu.default then
 			break
 		elseif key == core.KEY_ENTER then
 			core.boot()
 			-- Should not return.  If it does, escape menu handling
 			-- and drop to loader prompt.
 			return false
 		end
 
 		key = string.char(key)
 		-- check to see if key is an alias
 		local sel_entry = nil
 		for k, v in pairs(menu.current_alias_table) do
 			if key == k then
 				sel_entry = v
 				break
 			end
 		end
 
 		-- if we have an alias do the assigned action:
 		if sel_entry ~= nil then
 			local handler = menu.handlers[sel_entry.entry_type]
 			assert(handler ~= nil)
 			-- The handler's return value indicates if we
 			-- need to exit this menu.  An omitted or true
 			-- return value means to continue.
 			if handler(menudef, sel_entry) == false then
 				return
 			end
 			-- If we got an alias key the screen is out of date...
 			-- redraw it.
 			menu.draw(menudef)
 		end
 	end
 end
 
 function menu.run()
 	local autoboot_key
 	local delay = loader.getenv("autoboot_delay")
 
 	if delay ~= nil and delay:lower() == "no" then
 		delay = nil
 	else
 		delay = tonumber(delay) or 10
 	end
 
 	if delay == -1 then
 		core.boot()
 		return
 	end
 
 	menu.draw(menu.default)
 
 	if delay ~= nil then
 		autoboot_key = menu.autoboot(delay)
 
 		-- autoboot_key should return the key pressed.  It will only
 		-- return nil if we hit the timeout and executed the timeout
 		-- command.  Bail out.
 		if autoboot_key == nil then
 			return
 		end
 	end
 
 	menu.process(menu.default, autoboot_key)
 	drawn_menu = nil
 
 	screen.defcursor()
 	print("Exiting menu!")
 end
 
 function menu.autoboot(delay)
 	local x = loader.getenv("loader_menu_timeout_x") or 4
 	local y = loader.getenv("loader_menu_timeout_y") or 23
 	local endtime = loader.time() + delay
 	local time
 	local last
 	repeat
 		time = endtime - loader.time()
 		if last == nil or last ~= time then
 			last = time
 			screen.setcursor(x, y)
 			print("Autoboot in " .. time ..
 			    " seconds, hit [Enter] to boot" ..
 			    " or any other key to stop     ")
 			screen.defcursor()
 		end
 		if io.ischar() then
 			local ch = io.getchar()
 			if ch == core.KEY_ENTER then
 				break
 			else
 				-- erase autoboot msg
 				screen.setcursor(0, y)
 				print(string.rep(" ", 80))
 				screen.defcursor()
 				return ch
 			end
 		end
 
 		loader.delay(50000)
 	until time <= 0
 
 	local cmd = loader.getenv("menu_timeout_command") or "boot"
 	cli_execute_unparsed(cmd)
 	return nil
 end
 
 -- CLI commands
 function cli.menu()
 	menu.run()
 end
 
 return menu
diff --git a/stand/lua/menu.lua.8 b/stand/lua/menu.lua.8
index 4358981d4755..82863791903d 100644
--- a/stand/lua/menu.lua.8
+++ b/stand/lua/menu.lua.8
@@ -1,235 +1,298 @@
 .\"
 .\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 .\"
 .\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 23, 2018
+.Dd March 31, 2021
 .Dt MENU.LUA 8
 .Os
 .Sh NAME
 .Nm menu.lua
 .Nd FreeBSD dynamic menu boot module
 .Sh DESCRIPTION
 .Nm
 contains the main functionality required to build a dynamic menu system.
 It also contains definitions for the built-in menus, some of which are
 influenced by
 .Xr loader 8
 environment variables.
 .Pp
 Before hooking into the functionality provided by
 .Nm ,
 it must be included with a statement such as the following:
 .Pp
 .Dl local menu = require("menu")
 .Ss MENU DEFINITIONS
 Menus are represented in
 .Nm
 as a table.
 That table
 .Sy must
 contain an
 .Va entries
 key.
 .Pp
 If the value of the
 .Va entries
 key is itself a table, then each value in this table defines a single entry in
 this menu.
 See
 .Sx MENU ITEM DEFINITIONS
 for the structure of each entry.
 .Pp
 .Va entries
 may also be a function.
 This function must return a table, each value of which defines a single entry
 in this menu.
 See
 .Sx MENU ITEM DEFINITIONS .
 .Ss MENU ITEM DEFINITIONS
 The following keys may be defined for a menu item:
 .Bl -tag -width disable-module_module -offset indent
 .It Ic entry_type
 The type of this menu entry.
 See
 .Sx MENU ITEM TYPES .
 .It Ic carousel_id
 A unique string id for this carousel.
 A carousel is a menu entry that rotates through a selection of items.
 Used for storage of the carousel's current setting.
 .It Ic visible
 A lambda that returns
 .Dv true
 if this menu item should be visible and
 .Dv false
 if it should not be visible.
 .It Ic items
 A table (or a lambda that returns a table) of the possible choices for this
 carousel.
 .It Ic name
 A string (or a lambda that returns a string) containing the current name of this
 item.
 .It Ic func
 The function executed when this entry is selected.
 Every type except for
 .Ic core.MENU_SEPARATOR
 may have a
 .Ic func .
 .It Ic submenu
 The submenu menu definition to draw when this entry is selected.
 .It Ic alias
 A table of case-sensitive aliases for this menu entry.
 All menu entries that can be selected may have any number of
 .Ic alias
 entries.
 .El
 .Pp
 .Ic entry_type
 is the only required key for every entry type.
 .Ic name
 is required for all entry types except for
 .Ic core.MENU_SEPARATOR .
 .Ss MENU ITEM TYPES
 The menu item type constants are defined in
 .Xr core.lua 8 .
 The following types are available:
 .Bl -tag -width core.MENU_CAROUSEL_ENTRY -offset indent
 .It Ic core.MENU_RETURN
 Return to the parent menu.
 If the current menu is the default menu,
 .Nm
 will exit the menu and begin the autoboot sequence (if applicable).
 This type of menu entry may execute
 .Ic func ,
 when selected, and has a
 .Ic name .
 .It Ic core.MENU_ENTRY
 A normal menu entry that executes
 .Ic func
 when selected, and has a
 .Ic name .
 .It Ic core.MENU_SEPARATOR
 A menu entry that serves as a separator.
 It may have a
 .Ic name .
 .It Ic core.MENU_SUBMENU
 A menu entry that opens
 .Ic submenu
 when selected.
 It may have a
 .Ic name .
 .It Ic core.MENU_CAROUSEL_ENTRY
 A menu entry that rotates through
 .Ic items
 like a carousel.
 .Ic func
 is executed when selected, and the callback is passed the choice index, name of
 the current choice, and the table of choices.
 .El
 .Ss EXPORTED MENUS
 The following menus are exported by
 .Nm :
 .Bl -tag -width menu.boot_environments -offset indent
 .It Ic menu.default
 The default menu to draw.
 Set to
 .Ic menu.welcome
 by default.
 .It Ic menu.welcome
 The welcome menu.
 Contains single and multi user boot options, as well as entries to access other
 menus.
 .It Ic menu.boot_options
 The "Boot Options" menu.
 .It Ic menu.boot_environments
 The "Boot Environments" menu.
 This menu is only visible if the system is booted on a ZFS partition and more
 than one boot environment was detected at boot.
 .El
 .Sh EXAMPLES
 To replace the default boot menu with a simple boot menu:
 .Pp
 .Bd -literal -offset indent -compact
 local core = require("core")
 local menu = require("menu")
 
 menu.default = {
 	entries = {
 		{
 			entry_type = core.MENU_ENTRY,
 			name = "Boot",
 			func = core.boot,
 		},
 		{
 			entry_type = core.MENU_CAROUSEL_ENTRY,
 			carousel_id = "unique_boot_entry_name",
 			items = {"NO", "YES"},
 			name = function(_, choice, _)
 				return "Option: " .. choice
 			end,
 			func = function(_, _, _)
 				loader.setenv("some_envvar", "some_value")
 			end,
 		},
 	},
 }
 .Ed
 .Pp
 To add another option to the welcome menu:
 .Pp
 .Bd -literal -offset indent -compact
 local core = require("core")
 local menu = require("menu")
 
+local my_entry = {
+	entry_type = core.MENU_ENTRY,
+	name = "Fancy Boot",
+	func = core.boot,
+},
+
+local stock_entries = menu.welcome.entries
+function menu.welcome.entries()
+	local ents = stock_entries()
+	ents[#ents + 1] = my_entry
+	return ents
+end
+.Ed
+.Pp
+To create a vendor submenu or other vendor menu option,
+override
+.Ic menu.welcome.all_entires.vendor
+like so:
+.Pp
+.Bd -literal -offset indent -compact
+local core = require("core")
+local menu = require("menu")
+
+-- Fill in with vendor specific entries
+local vendor_options = {
+	entries = {
+	...
+	},
+}
+
 local welcome_entries = menu.welcome.all_entries
-welcome_entries[#welcome_entries + 1] = {
-	entry_type = core.MENU_CAROUSEL_ENTRY,
-	carousel_id = "unique_boot_entry_name",
-	items = {"NO", "YES"},
-	name = function(_, choice, _)
-		return "Option: " .. choice
+welcome_entries.vendor = {
+        entry_type = core.MENU_SUBMENU,
+        name = color.highlight("V") .. "endor Options",
+        submenu = vendor_options,
+        alias = {"v", "V"},
+}
+.Ed
+In the above example,
+.Ic vendor_options
+is a local variable that defines the vendor submenu.
+.Pp
+To add an additional option, change the
+.Ic menu.boot_options.entries
+array.
+The following illustrates this concept:
+.Pp
+.Bd -literal -offset indent -compact
+-- This is a silly example that rotates local_option through the values
+-- 0 to 4.  local_option would still need to be used elsewhere.
+local local_option = 0
+
+-- The `entries` of a menu may either be a table or a function.  In this
+-- example we're augmenting a menu that just has a static table, but if we
+-- wanted to be more robust then we would need to instead check the type
+-- of `stock_options` here to determine our next move.
+--
+-- If `entries` is a table, then the stock menu system won't be changing it
+-- so we can just add our menu option as we do below.
+--
+-- If `entries` is a function, then we would need to provide a new function to
+-- replace `entries` that does a core.deepCopyTable() of the result and adds
+-- the below item to it.  The deep copy is necessary to avoid duplicating our
+-- new menu item and allowing the menu to alter its behavior however it pleases.
+local stock_options = menu.boot_options.entries
+stock_options[#stock_options + 1] = {
+	entry_type = core.MENU_ENTRY,
+	name = function()
+		return color.highlight('L') ..
+		    "ocal Option     : " .. local_option
 	end,
-	func = function(_, _, _)
-		loader.setenv("some_envvar", "some_value")
+	func = function()
+		local_option = (local_option + 1) % 5
 	end,
+	alias= {"l", "L"}
 }
-.Ed
 .Sh SEE ALSO
 .Xr loader.conf 5 ,
 .Xr core.lua 8 ,
 .Xr loader 8
 .Sh HISTORY
 The
 .Nm
 file first appeared in
 .Fx 12.0 .
 .Sh AUTHORS
 The
 .Nm
 file was originally written by
 .An Pedro Souza Aq Mt pedrosouza@FreeBSD.org .
 Later work and this manual page was done by
 .An Kyle Evans Aq Mt kevans@FreeBSD.org .