diff --git a/.cirrus.yml b/.cirrus.yml
index 345e7ab148bb..18417b52e6c9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -23,6 +23,7 @@ task:
       TOOLCHAIN: llvm15
       TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
   - name: amd64-llvm16 World and kernel build and boot smoke test
+    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
@@ -63,7 +64,7 @@ task:
       TOOLCHAIN_PKG: ${TOOLCHAIN}
       EXTRA_MAKE_FLAGS: -s
   - name: amd64-gcc12 World and kernel build and boot smoke test (FreeBSD repo)
-    only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src'
+    only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src' && $CIRRUS_BRANCH =~ 'pull/.*'
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
diff --git a/.last_merge b/.last_merge
index 62318cf9a01a..ddab80a9bd7b 100644
--- a/.last_merge
+++ b/.last_merge
@@ -1 +1 @@
-freebsd-main-20230929
+freebsd-main-20231013
diff --git a/.mailmap b/.mailmap
index 273abae90fc5..2e4c03966084 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,3 +7,10 @@ Mina Galić <freebsd@igalic.co> <me@igalic.co>
 Mina Galić <freebsd@igalic.co> <me+freebsd@igalic.co>
 Mina Galić <freebsd@igalic.co> <me+git@igalic.co>
 <weike.chen@dell.com> <weike.chen_dell.com>
+Michal Meloun  <mmel@FreeBSD.org> <strejda@users.noreply.github.com>
+Dmitriy Alexandrov <d06alexandrov@gmail.com> <d06alexandrov@users.noreply.github.com>
+Alfonso Gregory <gfunni234@gmail.com> <83477269+AtariDreams@users.noreply.github.com>
+Alfonso Gregory <gfunni234@gmail.com> <83477269+gAlfonso-bit@users.noreply.github.com>
+Jose Luis Duran <jlduran@gmail.com> <jlduran@users.noreply.github.com>
+Val Packett <val@packett.cool> <greg@unrelenting.technology>
+Piotr Paweł Stefaniak <pstef@FreeBSD.org> <pstef@FreeBSD.org>
diff --git a/Makefile.inc1 b/Makefile.inc1
index 8e8d855d1113..3229ed4c26ae 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3469,6 +3469,7 @@ list-old-files: .PHONY
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V "OLD_FILES:ts\n" -V "OLD_FILES:Musr/share/*.gz:R:ts\n" \
+	    -V "MOVED_LIBS:ts\n" \
 	    ${_ALL_libcompats:@v@-V "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib$v,:ts\n"@} \
 	    ${_ALL_libcompats:@v@-V "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib$v,:ts\n"@} | \
 	sort
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index b447ae9845d1..a6d0f7c6acaa 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,13 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20231005: Remove man page link for now gone net80211 function.
+OLD_FILES+=usr/share/man/man9/ieee80211_unref_node.9.gz
+
+# 20231005: bsdconfig remove support for floppy and ftp
+OLD_FILES+=usr/share/bsdconfig/media/floppy.subr
+OLD_FILES+=usr/share/bsdconfig/media/ftp.subr
+
 # 20230927: Man pages renamed to match the actual functions
 OLD_FILES+=usr/share/man/man9/cr_seeothergids.9.gz
 OLD_FILES+=usr/share/man/man9/cr_seeotheruids.9.gz
@@ -17673,11 +17680,6 @@ OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz
 .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
 OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
 .endif
-.if ${TARGET_ARCH:Maarch64} != "" && ${TARGET} != "arm" && \
-    ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && \
-    ${TARGET_ARCH} != "sparc64" && ${TARGET} != "mips"
-OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
-.endif
 OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz
 OLD_FILES+=usr/share/man/man9/VFS_START.9.gz
 OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz
diff --git a/RELNOTES b/RELNOTES
index c5686a4f30fb..77d423a5c50c 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -10,6 +10,9 @@ newline.  Entries should be separated by a newline.
 
 Changes to this file should not be MFCed.
 
+ff01d71e48d4:
+	dialog(1) has been replaced by bsddialog(1)
+
 41582f28ddf7:
 	FreeBSD 15.0 will not include support for 32-bit platforms.
 	However, 64-bit systems will still be able to run older 32-bit
diff --git a/UPDATING b/UPDATING
index a1bcecadd357..b750b2b913b5 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20231010:
+	dialog(1) has been replaced in base by bsddialog(1), while most of the
+	time replacing a dialog(1) call by a bsddialog(1) call works out of the
+	box, bsddialog(1) is not considered as a drop-in replacement for
+	dialog(1).
+
+	If you do depend on dialog(1) functionality, please install cdialog
+	from ports:
+
+	pkg install cdialog
+
 20230927:
 	The EARLY_AP_STARTUP kernel option is mandatory on x86.  The option
 	has been added to DEFAULTS, so it should automatically be included in
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 23868d8b3009..c393b2e49c28 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -28,7 +28,7 @@
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\"
-.Dd August 24, 2023
+.Dd October 6, 2023
 .Dt PS 1
 .Os
 .Sh NAME
@@ -238,6 +238,11 @@ So the header texts for multiple keywords can be changed.
 If all keywords have empty header texts, no header line is written.
 .It Fl p
 Display information about processes which match the specified process IDs.
+It implies the use of
+.Fl x .
+When combined with
+.Fl d ,
+all descendent processes are included.
 .It Fl r
 Sort by current CPU usage, instead of the combination of controlling
 terminal and process ID.
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index ce39083d7d63..3818677ddc4e 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -126,6 +126,8 @@ static const struct modes imodes[] = {
 	{ "-decctlq",	IXANY, 0 },
 	{ "imaxbel",	IMAXBEL, 0 },
 	{ "-imaxbel",	0, IMAXBEL },
+	{ "iutf8",	IUTF8, 0 },
+	{ "-iutf8",	0, IUTF8 },
 	{ NULL,		0, 0 },
 };
 
diff --git a/bin/stty/print.c b/bin/stty/print.c
index 07a3c2058474..33472bbccea1 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -127,6 +127,7 @@ print(struct termios *tp, struct winsize *wp, int ldisc, enum FMT fmt)
 	put("-inpck", INPCK, 0);
 	put("-ignpar", IGNPAR, 0);
 	put("-parmrk", PARMRK, 0);
+	put("-iutf8", IUTF8, 1);
 
 	/* output flags */
 	tmp = tp->c_oflag;
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 9e9405928c67..c572a657a997 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -224,6 +224,9 @@ if
 .Cm imaxbel
 is unset and the input queue is full, the next input character causes
 the entire input and output queues to be discarded.
+.It Cm iutf8 Pq Fl iutf8
+Assume that input characters are UTF-8 encoded. Setting this flag
+causes backspace to properly delete multibyte characters in canonical mode.
 .El
 .Ss Output Modes:
 This corresponds to the c_oflag of the termios structure.
diff --git a/bin/uuidgen/Makefile b/bin/uuidgen/Makefile
index f0c4ce2e3538..234ee20300eb 100644
--- a/bin/uuidgen/Makefile
+++ b/bin/uuidgen/Makefile
@@ -1,4 +1,5 @@
 
+PACKAGE=	runtime
 PROG=	uuidgen
 
 .include <bsd.prog.mk>
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
index 42367b99b786..1745519c2c1a 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
+++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
@@ -18,8 +18,6 @@
 .\" CDDL HEADER END
 .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd February 24, 2023
 .Dt DTRACE 1
 .Os
diff --git a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
index c649e21bb67e..6c9657fa5406 100644
--- a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
+++ b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
@@ -19,8 +19,6 @@
 .\" CDDL HEADER END
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd February 25, 2020
 .Dt LOCKSTAT 1
 .Os
diff --git a/cddl/usr.sbin/dwatch/dwatch b/cddl/usr.sbin/dwatch/dwatch
index 9adde7eb8d49..c9af8258f4ac 100755
--- a/cddl/usr.sbin/dwatch/dwatch
+++ b/cddl/usr.sbin/dwatch/dwatch
@@ -1327,7 +1327,6 @@ PSARGS_ACTION=$( cat <&9 )
  * SUCH DAMAGE.
  *
  * $TITLE dtrace(1) script to log process(es) triggering $PROBE $
- * \$FreeBSD$
  */
 
 $( echo "$DTRACE_PRAGMA" | awk '
diff --git a/contrib/bsddialog/.gitignore b/contrib/bsddialog/.gitignore
index 8b8ec9d4ae0b..c8fc68ed8a0e 100644
--- a/contrib/bsddialog/.gitignore
+++ b/contrib/bsddialog/.gitignore
@@ -12,8 +12,10 @@ examples_library/calendar
 examples_library/checklist
 examples_library/datebox
 examples_library/form
+examples_library/gauge
 examples_library/infobox
 examples_library/menu
+examples_library/mixedgauge
 examples_library/mixedlist
 examples_library/msgbox
 examples_library/pause
diff --git a/contrib/bsddialog/CHANGELOG b/contrib/bsddialog/CHANGELOG
index 883fe1016d01..e6295768d906 100644
--- a/contrib/bsddialog/CHANGELOG
+++ b/contrib/bsddialog/CHANGELOG
@@ -1,3 +1,173 @@
+2023-08-01 Version 1.0
+
+	Utility:
+	* add: comments to --save-theme output file.
+	* add: blink, halfbright, highlight to --save-theme and --load-theme.
+	* add: theme.menu.[f_]prefixcolor to --save-theme and --load-theme.
+	* add: --datebox-format <d/m/y|m/d/y|y/m/d> to set --datebox UI.
+	* add: --help-print-items (--help-status becomes alias).
+	* add: --text-escape (--colors becomes alias).
+	* add: new escapes \Zd, \Zk, \Zs, \ZD, \ZK, \ZS, for --text-escape.
+	* add: env NO_COLOR, to set blackwhite theme.
+	* add: $HOME/.bsddialog.conf startup theme file.
+	* add: env BSDDIALOG_THEMEFILE startup theme file.
+	* add: --left1-button <label>.
+	* add: --left2-button <label>.
+	* add: --left3-button <label>.
+	* add: --right1-button <label>.
+	* add: --right2-button <label>.
+	* add: --right3-button <label>.
+	* add: dynamic exit codes.
+	    - add: --error-exit-code.
+	    - add: --ok-exit-code.
+	    - add: --cancel-exit-code.
+	    - add: --help-exit-code.
+	    - add: --extra-exit-code.
+	    - add: --timeout-exit-code.
+	    - add: --esc-exit-code.
+	    - add: --left1-exit-code.
+	    - add: --left2-exit-code.
+	    - add: --left3-exit-code.
+	    - add: --right1-exit-code.
+	    - add: --right2-exit-code.
+	    - add: --right3-exit-code.
+	    - add: env BSDDIALOG_ERROR.
+	    - add: env BSDDIALOG_OK.
+	    - add: env BSDDIALOG_CANCEL.
+	    - add: env BSDDIALOG_HELP.
+	    - add: env BSDDIALOG_EXTRA.
+	    - add: env BSDDIALOG_TIMEOUT.
+	    - add: env BSDDIALOG_ESC.
+	    - add: env BSDDIALOG_LEFT1.
+	    - add: env BSDDIALOG_LEFT2.
+	    - add: env BSDDIALOG_LEFT3.
+	    - add: env BSDDIALOG_RIGHT1.
+	    - add: env BSDDIALOG_RIGHT2.
+	    - add: env BSDDIALOG_RIGHT3.
+	* add: undocumented envs for bsdconfig(8) compatibility.
+	    - env BSDDIALOG_COMPATRC for use_shadow setting.
+	    - env BSDDIALOG_ITEM_HELP to add/set exit code.
+	* change: rename themes --theme <3d|blackwhite|flat>.
+	* change: --no-names and --no-descriptions mutually exclusive (via lia).
+	* change: quote only checklist output items if necessary. Previously
+	    also radiolist item.
+	* change: dialogs with user input print always values except with ERROR,
+	    ESC, Cancel. Previously the situation was quite heterogeneous.
+	* improve: DIAGNOSTIC messages adding fmt string errors.
+	* improve: disable theme setting (opt and env) with no-color terminals.
+	* improve: menus on|off status (strcasecmp, diagnostic, real off check).
+	* improve: --bikeshed with button delimiter and --date-format.
+	* improve: --textbox accepts button options.
+	* improve: Forms with Help button.
+	    - print "HELP" (like menus).
+	    - accept --help-list-items.
+	    - accept --help-print-name.
+	* fix: --load-theme attributes.
+	* fix: --clear-screen with --and-dialog.
+	* delete: --theme <bsddialog> (partially implemented).
+	* delete: --esc-return-cancel (replaced by new env and option).
+	* delete: --generic-button1 (replaced by --right1-button).
+	* delete: --generic-button2 (replaced by --right2-button).
+	* refactor: modularize in more files (main, cli, builders, theme).
+
+	Library:
+	* add: bsddialog_inmode().
+	* add: bsddialog_clear(y) for utility --clear-screen.
+	* add: bsddialog_refresh() for utility terminal mode options.
+	* add: conf.date.format="d/m/y"|"m/d/y"|"y/m/d" to customize
+	    bsddialog_datebox() UI (boxes) with a date format.
+	* add: 'const char *end' to bsddialog_gauge().
+	* add: draw focus on the shortcut-key-selected button at exit.
+	* add: escapes for conf.text.highlight \Zd, \Zk, \Zs, \ZD, \ZK, \ZS.
+	* add: other theme flags.
+	    - BSDDIALOG_BLINK.
+	    - BSDDIALOG_HALFBRIGHT.
+	    - BSDDIALOG_HIGHLIGHT.
+	* add: generic buttons.
+	    - conf.button.left1_label, BSDDIALOG_LEFT1 return value.
+	    - conf.button.left2_label, BSDDIALOG_LEFT2 return value.
+	    - conf.button.left3_label, BSDDIALOG_LEFT3 return value.
+	    - conf.button.right1.label, BSDDIALOG_RIGHT1 return value.
+	    - conf.button.right2.label, BSDDIALOG_RIGHT2 return value.
+	    - conf.button.right3.label, BSDDIALOG_RIGHT3 return value.
+	* add: unused bsddialog_menugroup.min_on for future features.
+	* add: theme.menu.f_prefixcolor and theme.menu.prefixcolor.
+	* improve: check (when possible) API pointers.
+	* improve: circolar buttons with left and right keys for msgbox, yesno,
+	    menus, rangebox and pause.
+	* improve: bsddialog_textbox() handles conf.buttons.
+	* improve: bsddialog_datebox() a box change affects the others as well.
+	* improve: bsddialog_geterror() with fmt strings.
+	* change: API NULL strings handled like "", except gauge *sep and *end.
+	* change: menus and form less restrictive with text, hide text with
+	    little screens (same behavior as other dialogs).
+	* change: mixedgauge BSDDIALOG_MG_BLANK does not draw minibar but prints
+	    minilabel. The change allows mixedgauge to add sections. To restore
+	    the previous behavior setting minilabel to "".
+	* change: check/set bsddialog_gauge() perc max 100.
+	* change: check/set bsddialog_mixedgauge() mainperc max 100.
+	* change: conf.menu.no_name and conf.menu.no_desc mutually exclusive.
+	* change: bsddialog_pause() sec -> *sec to know remaining time at exit.
+	* change: add *focusitem to bsddialog_form() like menus.
+	* change: "pointer" values are always set except when BSDDIALOG_ERROR
+	    occurs. Examples *yy/*mm/*ss, rangebox *value.
+	    - delete conf.menu.on_without_ok.
+	    - delete conf.form.value_without_ok.
+	* rename: conf.text.highlight -> conf.text.escape.
+	* rename: theme.menu.namesepcolor -> theme.menu.sepnamecolor.
+	* rename: theme.menu.descsepcolor -> theme.menu.sepdesccolor.
+	* fix: bsddialog_pause() elevation bar after resize.
+	* fix: bsddialog_textbox() key '0'.
+	* fix: timebox.c checksize (boxes width).
+	* fix: extend menurows after shrink and enlarge.
+	* fix: menu pad and form pad "re-expansion" after shrink and enlarge.
+	* fix: shadow top-left corner (trick wresize() before wmove()).
+	* fix: increment bsddialog_total_progview size for more general use.
+	* delete: BSDDIALOG_THEME_BSDDIALOG (partially implemented).
+	* delete: conf.button.generic1_label (for new conf.button.right1_label).
+	* delete: BSDDIALOG_GENERIC1 return value (new BSDDIALOG_RIGHT1).
+	* delete: conf.button.generic2_label (for new conf.button.right2_label).
+	* delete: BSDDIALOG_GENERIC2 return value (new BSDDIALOG_RIGHT2).
+	* delete: bsddialog_clearterminal(), replaced by bsddialog_clear(y).
+	* refactor: internal implementation.
+	    - add: internal structures to represent components.
+	    - merge: (when possible) dialogs autosize.
+	    - merge: (when possible) dialogs checksize.
+	    - merge: for each dialog "build" with "update" -> <dialog>_redraw().
+	    - merge: new_dialog() with update_dialog() -> draw_dialog().
+	    - merge: infobox.c with messagebox.c (delete infobox.c)
+	    - merge: bsddialog_datebox() + bsddialog_calendar() -> datebox.c
+	    - change: flat and blackwhite real themes, 3d adapted from flat.
+	    - improve: replace wrefresh() -> wnoutrefresh()/doupdate().
+	    - improve: replace prefresh() -> pnoutrefresh()/doupdate().
+	    - improve: menu split code to build private items.
+	    - improve: form split code to build private items.
+	    - delete: -Wno-implicit-fallthrough.
+
+
+2023-06-12 Version 0.4.2
+
+	Library:
+	* fix: compile error with aarch64-gcc12 for "\Z[0-7]" check;
+	    https://gitlab.com/alfix/bsddialog/-/issues/5.
+	* fix: BSDDIALOG_FIELDCURSOREND with multiple items
+	    (warning aarch64-gcc12).
+
+
+2023-01-02 Version 0.4.1
+
+	Utility:
+	* fix: default space separator menus output, except if --separator " ".
+	* rename: GNUMakefile to GNUmakefile to simplify linux build.
+	    Thanks to https://gitlab.com/alfix/bsddialog/-/merge_requests/2.
+
+	Library:
+	* fix: t.dialog.linelowercolor no bold-black, some terminal draws grey.
+	* fix: text wrapping (actual string length) with --colors.
+	* rename: GNUMakefile to GNUmakefile to simplify linux build.
+	    Thanks to https://gitlab.com/alfix/bsddialog/-/merge_requests/2.
+
+
 2022-09-24 Version 0.4
 
 	Utility:
@@ -6,19 +176,19 @@
 	* add: --keep-tite as --alternate-screen alias.
 	* add: --and-dialog to build other dialogs.
 	* add: --and-widget as --and-dialog alias.
-	* add: --no-names (--no-tags becames its alias).
-	* add: --no-descriptions (--no-items becames its alias).
-	* add: --help-print-name (--help-tags becames its alias).
-	* add: --item-bottom-desc (--item-help becames its alias).
+	* add: --no-names (--no-tags becomes alias).
+	* add: --no-descriptions (--no-items becomes alias).
+	* add: --help-print-name (--help-tags becomes alias).
+	* add: --item-bottom-desc (--item-help becomes alias).
 	* add: --cr-wrap (was partially implemented) to keep '\n' with "\n".
 	* add: --text-unchanged to avoid default modification.
-	* add: --tab-escape enables "\t" in text.
+	* add: --tab-escape to enable "\t" in text.
 	* add: --clear-screen to clear the screen.
 	* add: --clear-dialog to clear the dialog (was --clear).
 	* add: --calendar dialog to select a date.
 	* add: DIAGNOSTICS messages for bad arguments number.
 	* add: DIAGNOSTICS messages for missing and unexpected options.
-	* change: --clear becames alias for --clear-screen.
+	* change: --clear becomes alias for --clear-screen.
 	* change: --print-maxsize format output.
 	* change: --menu, --radiolist, --checklist and --treeview output.
 	    - no printed items with Cancel or ESC.
@@ -41,9 +211,9 @@
 	* add: bsddialog_menu() SPACE key (equivalent to ENTER).
 	* add: bsddialog_calendar() to select a date.
 	* change: rename enum bsddialog_grouptype -> enum bsddialog_menutype.
-	* change: fixed-menurows becames at most menurows (depending on text).
-	* change: fixed-rows becames at most rows, min(rows, screenH - shadow).
-	* change: fixed-cols becames at most cols, min(cols, screenW - shadow).
+	* change: fixed-menurows becomes at most menurows (depending on text).
+	* change: fixed-rows becomes at most rows, min(rows, screenH - shadow).
+	* change: fixed-cols becomes at most cols, min(cols, screenW - shadow).
 	* delete: undocumented internal bsddialog_menuitem.depth factor (was 2).
 
 
@@ -55,9 +225,9 @@
 	* add: --load-theme to read and set a custom theme at runtime.
 	* add: --save-theme to save current theme.
 	* add: --bikeshed for random settings.
-	* add: --switch-buttons enables focus switching: buttons / input
-	       components. Available for: --form, --inputbox, --mixedform,
-	       --passwordform, --passwordbox, --timebox and --datebox.
+	* add: --switch-buttons to enable buttons/input widgets focus switching.
+	       Available for: --form, --inputbox, --mixedform, --passwordform,
+	       --passwordbox, --timebox and --datebox.
 	* change: rename --esc-cancelvalue to --esc-return-cancel.
 	* change: form field value is printed like multibyte charachter string,
 	          previously widechar string.
diff --git a/contrib/bsddialog/GNUMakefile b/contrib/bsddialog/GNUMakefile
deleted file mode 100644
index 7da4d64deecf..000000000000
--- a/contrib/bsddialog/GNUMakefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# PUBLIC DOMAIN - NO WARRANTY, see:
-#     <http://creativecommons.org/publicdomain/zero/1.0/>
-#
-# Written in 2021 by Alfonso Sabato Siciliano
-
-OUTPUT=  bsddialog
-SOURCES= bsddialog.c util_theme.c
-OBJECTS= $(SOURCES:.c=.o)
-LIBPATH= ./lib
-LIBBSDDIALOG= $(LIBPATH)/libbsddialog.so
-CFLAGS= -Wall -Wextra -I$(LIBPATH)
-LDFLAGS= -ltinfo -Wl,-rpath=$(LIBPATH) -L$(LIBPATH) -lbsddialog
-RM = rm -f
-
-all : $(OUTPUT)
-
-$(OUTPUT): $(LIBBSDDIALOG) $(OBJECTS)
-	$(CC) $^ -o $@ $(LDFLAGS)
-
-${LIBBSDDIALOG}:
-	make -C ${LIBPATH} -f GNUMakefile
-
-%.o: %.c $(LIBBSDDIALOG)
-	$(CC) $(CFLAGS) -c $<
-
-clean:
-	make -C ${LIBPATH} -f GNUMakefile clean
-	$(RM) $(OUTPUT) *.o *~
diff --git a/contrib/bsddialog/LICENSE b/contrib/bsddialog/LICENSE
index f24be045375b..d19ad87fca1f 100644
--- a/contrib/bsddialog/LICENSE
+++ b/contrib/bsddialog/LICENSE
@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2021-2022, Alfonso Sabato Siciliano
+Copyright (c) 2021-2023, Alfonso Sabato Siciliano
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
diff --git a/contrib/bsddialog/Makefile b/contrib/bsddialog/Makefile
index 28162c5e90b3..884cfa1b3e60 100644
--- a/contrib/bsddialog/Makefile
+++ b/contrib/bsddialog/Makefile
@@ -1,50 +1,38 @@
 # PUBLIC DOMAIN - NO WARRANTY, see:
 #     <http://creativecommons.org/publicdomain/zero/1.0/>
 #
-# Written in 2021 by Alfonso Sabato Siciliano
+# Written in 2023 by Alfonso Sabato Siciliano
 
-OUTPUT=  bsddialog
-SOURCES= bsddialog.c util_theme.c
-OBJECTS= ${SOURCES:.c=.o}
-LIBPATH= ${.CURDIR}/lib
-LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so
+OUTPUT =  bsddialog
+export VERSION=1.0
+.CURDIR ?= ${CURDIR}
+LIBPATH = ${.CURDIR}/lib
+LIBBSDDIALOG = ${LIBPATH}/libbsddialog.so
+UTILITYPATH = ${.CURDIR}/utility
 
-CFLAGS+= -I${LIBPATH} -std=gnu99 -Wall -Wextra -Werror
-# `make -DDEBUG`
-.if defined(DEBUG)
-CFLAGS= -g -Wall -I${LIBPATH}
-LIBDEBUG= -DDEBUG
-.endif
-LDFLAGS+= -ltinfow -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
-
-BINDIR= /usr/local/bin
-MAN= ${OUTPUT}.1
-GZIP= gzip -cn
-MANDIR= /usr/local/share/man/man1
-
-INSTALL= install
 RM= rm -f
+LN = ln -s -f
+
+### cli options ###
+# port/pkg Makefile: 'MAKE_ARGS = -DNORPATH'
+NORPATH ?=
+export DISABLERPATH=${NORPATH}
+# `make -DDEBUG`
+# `gmake DEBUG=1`
+DEBUG ?=
+export ENABLEDEBUG=${DEBUG}
 
 all : ${OUTPUT}
 
-${OUTPUT}: ${LIBBSDDIALOG} ${OBJECTS}
-	${CC} ${LDFLAGS} ${OBJECTS} -o ${.PREFIX}
+${OUTPUT}: ${LIBBSDDIALOG}
+	${MAKE} -C ${UTILITYPATH} LIBPATH=${LIBPATH}
+	${LN} ${UTILITYPATH}/${OUTPUT} ${.CURDIR}/${OUTPUT}
 
 ${LIBBSDDIALOG}:
-	make -C ${LIBPATH} ${LIBDEBUG}
-
-.c.o:
-	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-
-install:
-	${INSTALL} -s -m 555 ${OUTPUT} ${BINDIR}
-	${GZIP} ${MAN} > ${MAN}.gz
-	${INSTALL} -m 444 ${MAN}.gz ${MANDIR}
-
-unistall:
-	${RM} ${BINDIR}/${OUTPUT}
-	${RM} ${MANDIR}/${MAN}.gz
+	${MAKE} -C ${LIBPATH}
 
 clean:
-	make -C ${LIBPATH} clean
-	${RM} ${OUTPUT} *.o *~ *.core ${MAN}.gz
+	${MAKE} -C ${LIBPATH} clean
+	${MAKE} -C ${UTILITYPATH} clean
+	${RM} ${OUTPUT} *.core
+
diff --git a/contrib/bsddialog/README.md b/contrib/bsddialog/README.md
index 59af7072e7f5..f4846ec07745 100644
--- a/contrib/bsddialog/README.md
+++ b/contrib/bsddialog/README.md
@@ -1,13 +1,17 @@
-# BSDDialog 0.4
+# BSDDialog 1.0
 
 This project provides **bsddialog** and **libbsddialog**, an utility
 and a library to build scripts and tools with TUI dialogs and widgets.
+
+
+## Demo
+
 [Screenshots](https://www.flickr.com/photos/alfonsosiciliano/albums/72157720215006074).
 
 
 ## Getting Started
 
-FreeBSD:
+FreeBSD and Linux:
 
 ```
 % git clone https://gitlab.com/alfix/bsddialog.git
@@ -16,15 +20,6 @@ FreeBSD:
 % ./bsddialog --msgbox "Hello World!" 8 20
 ```
 
-Linux:
-
-```
-% git clone https://gitlab.com/alfix/bsddialog.git
-% cd bsddialog
-% make -f GNUMakefile
-% ./bsddialog --msgbox "Hello World!" 8 20
-```
-
 Output:
 
 ![screenshot](screenshot.png)
@@ -60,6 +55,7 @@ in the _Public Domain_ to build new projects:
 ```
 % sh ./examples_utility/calendar.sh
 % sh ./examples_utility/checklist.sh
+% sh ./examples_utility/datebox.sh
 % sh ./examples_utility/form.sh
 % sh ./examples_utility/gauge.sh
 % sh ./examples_utility/infobox.sh
@@ -72,6 +68,7 @@ in the _Public Domain_ to build new projects:
 % sh ./examples_utility/passwordform.sh
 % sh ./examples_utility/pause.sh
 % sh ./examples_utility/radiolist.sh
+% sh ./examples_utility/rangebox.sh
 % sh ./examples_utility/timebox.sh
 % sh ./examples_utility/yesno.sh
 ```
@@ -100,8 +97,10 @@ in the _Public Domain_ to build new projects:
 % ./checklist
 % ./datebox
 % ./form
+% ./gauge
 % ./infobox
 % ./menu
+% ./mixedgauge
 % ./mixedlist
 % ./msgbox
 % ./pause
@@ -114,7 +113,19 @@ in the _Public Domain_ to build new projects:
 
 
 ## TODO and Ideas
- 
+
  - menubar feature
  - key callback
  - Right-To-Left text
+ - some terminal does not hide the cursor, move it bottom-right before to getch.
+ - refactor backtitle: multiline, conf.backtitle, WINDOW \*dialog.backtitle.
+ - refactor bottomdesc: WINDOW \*dialog.bottomdesc -> fix expandig screen.
+ - accessibility https://wiki.freebsd.org/Accessibility/Wishlist/Base
+ - add bool conf.menu.depthlines.
+ - implement custom getopt\_long().
+ - refactor/redesign gauge().
+ - improve grey lines expanding terminal (maybe redrawwin() in hide\_dialog()).
+ - more restrictive strtol() and strtoul().
+ - implement global buttons handler.
+ - add/move external tutorial.
+ - implement menutype.min_on.
diff --git a/contrib/bsddialog/bsddialog.c b/contrib/bsddialog/bsddialog.c
deleted file mode 100644
index 121cb1ee0604..000000000000
--- a/contrib/bsddialog/bsddialog.c
+++ /dev/null
@@ -1,1697 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
- *
- * 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.
- */
-
-#include <sys/ioctl.h>
-
-#include <getopt.h>
-#include <locale.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <term.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <bsddialog.h>
-#include <bsddialog_theme.h>
-
-#include "util_theme.h"
-
-enum OPTS {
-	/* Options */
-	ALTERNATE_SCREEN = '?' + 1,
-	AND_DIALOG,
-	ASCII_LINES,
-	AUTO_TRUNCATE,
-	BACKTITLE,
-	BEGIN_X,
-	BEGIN_Y,
-	BIKESHED,
-	CANCEL_LABEL,
-	CLEAR_DIALOG,
-	CLEAR_SCREEN,
-	COLORS,
-	COLUMNS_PER_ROW,
-	CR_WRAP,
-	DATE_FORMAT,
-	DEFAULT_BUTTON,
-	DEFAULT_ITEM,
-	DEFAULT_NO,
-	DISABLE_ESC,
-	ESC_RETURNCANCEL,
-	EXIT_LABEL,
-	EXTRA_BUTTON,
-	EXTRA_LABEL,
-	GENERIC_BUTTON1,
-	GENERIC_BUTTON2,
-	HELP_BUTTON,
-	HELP_LABEL,
-	HELP_PRINT_NAME,
-	HELP_STATUS,
-	HFILE,
-	HLINE,
-	HMSG,
-	IGNORE,
-	INSECURE,
-	ITEM_BOTTOM_DESC,
-	ITEM_DEPTH,
-	ITEM_PREFIX,
-	LOAD_THEME,
-	MAX_INPUT,
-	NO_AUTO_TRUNCATE,
-	NO_CANCEL,
-	NO_DESCRIPTIONS,
-	NO_LINES,
-	NO_NAMES,
-	NO_OK,
-	NO_SHADOW,
-	NORMAL_SCREEN,
-	OK_LABEL,
-	OUTPUT_FD,
-	OUTPUT_SEPARATOR,
-	PRINT_MAXSIZE,
-	PRINT_SIZE,
-	PRINT_VERSION,
-	QUOTED,
-	SAVE_THEME,
-	SEPARATE_OUTPUT,
-	SHADOW,
-	SINGLE_QUOTED,
-	SLEEP,
-	STDERR,
-	STDOUT,
-	SWITCH_BUTTONS,
-	TAB_ESCAPE,
-	TAB_LEN,
-	TEXT_UNCHANGED,
-	THEME,
-	TIME_FORMAT,
-	TITLE,
-	/* Dialogs */
-	CALENDAR,
-	CHECKLIST,
-	DATEBOX,
-	FORM,
-	GAUGE,
-	INFOBOX,
-	INPUTBOX,
-	MENU,
-	MIXEDFORM,
-	MIXEDGAUGE,
-	MSGBOX,
-	PASSWORDBOX,
-	PASSWORDFORM,
-	PAUSE,
-	RADIOLIST,
-	RANGEBOX,
-	TEXTBOX,
-	TIMEBOX,
-	TREEVIEW,
-	YESNO
-};
-
-/* options descriptor */
-static struct option longopts[] = {
-	/* Options */
-	{"alternate-screen",  no_argument,       NULL, ALTERNATE_SCREEN},
-	{"and-dialog",        no_argument,       NULL, AND_DIALOG},
-	{"and-widget",        no_argument,       NULL, AND_DIALOG},
-	{"ascii-lines",       no_argument,       NULL, ASCII_LINES},
-	{"auto-truncate",     no_argument,       NULL, AUTO_TRUNCATE},
-	{"backtitle",         required_argument, NULL, BACKTITLE},
-	{"begin-x",           required_argument, NULL, BEGIN_X},
-	{"begin-y",           required_argument, NULL, BEGIN_Y},
-	{"bikeshed",          no_argument,       NULL, BIKESHED},
-	{"cancel-label",      required_argument, NULL, CANCEL_LABEL},
-	{"clear",             no_argument,       NULL, CLEAR_SCREEN},
-	{"clear-dialog",      no_argument,       NULL, CLEAR_DIALOG},
-	{"clear-screen",      no_argument,       NULL, CLEAR_SCREEN},
-	{"colors",            no_argument,       NULL, COLORS},
-	{"columns-per-row",   required_argument, NULL, COLUMNS_PER_ROW},
-	{"cr-wrap",           no_argument,       NULL, CR_WRAP},
-	{"date-format",       required_argument, NULL, DATE_FORMAT},
-	{"defaultno",         no_argument,       NULL, DEFAULT_NO},
-	{"default-button",    required_argument, NULL, DEFAULT_BUTTON},
-	{"default-item",      required_argument, NULL, DEFAULT_ITEM},
-	{"default-no",        no_argument,       NULL, DEFAULT_NO},
-	{"disable-esc",       no_argument,       NULL, DISABLE_ESC},
-	{"esc-return-cancel", no_argument,       NULL, ESC_RETURNCANCEL},
-	{"exit-label",        required_argument, NULL, EXIT_LABEL},
-	{"extra-button",      no_argument,       NULL, EXTRA_BUTTON},
-	{"extra-label",       required_argument, NULL, EXTRA_LABEL},
-	{"generic-button1",   required_argument, NULL, GENERIC_BUTTON1},
-	{"generic-button2",   required_argument, NULL, GENERIC_BUTTON2},
-	{"help-button",       no_argument,       NULL, HELP_BUTTON},
-	{"help-label",        required_argument, NULL, HELP_LABEL},
-	{"help-print-name",   no_argument,       NULL, HELP_PRINT_NAME},
-	{"help-status",       no_argument,       NULL, HELP_STATUS},
-	{"help-tags",         no_argument,       NULL, HELP_PRINT_NAME},
-	{"hfile",             required_argument, NULL, HFILE},
-	{"hline",             required_argument, NULL, HLINE},
-	{"hmsg",              required_argument, NULL, HMSG},
-	{"ignore",            no_argument,       NULL, IGNORE},
-	{"insecure",          no_argument,       NULL, INSECURE},
-	{"item-bottom-desc",  no_argument,       NULL, ITEM_BOTTOM_DESC},
-	{"item-depth",        no_argument,       NULL, ITEM_DEPTH},
-	{"item-help",         no_argument,       NULL, ITEM_BOTTOM_DESC},
-	{"item-prefix",       no_argument,       NULL, ITEM_PREFIX},
-	{"keep-tite",         no_argument,       NULL, ALTERNATE_SCREEN},
-	{"load-theme",        required_argument, NULL, LOAD_THEME},
-	{"max-input",         required_argument, NULL, MAX_INPUT},
-	{"no-auto-truncate",  no_argument,       NULL, NO_AUTO_TRUNCATE},
-	{"no-cancel",         no_argument,       NULL, NO_CANCEL},
-	{"nocancel",          no_argument,       NULL, NO_CANCEL},
-	{"no-descriptions",   no_argument,       NULL, NO_DESCRIPTIONS},
-	{"no-items",          no_argument,       NULL, NO_DESCRIPTIONS},
-	{"no-label",          required_argument, NULL, CANCEL_LABEL},
-	{"no-lines",          no_argument,       NULL, NO_LINES},
-	{"no-names",          no_argument,       NULL, NO_NAMES},
-	{"no-ok",             no_argument,       NULL, NO_OK},
-	{"nook ",             no_argument,       NULL, NO_OK},
-	{"no-shadow",         no_argument,       NULL, NO_SHADOW},
-	{"no-tags",           no_argument,       NULL, NO_NAMES},
-	{"normal-screen",     no_argument,       NULL, NORMAL_SCREEN},
-	{"ok-label",          required_argument, NULL, OK_LABEL},
-	{"output-fd",         required_argument, NULL, OUTPUT_FD},
-	{"output-separator",  required_argument, NULL, OUTPUT_SEPARATOR},
-	{"print-maxsize",     no_argument,       NULL, PRINT_MAXSIZE},
-	{"print-size",        no_argument,       NULL, PRINT_SIZE},
-	{"print-version",     no_argument,       NULL, PRINT_VERSION},
-	{"quoted",            no_argument,       NULL, QUOTED},
-	{"save-theme",        required_argument, NULL, SAVE_THEME},
-	{"separate-output",   no_argument,       NULL, SEPARATE_OUTPUT},
-	{"separator",         required_argument, NULL, OUTPUT_SEPARATOR},
-	{"shadow",            no_argument,       NULL, SHADOW},
-	{"single-quoted",     no_argument,       NULL, SINGLE_QUOTED},
-	{"sleep",             required_argument, NULL, SLEEP},
-	{"stderr",            no_argument,       NULL, STDERR},
-	{"stdout",            no_argument,       NULL, STDOUT},
-	{"switch-buttons",    no_argument,       NULL, SWITCH_BUTTONS},
-	{"tab-escape",        no_argument,       NULL, TAB_ESCAPE},
-	{"tab-len",           required_argument, NULL, TAB_LEN},
-	{"text-unchanged",    no_argument,       NULL, TEXT_UNCHANGED},
-	{"theme",             required_argument, NULL, THEME},
-	{"time-format",       required_argument, NULL, TIME_FORMAT},
-	{"title",             required_argument, NULL, TITLE},
-	{"yes-label",         required_argument, NULL, OK_LABEL},
-	/* Dialogs */
-	{"calendar",     no_argument, NULL, CALENDAR},
-	{"checklist",    no_argument, NULL, CHECKLIST},
-	{"datebox",      no_argument, NULL, DATEBOX},
-	{"form",         no_argument, NULL, FORM},
-	{"gauge",        no_argument, NULL, GAUGE},
-	{"infobox",      no_argument, NULL, INFOBOX},
-	{"inputbox",     no_argument, NULL, INPUTBOX},
-	{"menu",         no_argument, NULL, MENU},
-	{"mixedform",    no_argument, NULL, MIXEDFORM},
-	{"mixedgauge",   no_argument, NULL, MIXEDGAUGE},
-	{"msgbox",       no_argument, NULL, MSGBOX},
-	{"passwordbox",  no_argument, NULL, PASSWORDBOX},
-	{"passwordform", no_argument, NULL, PASSWORDFORM},
-	{"pause",        no_argument, NULL, PAUSE},
-	{"radiolist",    no_argument, NULL, RADIOLIST},
-	{"rangebox",     no_argument, NULL, RANGEBOX},
-	{"textbox",      no_argument, NULL, TEXTBOX},
-	{"timebox",      no_argument, NULL, TIMEBOX},
-	{"treeview",     no_argument, NULL, TREEVIEW},
-	{"yesno",        no_argument, NULL, YESNO},
-	/* END */
-	{ NULL, 0, NULL, 0}
-};
-
-/* Menus options */
-static bool item_prefix_opt;
-static bool item_bottomdesc_opt;
-static bool item_output_sepnl_opt;
-static bool item_singlequote_opt;
-static bool list_items_on_opt;
-static bool item_help_print_name_opt;
-static bool item_always_quote_opt;
-static bool item_depth_opt;
-static char *item_output_sep_opt;
-static char *item_default_opt;
-/* Date and Time options */
-static char *date_fmt_opt;
-static char *time_fmt_opt;
-/* Forms options */
-static int unsigned max_input_form_opt;
-/* General options */
-static bool esc_return_cancel_opt;
-static bool ignore_opt;
-static int output_fd_opt;
-static int getH_opt;
-static int getW_opt;
-/* Text option */
-static bool cr_wrap_opt;
-static bool tab_escape_opt;
-static bool text_unchanged_opt;
-/* Theme and Screen options*/
-static bool bikeshed_opt;
-static enum bsddialog_default_theme theme_opt;
-static char *backtitle_opt;
-static bool clear_screen_opt;
-static char *loadthemefile;
-static char *savethemefile;
-static const char *screen_mode_opt;
-
-/* Functions */
-#define UNUSED_PAR(x) UNUSED_ ## x __attribute__((__unused__))
-static void custom_text(char *text, char *buf);
-static void usage(void);
-/* Dialogs */
-#define BUILDER_ARGS struct bsddialog_conf *conf, char* text, int rows,        \
-	int cols, int argc, char **argv
-static int calendar_builder(BUILDER_ARGS);
-static int checklist_builder(BUILDER_ARGS);
-static int datebox_builder(BUILDER_ARGS);
-static int form_builder(BUILDER_ARGS);
-static int gauge_builder(BUILDER_ARGS);
-static int infobox_builder(BUILDER_ARGS);
-static int inputbox_builder(BUILDER_ARGS);
-static int menu_builder(BUILDER_ARGS);
-static int mixedform_builder(BUILDER_ARGS);
-static int mixedgauge_builder(BUILDER_ARGS);
-static int msgbox_builder(BUILDER_ARGS);
-static int passwordbox_builder(BUILDER_ARGS);
-static int passwordform_builder(BUILDER_ARGS);
-static int pause_builder(BUILDER_ARGS);
-static int radiolist_builder(BUILDER_ARGS);
-static int rangebox_builder(BUILDER_ARGS);
-static int textbox_builder(BUILDER_ARGS);
-static int timebox_builder(BUILDER_ARGS);
-static int treeview_builder(BUILDER_ARGS);
-static int yesno_builder(BUILDER_ARGS);
-
-/* init, exit and internals */
-static bool in_bsddialog_mode;
-static bool mandatory_dialog;
-static int (*dialogbuilder)(BUILDER_ARGS);
-
-static void exit_error(const char *errstr, bool with_usage)
-{
-	if (in_bsddialog_mode)
-		bsddialog_end();
-
-	printf("Error: %s.\n\n", errstr);
-	if (with_usage) {
-		printf("See \'bsddialog --help\' or \'man 1 bsddialog\' ");
-		printf("for more information.\n");
-	}
-
-	exit (255);
-}
-
-static void sigint_handler(int UNUSED_PAR(sig))
-{
-	bsddialog_end();
-
-	exit(255);
-}
-
-static void start_bsddialog_mode(void)
-{
-	if (in_bsddialog_mode)
-		return;
-
-	if (bsddialog_init() != BSDDIALOG_OK)
-		exit_error(bsddialog_geterror(), false);
-
-	in_bsddialog_mode = true;
-	signal(SIGINT, sigint_handler);
-}
-
-static void error_args(const char *dialog, int argc, char **argv)
-{
-	int i;
-
-	if (in_bsddialog_mode)
-		bsddialog_end();
-
-	printf("Error: %s unexpected argument%s:", dialog,
-	    argc > 1 ? "s" : "");
-	for (i = 0; i < argc; i++)
-		printf(" \"%s\"", argv[i]);
-	printf(".\n\n");
-	printf("See \'bsddialog --help\' or \'man 1 bsddialog\' ");
-	printf("for more information.\n");
-
-	exit (255);
-}
-
-static void usage(void)
-{
-	printf("usage: bsddialog --help\n");
-	printf("       bsddialog --version\n");
-	printf("       bsddialog [--<opt>] --<dialog> <text> <rows> <cols> "
-	    "[<arg>]\n");
-	printf("       bsddialog --<dialog1> ... [--and-dialog --<dialog2> "
-	    "...] ...\n");
-	printf("\n");
-
-	printf("Options:\n");
-	printf(" --alternate-screen, --ascii-lines, --backtitle <backtitle>,"
-	    " --begin-x <x>,\n --begin-y <y>, --bikeshed, --calendar,"
-	    " --cancel-label <label>, --clear-dialog,\n --clear-screen,"
-	    " --colors, --columns-per-row <columns>, --cr-wrap,\n"
-	    " --date-format <format>, --default-button <label>,"
-	    " --default-item <name>,\n --default-no, --disable-esc,"
-	    " --esc-return-cancel, --exit-label <label>,\n --extra-button,"
-	    " --extra-label <label>, --generic-button1 <label>,\n"
-	    " --generic-button2 <label>, --help-button, --help-label <label>,\n"
-	    " --help-print-name, --help-status, --hfile <file>,"
-	    " --hline <string>,\n --hmsg <string>, --ignore, --insecure,"
-	    " --item-bottom-desc, --item-depth,\n --item-prefix,"
-	    " --load-theme <file>, --max-input <size>, --no-cancel,\n"
-	    " --no-descriptions, --no-label <label>, --no-lines, --no-names,"
-	    " --no-ok,\n --no-shadow, --normal-screen, --ok-label <label>,"
-	    " --output-fd <fd>,\n --output-separator <sep>, --print-maxsize,"
-	    " --print-size, --print-version,\n --quoted, --save-theme <file>,"
-	    " --separate-output, --separator <sep>, --shadow,\n"
-	    " --single-quoted, --sleep <secs>, --stderr, --stdout,"
-	    " --tab-escape,\n --tab-len <spaces>, --text-unchanged,"
-	    " --switch-buttons,\n --theme <blackwhite|bsddialog|flat|dialog>,"
-	    " --time-format <format>,\n --title <title>,"
-	    " --yes-label <label>.\n");
-	printf("\n");
-
-	printf("Dialogs:\n");
-	printf(" --calendar <text> <rows> <cols> [<dd> <mm> <yy>]\n");
-	printf(" --checklist <text> <rows> <cols> <menurows> [<name> <desc> "
-	    "<on|off>] ...\n");
-	printf(" --datebox <text> <rows> <cols> [<dd> <mm> <yy>]\n");
-	printf(" --form <text> <rows> <cols> <formrows> [<label> <ylabel> "
-	    "<xlabel> <init> <yfield> <xfield> <fieldlen> <maxletters>] "
-	    "...\n");
-	printf(" --gauge <text> <rows> <cols> [<perc>]\n");
-	printf(" --infobox <text> <rows> <cols>\n");
-	printf(" --inputbox <text> <rows> <cols> [init]\n");
-	printf(" --menu <text> <rows> <cols> <menurows> [<name> <desc>] ...\n");
-	printf(" --mixedform <text> <rows> <cols> <formrows> [<label> <ylabel> "
-	    "<xlabel> <init> <yfield> <xfield> <fieldlen> <maxletters> "
-	    "<0|1|2>] ...\n");
-	printf(" --mixedgauge <text> <rows> <cols> <mainperc> [<minilabel> "
-	    "<miniperc>] ...\n");
-	printf(" --msgbox <text> <rows> <cols>\n");
-	printf(" --passwordbox <text> <rows> <cols> [init]\n");
-	printf(" --passwordform <text> <rows> <cols> <formrows> [<label> "
-	    "<ylabel> <xlabel> <init> <yfield> <xfield> <fieldlen> "
-	    "<maxletters>] ...\n");
-	printf(" --pause <text> <rows> <cols> <secs>\n");
-	printf(" --radiolist <text> <rows> <cols> <menurows> [<name> <desc> "
-	    "<on|off>] ...\n");
-	printf(" --rangebox <text> <rows> <cols> <min> <max> [<init>]\n");
-	printf(" --textbox <file> <rows> <cols>\n");
-	printf(" --timebox <text> <rows> <cols> [<hh> <mm> <ss>]\n");
-	printf(" --treeview <text> <rows> <cols> <menurows> [<depth> <name> "
-	    "<desc> <on|off>] ...\n");
-	printf(" --yesno <text> <rows> <cols>\n");
-	printf("\n");
-
-	printf("See 'man 1 bsddialog' for more information.\n");
-}
-
-static int parseargs(int argc, char **argv, struct bsddialog_conf *conf)
-{
-	int arg, parsed, i;
-	struct winsize ws;
-
-	bsddialog_initconf(conf);
-	conf->key.enable_esc = true;
-	conf->menu.on_without_ok = true;
-	conf->form.value_without_ok = true;
-	conf->button.always_active = true;
-
-	dialogbuilder = NULL;
-
-	backtitle_opt = NULL;
-	theme_opt = -1;
-	output_fd_opt = STDERR_FILENO;
-	ignore_opt = false;
-	cr_wrap_opt = false;
-	tab_escape_opt = false;
-	text_unchanged_opt = false;
-	esc_return_cancel_opt = false;
-	bikeshed_opt = false;
-	savethemefile = NULL;
-	loadthemefile = NULL;
-	clear_screen_opt = false;
-	screen_mode_opt = NULL;
-
-	item_output_sepnl_opt = false;
-	item_singlequote_opt = false;
-	item_prefix_opt = false;
-	item_bottomdesc_opt = false;
-	item_depth_opt = false;
-	list_items_on_opt = false;
-	item_help_print_name_opt = false;
-	item_always_quote_opt = false;
-	item_output_sep_opt = NULL;
-	item_default_opt = NULL;
-
-	date_fmt_opt = NULL;
-	time_fmt_opt = NULL;
-
-	max_input_form_opt = 2048;
-
-	for (i = 0; i < argc; i++) {
-		if (strcmp(argv[i], "--and-dialog") == 0 ||
-		    strcmp(argv[i], "--and-widget") == 0) {
-			argc = i + 1;
-			break;
-		}
-	}
-	parsed = argc;
-	while ((arg = getopt_long(argc, argv, "", longopts, NULL)) != -1) {
-		switch (arg) {
-		/* Options */
-		case ALTERNATE_SCREEN:
-			screen_mode_opt = "smcup";
-			break;
-		case AND_DIALOG:
-			if (dialogbuilder == NULL)
-				exit_error("--and-dialog without previous "
-				    "--<dialog>", true);
-			break;
-		case ASCII_LINES:
-			conf->ascii_lines = true;
-			break;
-		case AUTO_TRUNCATE:
-			conf->auto_truncate = true;
-			break;
-		case BACKTITLE:
-			backtitle_opt = optarg;
-			if (conf->y == BSDDIALOG_CENTER)
-				conf->auto_topmargin = 2;
-			break;
-		case BEGIN_X:
-			conf->x = (int)strtol(optarg, NULL, 10);
-			if (conf->x < BSDDIALOG_CENTER)
-				exit_error("--begin-x < -1", false);
-			break;
-		case BEGIN_Y:
-			conf->y = (int)strtol(optarg, NULL, 10);
-			if (conf->y < BSDDIALOG_CENTER)
-				exit_error("--begin-y < -1", false);
-			conf->auto_topmargin = 0;
-			break;
-		case BIKESHED:
-			bikeshed_opt = true;
-			break;
-		case CANCEL_LABEL:
-			conf->button.cancel_label = optarg;
-			break;
-		case CLEAR_DIALOG:
-			conf->clear = true;
-			break;
-		case CLEAR_SCREEN:
-			mandatory_dialog = false;
-			clear_screen_opt = true;
-			break;
-		case COLORS:
-			conf->text.highlight = true;
-			break;
-		case COLUMNS_PER_ROW:
-			conf->text.cols_per_row =
-			    (u_int)strtoul(optarg, NULL, 10);
-			break;
-		case CR_WRAP:
-			cr_wrap_opt = true;
-			break;
-		case DATE_FORMAT:
-			date_fmt_opt = optarg;
-			break;
-		case DEFAULT_BUTTON:
-			conf->button.default_label = optarg;
-			break;
-		case DEFAULT_ITEM:
-			item_default_opt = optarg;
-			break;
-		case DEFAULT_NO:
-			conf->button.default_cancel = true;
-			break;
-		case DISABLE_ESC:
-			conf->key.enable_esc = false;
-			break;
-		case ESC_RETURNCANCEL:
-			esc_return_cancel_opt = true;
-			break;
-		case EXIT_LABEL:
-			conf->button.ok_label = optarg;
-			break;
-		case EXTRA_BUTTON:
-			conf->button.with_extra = true;
-			break;
-		case EXTRA_LABEL:
-			conf->button.extra_label = optarg;
-			break;
-		case GENERIC_BUTTON1:
-			conf->button.generic1_label = optarg;
-			break;
-		case GENERIC_BUTTON2:
-			conf->button.generic2_label = optarg;
-			break;
-		case HELP_BUTTON:
-			conf->button.with_help = true;
-			break;
-		case HELP_LABEL:
-			conf->button.help_label = optarg;
-			break;
-		case HELP_PRINT_NAME:
-			item_help_print_name_opt = true;
-			break;
-		case HELP_STATUS:
-			list_items_on_opt = true;
-			break;
-		case HFILE:
-			conf->key.f1_file = optarg;
-			break;
-		case HLINE:
-			if (optarg[0] != '\0')
-				conf->bottomtitle = optarg;
-			break;
-		case HMSG:
-			conf->key.f1_message = optarg;
-			break;
-		case IGNORE:
-			ignore_opt = true;
-			break;
-		case INSECURE:
-			conf->form.securech = '*';
-			break;
-		case ITEM_BOTTOM_DESC:
-			item_bottomdesc_opt = true;
-			break;
-		case ITEM_DEPTH:
-			item_depth_opt = true;
-			break;
-		case ITEM_PREFIX:
-			item_prefix_opt = true;
-			break;
-		case LOAD_THEME:
-			loadthemefile = optarg;
-			break;
-		case MAX_INPUT:
-			max_input_form_opt = (u_int)strtoul(optarg, NULL, 10);
-			break;
-		case NO_AUTO_TRUNCATE:
-			conf->auto_truncate = false;
-			break;
-		case NO_CANCEL:
-			conf->button.without_cancel = true;
-			break;
-		case NO_DESCRIPTIONS:
-			conf->menu.no_desc = true;
-			break;
-		case NO_LINES:
-			conf->no_lines = true;
-			break;
-		case NO_NAMES:
-			conf->menu.no_name = true;
-			break;
-		case NO_OK:
-			conf->button.without_ok = true;
-			break;
-		case NO_SHADOW:
-			conf->shadow = false;
-			break;
-		case NORMAL_SCREEN:
-			screen_mode_opt = "rmcup";
-			break;
-		case OK_LABEL:
-			conf->button.ok_label = optarg;
-			break;
-		case OUTPUT_FD:
-			output_fd_opt = (int)strtol(optarg, NULL, 10);
-			break;
-		case OUTPUT_SEPARATOR:
-			item_output_sep_opt = optarg;
-			break;
-		case QUOTED:
-			item_always_quote_opt = true;
-			break;
-		case PRINT_MAXSIZE:
-			mandatory_dialog = false;
-			ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws);
-			dprintf(output_fd_opt, "MaxSize: %d, %d\n",
-			    ws.ws_row, ws.ws_col);
-			break;
-		case PRINT_SIZE:
-			conf->get_height = &getH_opt;
-			conf->get_width = &getW_opt;
-			break;
-		case PRINT_VERSION:
-			mandatory_dialog = false;
-			dprintf(output_fd_opt, "Version: %s\n",
-			    LIBBSDDIALOG_VERSION);
-			break;
-		case SAVE_THEME:
-			mandatory_dialog = false;
-			savethemefile = optarg;
-			break;
-		case SEPARATE_OUTPUT:
-			item_output_sepnl_opt = true;
-			break;
-		case SHADOW:
-			conf->shadow = true;
-			break;
-		case SINGLE_QUOTED:
-			item_singlequote_opt = true;
-			break;
-		case SLEEP:
-			conf->sleep = (u_int)strtoul(optarg, NULL, 10);
-			break;
-		case STDERR:
-			output_fd_opt = STDERR_FILENO;
-			break;
-		case STDOUT:
-			output_fd_opt = STDOUT_FILENO;
-			break;
-		case SWITCH_BUTTONS:
-			conf->button.always_active = false;
-			break;
-		case TAB_ESCAPE:
-			tab_escape_opt = true;
-			break;
-		case TAB_LEN:
-			conf->text.tablen = (u_int)strtoul(optarg, NULL, 10);
-			break;
-		case TEXT_UNCHANGED:
-			text_unchanged_opt = true;
-			break;
-		case THEME:
-			if (strcasecmp(optarg, "bsddialog") == 0)
-				theme_opt = BSDDIALOG_THEME_BSDDIALOG;
-			else if (strcasecmp(optarg, "blackwhite") == 0)
-				theme_opt = BSDDIALOG_THEME_BLACKWHITE;
-			else if (strcasecmp(optarg, "flat") == 0)
-				theme_opt = BSDDIALOG_THEME_FLAT;
-			else if (strcasecmp(optarg, "dialog") == 0)
-				theme_opt = BSDDIALOG_THEME_DIALOG;
-			else
-				exit_error("--theme: <unknown> theme", false);
-			break;
-		case TIME_FORMAT:
-			time_fmt_opt = optarg;
-			break;
-		case TITLE:
-			conf->title = optarg;
-			break;
-		/* Dialogs */
-		case CALENDAR:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --calendar", true);
-			dialogbuilder = calendar_builder;
-			break;
-		case CHECKLIST:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --checklist", true);
-			dialogbuilder = checklist_builder;
-			conf->auto_downmargin = 1;
-			break;
-		case DATEBOX:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --datebox", true);
-			dialogbuilder = datebox_builder;
-			break;
-		case FORM:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --form", true);
-			dialogbuilder = form_builder;
-			conf->auto_downmargin = 1;
-			break;
-		case GAUGE:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --gauge", true);
-			dialogbuilder = gauge_builder;
-			break;
-		case INFOBOX:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --infobox", true);
-			dialogbuilder = infobox_builder;
-			break;
-		case INPUTBOX:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --inputbox", true);
-			dialogbuilder = inputbox_builder;
-			conf->auto_downmargin = 1;
-			break;
-		case MENU:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --menu", true);
-			dialogbuilder = menu_builder;
-			conf->auto_downmargin = 1;
-			break;
-		case MIXEDFORM:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --mixedform", true);
-			dialogbuilder = mixedform_builder;
-			conf->auto_downmargin = 1;
-			break;
-		case MIXEDGAUGE:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --mixedgauge", true);
-			dialogbuilder = mixedgauge_builder;
-			break;
-		case MSGBOX:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --msgbox", true);
-			dialogbuilder = msgbox_builder;
-			break;
-		case PAUSE:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --pause", true);
-			dialogbuilder = pause_builder;
-			break;
-		case PASSWORDBOX:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --passwordbox", true);
-			dialogbuilder = passwordbox_builder;
-			conf->auto_downmargin = 1;
-			break;
-		case PASSWORDFORM:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --passwordform", true);
-			dialogbuilder = passwordform_builder;
-			conf->auto_downmargin = 1;
-			break;
-		case RADIOLIST:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --radiolist", true);
-			dialogbuilder = radiolist_builder;
-			conf->auto_downmargin = 1;
-			break;
-		case RANGEBOX:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --rangebox", true);
-			dialogbuilder = rangebox_builder;
-			break;
-		case TEXTBOX:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --textbox", true);
-			dialogbuilder = textbox_builder;
-			break;
-		case TIMEBOX:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --timebox", true);
-			dialogbuilder = timebox_builder;
-			break;
-		case TREEVIEW:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --treeview", true);
-			dialogbuilder = treeview_builder;
-			conf->auto_downmargin = 1;
-			break;
-		case YESNO:
-			if (dialogbuilder != NULL)
-				exit_error("unexpected --yesno", true);
-			dialogbuilder = yesno_builder;
-			break;
-		default: /* Error */
-			if (ignore_opt == true)
-				break;
-			exit_error("--ignore to continue", true);
-		}
-	}
-
-	return (parsed);
-}
-
-int main(int argc, char *argv[argc])
-{
-	int i, rows, cols, retval, parsed, nargc, firstoptind;
-	char *text, **nargv, *pn;
-	struct bsddialog_conf conf;
-
-	setlocale(LC_ALL, "");
-
-	in_bsddialog_mode = false;
-	mandatory_dialog = true;
-	firstoptind = optind;
-	pn = argv[0];
-	retval = BSDDIALOG_OK;
-
-	for (i = 0; i < argc; i++) {
-		if (strcmp(argv[i], "--version") == 0) {
-			printf("Version: %s\n", LIBBSDDIALOG_VERSION);
-			return (BSDDIALOG_OK);
-		}
-		if (strcmp(argv[i], "--help") == 0) {
-			usage();
-			return (BSDDIALOG_OK);
-		}
-	}
-
-	while (true) {
-		parsed = parseargs(argc, argv, &conf);
-		nargc = argc - parsed;
-		nargv = argv + parsed;
-		argc = parsed - optind;
-		argv += optind;
-
-		if (mandatory_dialog && dialogbuilder == NULL)
-			exit_error("expected a --<dialog>", true);
-
-		if (dialogbuilder == NULL && argc > 0)
-			error_args("(no --<dialog>)", argc, argv);
-
-		/* --print-maxsize or --print-version */
-		if (mandatory_dialog == false && savethemefile == NULL &&
-		    clear_screen_opt == false)
-			return (BSDDIALOG_OK);
-
-		/* --<dialog>, --save-theme or clear-screen */
-		if (dialogbuilder != NULL) {
-			if (argc < 3)
-				exit_error("expected <text> <rows> <cols>",
-				    true);
-			if ((text = strdup(argv[0])) == NULL)
-				exit_error("cannot allocate text", false);
-			if (dialogbuilder != textbox_builder)
-				custom_text(argv[0], text);
-			rows = (int)strtol(argv[1], NULL, 10);
-			cols = (int)strtol(argv[2], NULL, 10);
-			argc -= 3;
-			argv += 3;
-		}
-
-		/* bsddialog terminal mode (first iteration) */
-		start_bsddialog_mode();
-
-		if (screen_mode_opt != NULL) {
-			screen_mode_opt = tigetstr(screen_mode_opt);
-			if (screen_mode_opt != NULL &&
-			    screen_mode_opt != (char*)-1) {
-				tputs(screen_mode_opt, 1, putchar);
-				fflush(stdout);
-				 /* only to refresh, useless in the library */
-				bsddialog_clearterminal();
-			}
-		}
-
-		/* theme */
-		if (theme_opt >= 0)
-			bsddialog_set_default_theme(theme_opt);
-		if (loadthemefile != NULL)
-			loadtheme(loadthemefile);
-		if (bikeshed_opt)
-			bikeshed(&conf);
-		if (savethemefile != NULL)
-			savetheme(savethemefile, LIBBSDDIALOG_VERSION);
-
-		/* backtitle and dialog */
-		if (dialogbuilder == NULL)
-			break;
-		if (backtitle_opt != NULL)
-			if(bsddialog_backtitle(&conf, backtitle_opt))
-				exit_error(bsddialog_geterror(), false);
-		retval = dialogbuilder(&conf, text, rows, cols, argc, argv);
-		free(text);
-		if (retval == BSDDIALOG_ERROR)
-			exit_error(bsddialog_geterror(), false);
-		if (retval == BSDDIALOG_ESC && esc_return_cancel_opt)
-			retval = BSDDIALOG_CANCEL;
-		if (conf.get_height != NULL && conf.get_width != NULL)
-			dprintf(output_fd_opt, "DialogSize: %d, %d\n",
-			    *conf.get_height, *conf.get_width);
-		if (clear_screen_opt)
-			bsddialog_clearterminal();
-		clear_screen_opt = false;
-		/* --and-dialog ends loop with Cancel or ESC */
-		if (retval == BSDDIALOG_CANCEL || retval == BSDDIALOG_ESC)
-			break;
-		argc = nargc;
-		argv = nargv;
-		if (argc <= 0)
-			break;
-		/* prepare next parseargs() call */
-		argc++;
-		argv--;
-		argv[0] = pn;
-		optind = firstoptind;
-	}
-
-	if (in_bsddialog_mode) {
-		/* --clear-screen can be a single option */
-		if (clear_screen_opt)
-			bsddialog_clearterminal();
-		bsddialog_end();
-	}
-	/* end bsddialog terminal mode */
-
-	return (retval);
-}
-
-void custom_text(char *text, char *buf)
-{
-	bool trim, crwrap;
-	int i, j;
-
-	if (strstr(text, "\\n") == NULL) {
-		/* "hasnl" mode */
-		trim = true;
-		crwrap = true;
-	} else {
-		trim = false;
-		crwrap = cr_wrap_opt;
-	}
-	if (text_unchanged_opt) {
-		trim = false;
-		crwrap = true;
-	}
-
-	i = j = 0;
-	while (text[i] != '\0') {
-		switch (text[i]) {
-		case '\\':
-			buf[j] = '\\';
-			switch (text[i+1]) {
-			case 'n': /* implicitly in "hasnl" mode */
-				buf[j] = '\n';
-				i++;
-				if (text[i+1] == '\n')
-					i++;
-				break;
-			case 't':
-				if (tab_escape_opt) {
-					buf[j] = '\t';
-				} else {
-					j++;
-					buf[j] = 't';
-				}
-				i++;
-				break;
-			}
-			break;
-		case '\n':
-			buf[j] = crwrap ? '\n' : ' ';
-			break;
-		case '\t':
-			buf[j] = text_unchanged_opt ? '\t' : ' ';
-			break;
-		default:
-			buf[j] = text[i];
-		}
-		i++;
-		if (!trim || buf[j] != ' ' || j == 0 || buf[j-1] != ' ')
-			j++;
-	}
-	buf[j] = '\0';
-}
-
-/* Dialogs */
-int gauge_builder(BUILDER_ARGS)
-{
-	int output;
-	unsigned int perc;
-
-	perc = 0;
-	if (argc == 1) {
-		perc = (u_int)strtoul(argv[0], NULL, 10);
-		perc = perc > 100 ? 100 : perc;
-	} else if (argc > 1) {
-		error_args("--gauge", argc - 1, argv + 1);
-	}
-
-	output = bsddialog_gauge(conf, text, rows, cols, perc, STDIN_FILENO,
-	    "XXX");
-
-	return (output);
-}
-
-int infobox_builder(BUILDER_ARGS)
-{
-	if (argc > 0)
-		error_args("--infobox", argc, argv);
-
-	return (bsddialog_infobox(conf, text, rows, cols));
-}
-
-int mixedgauge_builder(BUILDER_ARGS)
-{
-	int output, *minipercs;
-	unsigned int i, mainperc, nminibars;
-	const char **minilabels;
-
-	if (argc < 1 || (((argc-1) % 2) != 0) )
-		exit_error("bad --mixedgauge arguments", true);
-
-	mainperc = (u_int)strtoul(argv[0], NULL, 10);
-	mainperc = mainperc > 100 ? 100 : mainperc;
-	argc--;
-	argv++;
-
-	nminibars  = argc / 2;
-	if ((minilabels = calloc(nminibars, sizeof(char*))) == NULL)
-		exit_error("Cannot allocate memory for minilabels", false);
-	if ((minipercs = calloc(nminibars, sizeof(int))) == NULL)
-		exit_error("Cannot allocate memory for minipercs", false);
-
-	for (i = 0; i < nminibars; i++) {
-		minilabels[i] = argv[i * 2];
-		minipercs[i] = (int)strtol(argv[i * 2 + 1], NULL, 10);
-	}
-
-	output = bsddialog_mixedgauge(conf, text, rows, cols, mainperc,
-	    nminibars, minilabels, minipercs);
-
-	return (output);
-}
-
-int msgbox_builder(BUILDER_ARGS)
-{
-	if (argc > 0)
-		error_args("--msgbox", argc, argv);
-
-	return (bsddialog_msgbox(conf, text, rows, cols));
-}
-
-int pause_builder(BUILDER_ARGS)
-{
-	int output;
-	unsigned int secs;
-
-	if (argc == 0)
-		exit_error("--pause missing <seconds>", true);
-	if (argc > 1)
-		error_args("--pause", argc - 1, argv + 1);
-
-	secs = (u_int)strtoul(argv[0], NULL, 10);
-	output = bsddialog_pause(conf, text, rows, cols, secs);
-
-	return (output);
-}
-
-int rangebox_builder(BUILDER_ARGS)
-{
-	int output, min, max, value;
-
-	if (argc < 2)
-		exit_error("--rangebox missing <min> <max> [<init>]", true);
-	if (argc > 3)
-		error_args("--rangebox", argc - 3, argv + 3);
-
-	min = (int)strtol(argv[0], NULL, 10);
-	max = (int)strtol(argv[1], NULL, 10);
-
-	if (argc == 3) {
-		value = (int)strtol(argv[2], NULL, 10);
-		value = value < min ? min : value;
-		value = value > max ? max : value;
-	} else
-		value = min;
-
-	output = bsddialog_rangebox(conf, text, rows, cols, min, max, &value);
-	dprintf(output_fd_opt, "%d", value);
-
-	return (output);
-}
-
-int textbox_builder(BUILDER_ARGS)
-{
-	if (argc > 0)
-		error_args("--textbox", argc, argv);
-
-	return (bsddialog_textbox(conf, text, rows, cols));
-}
-
-int yesno_builder(BUILDER_ARGS)
-{
-	if (argc > 0)
-		error_args("--yesno", argc, argv);
-
-	return (bsddialog_yesno(conf, text, rows, cols));
-}
-
-/* CALENDAR, DATE and TIME */
-static int date(BUILDER_ARGS, bool is_datebox)
-{
-	int ret;
-	unsigned int yy, mm, dd;
-	time_t cal;
-	struct tm *localtm;
-	char stringdate[1024];
-	const char *name;
-
-	name = is_datebox ? "--datebox" : "--calendar";
-	time(&cal);
-	localtm = localtime(&cal);
-	yy = localtm->tm_year + 1900;
-	mm = localtm->tm_mon + 1;
-	dd = localtm->tm_mday;
-
-	if (argc > 3) {
-		error_args(name, argc - 3, argv + 3);
-	} else if (argc == 3) {
-		dd = (u_int)strtoul(argv[0], NULL, 10);
-		mm = (u_int)strtoul(argv[1], NULL, 10);
-		yy = (u_int)strtoul(argv[2], NULL, 10);
-		if (yy < 1900)
-			yy = 1900;
-		/* max yy check is in lib */
-	}
-
-	if (is_datebox)
-		ret = bsddialog_datebox(conf, text, rows, cols, &yy, &mm, &dd);
-	else
-		ret = bsddialog_calendar(conf, text, rows, cols, &yy, &mm, &dd);
-	if (ret != BSDDIALOG_OK)
-		return (ret);
-
-	if (date_fmt_opt != NULL) {
-		time(&cal);
-		localtm = localtime(&cal);
-		localtm->tm_year = yy - 1900;
-		localtm->tm_mon = mm - 1;
-		localtm->tm_mday = dd;
-		strftime(stringdate, 1024, date_fmt_opt, localtm);
-		dprintf(output_fd_opt, "%s", stringdate);
-	} else if (bikeshed_opt && (dd % 2 == 0)) {
-		dprintf(output_fd_opt, "%u/%u/%u", dd, mm, yy);
-	} else {
-		dprintf(output_fd_opt, "%02u/%02u/%u", dd, mm, yy);
-	}
-
-	return (ret);
-}
-
-int calendar_builder(BUILDER_ARGS)
-{
-	if (rows == 2) {
-		/*
-		 * (bsdconfig/share/dialog.subr:1352) f_dialog_calendar_size()
-		 * computes height 2 for `dialog --calendar' in
-		 * (bsdconfig/usermgmt/share/user_input.subr:517)
-		 * f_dialog_input_expire_password() and
-		 * (bsdconfig/usermgmt/share/user_input.subr:660)
-		 * f_dialog_input_expire_account().
-		 * Use height auto-sizing that is min height like dialog,
-		 * documented in bsddialog(1).
-		 */
-		rows = 0;
-	}
-
-	return (date(conf, text, rows, cols, argc, argv, false));
-}
-
-int datebox_builder(BUILDER_ARGS)
-{
-	return (date(conf, text, rows, cols, argc, argv, true));
-}
-
-int timebox_builder(BUILDER_ARGS)
-{
-	int output;
-	unsigned int hh, mm, ss;
-	time_t clock;
-	struct tm *localtm;
-	char stringtime[1024];
-
-	time(&clock);
-	localtm = localtime(&clock);
-	hh = localtm->tm_hour;
-	mm = localtm->tm_min;
-	ss = localtm->tm_sec;
-
-	if (argc > 3) {
-		error_args("--timebox", argc - 3, argv + 3);
-	} else if (argc == 3) {
-		hh = (u_int)strtoul(argv[0], NULL, 10);
-		mm = (u_int)strtoul(argv[1], NULL, 10);
-		ss = (u_int)strtoul(argv[2], NULL, 10);
-	}
-
-	output = bsddialog_timebox(conf, text, rows, cols, &hh, &mm, &ss);
-	if (output != BSDDIALOG_OK)
-		return (output);
-
-	if (time_fmt_opt != NULL) {
-		time(&clock);
-		localtm = localtime(&clock);
-		localtm->tm_hour = hh;
-		localtm->tm_min = mm;
-		localtm->tm_sec = ss;
-		strftime(stringtime, 1024, time_fmt_opt, localtm);
-		dprintf(output_fd_opt, "%s", stringtime);
-	} else if (bikeshed_opt && (ss % 2 == 0)) {
-		dprintf(output_fd_opt, "%u:%u:%u", hh, mm, ss);
-	} else {
-		dprintf(output_fd_opt, "%02u:%02u:%02u", hh, mm, ss);
-	}
-
-	return (output);
-}
-
-/* MENU */
-static void
-get_menu_items(int argc, char **argv, bool setprefix, bool setdepth,
-    bool setname, bool setdesc, bool setstatus, bool sethelp,
-    unsigned int *nitems, struct bsddialog_menuitem **items, int *focusitem)
-{
-	unsigned int i, j, sizeitem;
-
-	*focusitem = -1;
-
-	sizeitem = 0;
-	sizeitem += setprefix ? 1 : 0;
-	sizeitem += setdepth  ? 1 : 0;
-	sizeitem += setname   ? 1 : 0;
-	sizeitem += setdesc   ? 1 : 0;
-	sizeitem += setstatus ? 1 : 0;
-	sizeitem += sethelp   ? 1 : 0;
-	if ((argc % sizeitem) != 0)
-		exit_error("\"menu\" bad arguments items number", true);
-
-	*nitems = argc / sizeitem;
-
-	*items = calloc(*nitems, sizeof(struct bsddialog_menuitem));
-	if (items == NULL)
-		exit_error("cannot allocate memory \"menu\" items", false);
-
-	j = 0;
-	for (i = 0; i < *nitems; i++) {
-		(*items)[i].prefix = setprefix ? argv[j++] : "";
-		(*items)[i].depth = setdepth ?
-		    (u_int)strtoul(argv[j++], NULL, 0) : 0;
-		(*items)[i].name = setname ? argv[j++] : "";
-		(*items)[i].desc = setdesc ? argv[j++] : "";
-		if (setstatus)
-			(*items)[i].on = strcmp(argv[j++], "on") == 0 ?
-			    true : false;
-		else
-			(*items)[i].on = false;
-		(*items)[i].bottomdesc = sethelp ? argv[j++] : "";
-
-		if (item_default_opt != NULL && *focusitem == -1)
-			if (strcmp((*items)[i].name, item_default_opt) == 0)
-				*focusitem = i;
-	}
-}
-
-static void
-print_menu_items(int output, int nitems, struct bsddialog_menuitem *items,
-    int focusitem, bool ismenu)
-{
-	bool sep, sepfirst, seplast, toquote;
-	int i;
-	char quotech;
-	const char *focusname, *sepstr;
-
-	sep = false;
-	quotech = item_singlequote_opt ? '\'' : '"';
-
-	if (output == BSDDIALOG_ERROR || output == BSDDIALOG_CANCEL ||
-	    output == BSDDIALOG_ESC)
-		return;
-
-	if (output == BSDDIALOG_HELP) {
-		dprintf(output_fd_opt, "HELP ");
-
-		if (focusitem >= 0) {
-			focusname = items[focusitem].name;
-			if (item_bottomdesc_opt &&
-			    item_help_print_name_opt == false)
-				focusname = items[focusitem].bottomdesc;
-
-			toquote = false;
-			if (strchr(focusname, ' ') != NULL) {
-				toquote = item_always_quote_opt;
-				if (ismenu == false &&
-				    item_output_sepnl_opt == false)
-					toquote = true;
-			}
-			if (toquote) {
-				dprintf(output_fd_opt, "%c%s%c",
-				    quotech, focusname, quotech);
-			} else
-				dprintf(output_fd_opt, "%s", focusname);
-		}
-
-		if (ismenu || list_items_on_opt == false)
-			return;
-		sep = true;
-	}
-
-	sepfirst = false;
-	if ((sepstr = item_output_sep_opt) == NULL)
-		sepstr = item_output_sepnl_opt ? "\n" : " ";
-	else
-		sepfirst = true;
-
-	seplast = false;
-	if (item_output_sepnl_opt) {
-		sepfirst = false;
-		seplast = true;
-	}
-
-	for (i = 0; i < nitems; i++) {
-		if (items[i].on == false)
-			continue;
-
-		if (sep || sepfirst)
-			dprintf(output_fd_opt, "%s", sepstr);
-		sep = false;
-
-		toquote = false;
-		if (strchr(items[i].name, ' ') != NULL) {
-			toquote = item_always_quote_opt;
-			if (ismenu == false && item_output_sepnl_opt == false)
-				toquote = true;
-		}
-		if (toquote)
-			dprintf(output_fd_opt, "%c%s%c",
-			    quotech, items[i].name, quotech);
-		else
-			dprintf(output_fd_opt, "%s", items[i].name);
-
-		if (seplast)
-			dprintf(output_fd_opt, "%s", sepstr);
-	}
-}
-
-int checklist_builder(BUILDER_ARGS)
-{
-	int output, focusitem;
-	unsigned int menurows, nitems;
-	struct bsddialog_menuitem *items;
-
-	if (argc < 1)
-		exit_error("--checklist missing <menurows>", true);
-	menurows = (u_int)strtoul(argv[0], NULL, 10);
-
-	get_menu_items(argc-1, argv+1, item_prefix_opt, item_depth_opt, true,
-	    true, true, item_bottomdesc_opt, &nitems, &items, &focusitem);
-
-	output = bsddialog_checklist(conf, text, rows, cols, menurows, nitems,
-	    items, &focusitem);
-
-	print_menu_items(output, nitems, items, focusitem, false);
-
-	free(items);
-
-	return (output);
-}
-
-int menu_builder(BUILDER_ARGS)
-{
-	int output, focusitem;
-	unsigned int menurows, nitems;
-	struct bsddialog_menuitem *items;
-
-	if (argc < 1)
-		exit_error("--menu missing <menurows>", true);
-	menurows = (u_int)strtoul(argv[0], NULL, 10);
-
-	get_menu_items(argc-1, argv+1, item_prefix_opt, item_depth_opt, true,
-	    true, false, item_bottomdesc_opt, &nitems, &items, &focusitem);
-
-	output = bsddialog_menu(conf, text, rows, cols, menurows, nitems,
-	    items, &focusitem);
-
-	print_menu_items(output, nitems, items, focusitem, true);
-
-	free(items);
-
-	return (output);
-}
-
-int radiolist_builder(BUILDER_ARGS)
-{
-	int output, focusitem;
-	unsigned int menurows, nitems;
-	struct bsddialog_menuitem *items;
-
-	if (argc < 1)
-		exit_error("--radiolist missing <menurows>", true);
-	menurows = (u_int)strtoul(argv[0], NULL, 10);
-
-	get_menu_items(argc-1, argv+1, item_prefix_opt, item_depth_opt, true,
-	    true, true, item_bottomdesc_opt, &nitems, &items, &focusitem);
-
-	output = bsddialog_radiolist(conf, text, rows, cols, menurows, nitems,
-	    items, &focusitem);
-
-	print_menu_items(output, nitems, items, focusitem, false);
-
-	free(items);
-
-	return (output);
-}
-
-int treeview_builder(BUILDER_ARGS)
-{
-	int output, focusitem;
-	unsigned int menurows, nitems;
-	struct bsddialog_menuitem *items;
-
-	if (argc < 1)
-		exit_error("--treeview missing <menurows>", true);
-	menurows = (u_int)strtoul(argv[0], NULL, 10);
-
-	get_menu_items(argc-1, argv+1, item_prefix_opt, true, true, true, true,
-	    item_bottomdesc_opt, &nitems, &items, &focusitem);
-
-	conf->menu.no_name = true;
-	conf->menu.align_left = true;
-
-	output = bsddialog_radiolist(conf, text, rows, cols, menurows, nitems,
-	    items, &focusitem);
-
-	print_menu_items(output, nitems, items, focusitem, false);
-
-	free(items);
-
-	return (output);
-}
-
-/* FORM */
-static void
-print_form_items(int output, int nitems, struct bsddialog_formitem *items)
-{
-	int i;
-
-	if (output == BSDDIALOG_ERROR)
-		return;
-
-	for (i = 0; i < nitems; i++) {
-		dprintf(output_fd_opt, "%s\n", items[i].value);
-		free(items[i].value);
-	}
-}
-
-int form_builder(BUILDER_ARGS)
-{
-	int output, fieldlen, valuelen;
-	unsigned int i, j, flags, formheight, nitems, sizeitem;
-	struct bsddialog_formitem *items;
-
-	if (argc < 1)
-		exit_error("--form missing <formheight>", true);
-	formheight = (u_int)strtoul(argv[0], NULL, 10);
-
-	argc--;
-	argv++;
-	sizeitem = item_bottomdesc_opt ? 9 : 8;
-	if (argc % sizeitem != 0)
-		exit_error("--form bad number of arguments items", true);
-
-	nitems = argc / sizeitem;
-	if ((items = calloc(nitems, sizeof(struct bsddialog_formitem))) == NULL)
-		exit_error("cannot allocate memory for form items", false);
-	j = 0;
-	for (i = 0; i < nitems; i++) {
-		items[i].label	= argv[j++];
-		items[i].ylabel = (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].xlabel = (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].init	= argv[j++];
-		items[i].yfield	= (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].xfield	= (u_int)strtoul(argv[j++], NULL, 10);
-
-		fieldlen = (int)strtol(argv[j++], NULL, 10);
-		items[i].fieldlen = abs(fieldlen);
-
-		valuelen = (int)strtol(argv[j++], NULL, 10);
-		items[i].maxvaluelen = valuelen == 0 ? abs(fieldlen) : valuelen;
-
-		flags = (fieldlen < 0 ? BSDDIALOG_FIELDREADONLY : 0);
-		items[i].flags = flags;
-
-		items[i].bottomdesc = item_bottomdesc_opt ? argv[j++] : "";
-	}
-
-	output = bsddialog_form(conf, text, rows, cols, formheight, nitems,
-	    items);
-	print_form_items(output, nitems, items);
-	free(items);
-
-	return (output);
-}
-
-int inputbox_builder(BUILDER_ARGS)
-{
-	int output;
-	struct bsddialog_formitem item;
-
-	if (argc > 1)
-		error_args("--inputbox", argc - 1, argv + 1);
-
-	item.label	 = "";
-	item.ylabel	 = 0;
-	item.xlabel	 = 0;
-	item.init	 = argc > 0 ? argv[0] : "";
-	item.yfield	 = 0;
-	item.xfield	 = 0;
-	item.fieldlen    = 1;
-	item.maxvaluelen = max_input_form_opt;
-	item.flags	 = BSDDIALOG_FIELDNOCOLOR;
-	item.flags      |= BSDDIALOG_FIELDCURSOREND;
-	item.flags      |= BSDDIALOG_FIELDEXTEND;
-	item.bottomdesc  = "";
-
-	output = bsddialog_form(conf, text, rows, cols, 1, 1, &item);
-	print_form_items(output, 1, &item);
-
-	return (output);
-}
-
-int mixedform_builder(BUILDER_ARGS)
-{
-	int output;
-	unsigned int i, j, formheight, nitems, sizeitem;
-	struct bsddialog_formitem *items;
-
-	if (argc < 1)
-		exit_error("--mixedform missing <formheight>", true);
-	formheight = (u_int)strtoul(argv[0], NULL, 10);
-
-	argc--;
-	argv++;
-	sizeitem = item_bottomdesc_opt ? 10 : 9;
-	if (argc % sizeitem != 0)
-		exit_error("--mixedform bad number of arguments items", true);
-
-	nitems = argc / sizeitem;
-	if ((items = calloc(nitems, sizeof(struct bsddialog_formitem))) == NULL)
-		exit_error("cannot allocate memory for form items", false);
-	j = 0;
-	for (i = 0; i < nitems; i++) {
-		items[i].label	     = argv[j++];
-		items[i].ylabel      = (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].xlabel      = (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].init	     = argv[j++];
-		items[i].yfield	     = (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].xfield	     = (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].fieldlen    = (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].maxvaluelen = (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].flags       = (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].bottomdesc  = item_bottomdesc_opt ? argv[j++] : "";
-	}
-
-	output = bsddialog_form(conf, text, rows, cols, formheight, nitems,
-	    items);
-	print_form_items(output, nitems, items);
-	free(items);
-
-	return (output);
-}
-
-int passwordbox_builder(BUILDER_ARGS)
-{
-	int output;
-	struct bsddialog_formitem item;
-
-	if (argc > 1)
-		error_args("--passwordbox", argc - 1, argv + 1);
-
-	item.label	 = "";
-	item.ylabel	 = 0;
-	item.xlabel	 = 0;
-	item.init	 = argc > 0 ? argv[0] : "";
-	item.yfield	 = 0;
-	item.xfield	 = 0;
-	item.fieldlen	 = 1;
-	item.maxvaluelen = max_input_form_opt;
-	item.flags       = BSDDIALOG_FIELDHIDDEN;
-	item.flags      |= BSDDIALOG_FIELDNOCOLOR;
-	item.flags      |= BSDDIALOG_FIELDCURSOREND;
-	item.flags      |= BSDDIALOG_FIELDEXTEND;
-	item.bottomdesc  = "";
-
-	output = bsddialog_form(conf, text, rows, cols, 1, 1, &item);
-	print_form_items(output, 1, &item);
-
-	return (output);
-}
-
-int passwordform_builder(BUILDER_ARGS)
-{
-	int output, fieldlen, valuelen;
-	unsigned int i, j, flags, formheight, nitems, sizeitem;
-	struct bsddialog_formitem *items;
-
-	if (argc < 1)
-		exit_error("--passwordform missing <formheight>", true);
-	formheight = (u_int)strtoul(argv[0], NULL, 10);
-
-	argc--;
-	argv++;
-	sizeitem = item_bottomdesc_opt ? 9 : 8;
-	if (argc % sizeitem != 0)
-		exit_error("--passwordform bad arguments items number", true);
-
-	flags = BSDDIALOG_FIELDHIDDEN;
-	nitems = argc / sizeitem;
-	if ((items = calloc(nitems, sizeof(struct bsddialog_formitem))) == NULL)
-		exit_error("cannot allocate memory for form items", false);
-	j = 0;
-	for (i = 0; i < nitems; i++) {
-		items[i].label	= argv[j++];
-		items[i].ylabel = (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].xlabel = (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].init	= argv[j++];
-		items[i].yfield	= (u_int)strtoul(argv[j++], NULL, 10);
-		items[i].xfield	= (u_int)strtoul(argv[j++], NULL, 10);
-
-		fieldlen = (int)strtol(argv[j++], NULL, 10);
-		items[i].fieldlen = abs(fieldlen);
-
-		valuelen = (int)strtol(argv[j++], NULL, 10);
-		items[i].maxvaluelen = valuelen == 0 ? abs(fieldlen) : valuelen;
-
-		flags |= (fieldlen < 0 ? BSDDIALOG_FIELDREADONLY : 0);
-		items[i].flags = flags;
-
-		items[i].bottomdesc  = item_bottomdesc_opt ? argv[j++] : "";
-	}
-
-	output = bsddialog_form(conf, text, rows, cols, formheight, nitems,
-	    items);
-	print_form_items(output, nitems, items);
-	free(items);
-
-	return (output);
-}
diff --git a/contrib/bsddialog/examples_library/calendar.c b/contrib/bsddialog/examples_library/calendar.c
index 33e38c69a81b..5899fc4986fd 100644
--- a/contrib/bsddialog/examples_library/calendar.c
+++ b/contrib/bsddialog/examples_library/calendar.c
@@ -10,7 +10,6 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 #include <time.h>
 
 int main()
@@ -31,25 +30,16 @@ int main()
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "calendar";
 	output = bsddialog_calendar(&conf, "Example", 18, 40, &yy, &mm, &dd);
-
 	bsddialog_end();
-
-	switch (output) {
-	case BSDDIALOG_OK:
-		printf("Date: %u/%u/%u", yy, mm, dd);
-		break;
-	case BSDDIALOG_CANCEL:
-		printf("Cancel");
-		break;
-	case BSDDIALOG_ERROR:
-		printf("Error: %s", bsddialog_geterror());
-		break;
+	if (output == BSDDIALOG_ERROR) {
+		printf("Error: %s\n", bsddialog_geterror());
+		return (1);
 	}
-	printf("\n");
 
-	return (output);
+	printf("Date: %u/%u/%u\n", yy, mm, dd);
+
+	return (0);
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/checklist.c b/contrib/bsddialog/examples_library/checklist.c
index 6d860b91a076..a2b178d14270 100644
--- a/contrib/bsddialog/examples_library/checklist.c
+++ b/contrib/bsddialog/examples_library/checklist.c
@@ -10,7 +10,6 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 
 int main()
 {
@@ -28,27 +27,19 @@ int main()
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "checklist";
 	output = bsddialog_checklist(&conf, "Example", 15, 30, 5, 5, items,
 	    NULL);
-
 	bsddialog_end();
-
 	if (output == BSDDIALOG_ERROR) {
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
 
-	if (output == BSDDIALOG_CANCEL) {
-		printf("Cancel\n");
-		return (0);
-	}
-
 	printf("Checklist:\n");
 	for (i = 0; i < 5; i++)
 		printf(" [%c] %s\n", items[i].on ? 'X' : ' ', items[i].name);
 
-	return (output);
+	return (0);
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/compile b/contrib/bsddialog/examples_library/compile
index 4cb6d23bd6a6..9025f35426d9 100755
--- a/contrib/bsddialog/examples_library/compile
+++ b/contrib/bsddialog/examples_library/compile
@@ -10,7 +10,7 @@
 
 libpath=../lib
 examples="menu checklist radiolist mixedlist theme infobox yesno msgbox \
-	datebox form timebox rangebox pause calendar"
+	datebox form timebox rangebox pause calendar gauge mixedgauge"
 
 rm -f $examples
 
diff --git a/contrib/bsddialog/examples_library/datebox.c b/contrib/bsddialog/examples_library/datebox.c
index 7f0138688d53..e0741319d388 100644
--- a/contrib/bsddialog/examples_library/datebox.c
+++ b/contrib/bsddialog/examples_library/datebox.c
@@ -10,7 +10,6 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 #include <time.h>
 
 int main()
@@ -31,25 +30,15 @@ int main()
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "datebox";
 	output = bsddialog_datebox(&conf, "Example", 9, 35, &yy, &mm, &dd);
-
 	bsddialog_end();
-
-	switch (output) {
-	case BSDDIALOG_OK:
-		printf("Date: %u/%u/%u", yy, mm, dd);
-		break;
-	case BSDDIALOG_CANCEL:
-		printf("Cancel");
-		break;
-	case BSDDIALOG_ERROR:
-		printf("Error: %s", bsddialog_geterror());
-		break;
+	if (output == BSDDIALOG_ERROR) {
+		printf("Error: %s\n", bsddialog_geterror());
+		return (1);
 	}
-	printf("\n");
+	printf("Date: %u/%u/%u\n", yy, mm, dd);
 
-	return (output);
+	return (0);
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/form.c b/contrib/bsddialog/examples_library/form.c
index 4780fb68d121..4c6336610852 100644
--- a/contrib/bsddialog/examples_library/form.c
+++ b/contrib/bsddialog/examples_library/form.c
@@ -12,7 +12,6 @@
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #define H   BSDDIALOG_FIELDHIDDEN
 #define RO  BSDDIALOG_FIELDREADONLY
@@ -37,23 +36,17 @@ int main()
 	bsddialog_initconf(&conf);
 	conf.title = "form";
 	conf.form.securech = '*';
-	output = bsddialog_form(&conf, "Example", 10, 50, 3, 3, items);
+	output = bsddialog_form(&conf, "Example", 10, 50, 3, 3, items, NULL);
 	bsddialog_end();
-
 	if (output == BSDDIALOG_ERROR) {
 		printf("Error: %s", bsddialog_geterror());
 		return (1);
 	}
 
-	if (output == BSDDIALOG_CANCEL) {
-		printf("Cancel\n");
-		return (0);
-	}
-
 	for (i = 0; i < 3; i++) {
 		printf("%s \"%s\"\n", items[i].label, items[i].value);
 		free(items[i].value);
 	}
 
-	return (output);
+	return (0);
 }
diff --git a/contrib/bsddialog/examples_library/gauge.c b/contrib/bsddialog/examples_library/gauge.c
new file mode 100644
index 000000000000..3b38a80f3f2c
--- /dev/null
+++ b/contrib/bsddialog/examples_library/gauge.c
@@ -0,0 +1,57 @@
+/*-
+ * SPDX-License-Identifier: CC0-1.0
+ *
+ * Written in 2023 by Alfonso Sabato Siciliano.
+ * To the extent possible under law, the author has dedicated all copyright
+ * and related and neighboring rights to this software to the public domain
+ * worldwide. This software is distributed without any warranty, see:
+ *   <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+#include <bsddialog.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+static void sender(int fd)
+{
+	int i;
+
+	for (i = 1; i <= 10; i++) {
+		sleep(1);
+		dprintf(fd, "SEP\n");
+		dprintf(fd, "%d\n", i * 10);
+		dprintf(fd, "In Progress... [%d / 10]\n", i);
+		dprintf(fd, "SEP\n");
+	}
+	sleep(1);
+	dprintf(fd, "EOF\n");
+}
+
+int main()
+{
+	int rv, fd[2];
+	struct bsddialog_conf conf;
+
+	/* add checks and sync */
+	pipe(fd);
+	if (fork() == 0) {
+		close(fd[0]);
+		sender(fd[1]);
+		exit (0);
+	}
+	close(fd[1]);
+
+	if (bsddialog_init() == BSDDIALOG_ERROR) {
+		printf("Error: %s\n", bsddialog_geterror());
+		return (1);
+	}
+	bsddialog_initconf(&conf);
+	conf.title = "gauge";
+	rv = bsddialog_gauge(&conf, "Example", 7, 30, 0, fd[0], "SEP", "EOF");
+	bsddialog_end();
+	if(rv == BSDDIALOG_ERROR)
+		printf("Error: %s\n", bsddialog_geterror());
+
+	return (0);
+}
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/infobox.c b/contrib/bsddialog/examples_library/infobox.c
index 7334cd7536bf..bbd7f665d5a6 100644
--- a/contrib/bsddialog/examples_library/infobox.c
+++ b/contrib/bsddialog/examples_library/infobox.c
@@ -10,7 +10,6 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 
 int main()
 {
@@ -21,18 +20,15 @@ int main()
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "infobox";
 	conf.sleep = 3;
 	output = bsddialog_infobox(&conf, "Example\n(3 seconds)", 7, 20);
-
 	bsddialog_end();
-
 	if (output == BSDDIALOG_ERROR) {
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
 
-	return (output);
+	return (0);
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/menu.c b/contrib/bsddialog/examples_library/menu.c
index 044e0030a010..5c4941f6d5de 100644
--- a/contrib/bsddialog/examples_library/menu.c
+++ b/contrib/bsddialog/examples_library/menu.c
@@ -10,7 +10,6 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 
 int main()
 {
@@ -28,26 +27,18 @@ int main()
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "menu";
 	output = bsddialog_menu(&conf, "Example", 15, 30, 5, 5, items, NULL);
-
 	bsddialog_end();
-
 	if (output == BSDDIALOG_ERROR) {
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
 
-	if (output == BSDDIALOG_CANCEL) {
-		printf("Cancel\n");
-		return (0);
-	}
-
 	printf("Menu:\n");
 	for (i = 0; i < 5; i++)
 		printf(" [%c] %s\n", items[i].on ? 'X' : ' ', items[i].name);
 
-	return (output);
+	return (0);
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/mixedgauge.c b/contrib/bsddialog/examples_library/mixedgauge.c
new file mode 100644
index 000000000000..7666867902fb
--- /dev/null
+++ b/contrib/bsddialog/examples_library/mixedgauge.c
@@ -0,0 +1,79 @@
+/*-
+ * SPDX-License-Identifier: CC0-1.0
+ *
+ * Written in 2023 by Alfonso Sabato Siciliano.
+ * To the extent possible under law, the author has dedicated all copyright
+ * and related and neighboring rights to this software to the public domain
+ * worldwide. This software is distributed without any warranty, see:
+ *   <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+#include <bsddialog.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#define NMINIBAR    13
+
+static const char *minilabels[NMINIBAR] = {
+	"Label   1",
+	"Label   2",
+	"Label   3",
+	"Label   4",
+	"Label   5",
+	"Label   6",
+	"Label   7",
+	"Label   8",
+	"Label   9",
+	"Label  10",
+	"Label  11",
+	"Label   X",
+	"Label   Y",
+};
+
+static int minipercs[NMINIBAR] = {
+	BSDDIALOG_MG_SUCCEEDED,
+	BSDDIALOG_MG_FAILED,
+	BSDDIALOG_MG_PASSED,
+	BSDDIALOG_MG_COMPLETED,
+	BSDDIALOG_MG_CHECKED,
+	BSDDIALOG_MG_DONE,
+	BSDDIALOG_MG_SKIPPED,
+	BSDDIALOG_MG_INPROGRESS,
+	BSDDIALOG_MG_BLANK,
+	BSDDIALOG_MG_NA,
+	BSDDIALOG_MG_PENDING,
+	67,
+	0,
+};
+
+static void exit_error()
+{
+	if (bsddialog_inmode())
+		bsddialog_end();
+	printf("Error: %s\n", bsddialog_geterror());
+	exit (1);
+}
+
+int main()
+{
+	int retval, i;
+	struct bsddialog_conf conf;
+
+	if (bsddialog_init() == BSDDIALOG_ERROR)
+		exit_error();
+	bsddialog_initconf(&conf);
+	conf.title = "mixedgauge";
+	for (i = 0; i <= 10; i++) {
+		minipercs[11] += 3;
+		minipercs[12] = i * 10;
+		retval= bsddialog_mixedgauge(&conf, "Example", 20, 40,
+		    50 + i * 5, NMINIBAR, minilabels, minipercs);
+    		if(retval == BSDDIALOG_ERROR)
+			exit_error();
+		sleep(1);
+	}
+	bsddialog_end();
+
+	return (0);
+}
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/mixedlist.c b/contrib/bsddialog/examples_library/mixedlist.c
index 30198d20a155..6d286996931b 100644
--- a/contrib/bsddialog/examples_library/mixedlist.c
+++ b/contrib/bsddialog/examples_library/mixedlist.c
@@ -10,7 +10,6 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 
 int main()
 {
@@ -40,34 +39,26 @@ int main()
 	    { "",  false, 0, "Name 5", "Desc 5", "Bottom Desc 5" }
 	};
 	struct bsddialog_menugroup group[4] = {
-	    { BSDDIALOG_SEPARATOR, 1, sep1  },
-	    { BSDDIALOG_CHECKLIST, 5, check },
-	    { BSDDIALOG_SEPARATOR, 2, sep2  },
-	    { BSDDIALOG_RADIOLIST, 5, radio }
+	    { BSDDIALOG_SEPARATOR, 1, sep1,  0 },
+	    { BSDDIALOG_CHECKLIST, 5, check, 0 },
+	    { BSDDIALOG_SEPARATOR, 2, sep2,  0 },
+	    { BSDDIALOG_RADIOLIST, 5, radio, 0 }
 	};
 
 	if (bsddialog_init() == BSDDIALOG_ERROR) {
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "mixedlist";
 	output = bsddialog_mixedlist(&conf, "Example", 20, 0, 13, 4, group,
 	    NULL, NULL);
-
 	bsddialog_end();
-
 	if (output == BSDDIALOG_ERROR) {
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
 
-	if (output == BSDDIALOG_CANCEL) {
-		printf("Cancel\n");
-		return (0);
-	}
-
 	printf("Mixedlist:\n");
 	for (i = 0; i < 4; i++) {
 		for (j = 0; j < group[i].nitems; j++) {
@@ -83,5 +74,5 @@ int main()
 		}
 	}
 
-	return (output);
-}
\ No newline at end of file
+	return (0);
+}
diff --git a/contrib/bsddialog/examples_library/msgbox.c b/contrib/bsddialog/examples_library/msgbox.c
index 7d14073143ca..988e2976ee8e 100644
--- a/contrib/bsddialog/examples_library/msgbox.c
+++ b/contrib/bsddialog/examples_library/msgbox.c
@@ -10,7 +10,6 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 
 int main()
 {
@@ -21,21 +20,19 @@ int main()
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "msgbox";
 	output = bsddialog_msgbox(&conf, "Example", 7, 20);
-
 	bsddialog_end();
 
 	switch (output) {
 	case BSDDIALOG_ERROR:
 		printf("Error %s\n", bsddialog_geterror());
-		break;
+		return (1);
 	case BSDDIALOG_OK:
-		printf("OK\n");
+		printf("[OK]\n");
 		break;
 	}
 
-	return (output);
+	return (0);
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/pause.c b/contrib/bsddialog/examples_library/pause.c
index 1cd64f24a0cd..fd79d33aa4c0 100644
--- a/contrib/bsddialog/examples_library/pause.c
+++ b/contrib/bsddialog/examples_library/pause.c
@@ -10,38 +10,37 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 
 int main()
 {
 	int output;
+	unsigned int sec;
 	struct bsddialog_conf conf;
 
 	if (bsddialog_init() == BSDDIALOG_ERROR) {
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "pause";
-	output = bsddialog_pause(&conf, "Example", 8, 50, 10);
-
+	sec = 10;
+	output = bsddialog_pause(&conf, "Example", 8, 50, &sec);
 	bsddialog_end();
 
 	switch (output) {
+	case BSDDIALOG_ERROR:
+		printf("Error: %s\n", bsddialog_geterror());
+		return (1);
 	case BSDDIALOG_OK:
-		printf("OK\n");
+		printf("[OK] remaining time: %u\n", sec);
 		break;
 	case BSDDIALOG_CANCEL:
-		printf("Cancel\n");
-		break;
-	case BSDDIALOG_ERROR:
-		printf("Error: %s\n", bsddialog_geterror());
+		printf("[Cancel] remaining time: %u\n", sec);
 		break;
 	case BSDDIALOG_TIMEOUT:
 		printf("Timeout\n");
 		break;
 	}
 
-	return (output);
-}
\ No newline at end of file
+	return (0);
+}
diff --git a/contrib/bsddialog/examples_library/radiolist.c b/contrib/bsddialog/examples_library/radiolist.c
index ac8ed5bb4064..09df32ac2e74 100644
--- a/contrib/bsddialog/examples_library/radiolist.c
+++ b/contrib/bsddialog/examples_library/radiolist.c
@@ -10,7 +10,6 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 
 int main()
 {
@@ -28,26 +27,19 @@ int main()
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "radiolist";
-	output = bsddialog_radiolist(&conf, "Example", 15, 30, 5, 5, items, NULL);
-
+	output = bsddialog_radiolist(&conf, "Example", 15, 30, 5, 5, items,
+	    NULL);
 	bsddialog_end();
-
 	if (output == BSDDIALOG_ERROR) {
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
 
-	if (output == BSDDIALOG_CANCEL) {
-		printf("Cancel\n");
-		return (0);
-	}
-
 	printf("Radiolist:\n");
 	for (i = 0; i < 5; i++)
 		printf(" (%c) %s\n", items[i].on ? '*' : ' ', items[i].name);
 
-	return (output);
+	return (0);
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/rangebox.c b/contrib/bsddialog/examples_library/rangebox.c
index 8e6bf91c35a6..50498c459fc6 100644
--- a/contrib/bsddialog/examples_library/rangebox.c
+++ b/contrib/bsddialog/examples_library/rangebox.c
@@ -10,7 +10,6 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 
 int main()
 {
@@ -21,20 +20,16 @@ int main()
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "rangebox";
 	value = 5;
 	output = bsddialog_rangebox(&conf, "Example", 8, 50, 0, 10, &value);
-
 	bsddialog_end();
-
 	if (output == BSDDIALOG_ERROR) {
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	printf("Value: %d\n", value);
 
-	return (output);
+	return (0);
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/theme.c b/contrib/bsddialog/examples_library/theme.c
index fcc5fd5cc31a..689633e624ed 100644
--- a/contrib/bsddialog/examples_library/theme.c
+++ b/contrib/bsddialog/examples_library/theme.c
@@ -11,64 +11,54 @@
 #include <bsddialog.h>
 #include <bsddialog_theme.h>
 #include <stdio.h>
-#include <string.h>
 
 int main()
 {
 	int output, focusitem;
 	struct bsddialog_conf conf;
 	enum bsddialog_default_theme theme;
-	struct bsddialog_menuitem items[5] = {
-		{"", false, 0, "Flat", "dialog-like",
-		    "BSDDIALOG_THEME_FLAT" },
-		{"", false, 0, "Dialog", "dialog clone",
-		    "BSDDIALOG_THEME_DIALOG" },
-		{"", false, 0, "BSDDialog", "new theme",
-		    "BSDDIALOG_THEME_BSDDIALOG" },
-		{"", false, 0, "BlackWhite","black and white",
-		    "BSDDIALOG_THEME_BLACKWHITE" },
-		{"", false, 0, "Quit", "Exit", "Quit or Cancel to exit" }
+	struct bsddialog_menuitem items[4] = {
+		{"", false, 0, "Flat", "default flat theme",
+		    "enum bsddialog_default_theme BSDDIALOG_THEME_FLAT" },
+		{"", false, 0, "3D", "pseudo 3D theme",
+		    "enum bsddialog_default_theme BSDDIALOG_THEME_3D" },
+		{"", false, 0, "BlackWhite","black and white theme",
+		    "enum bsddialog_default_theme BSDDIALOG_THEME_BLACKWHITE" },
+		{"", false, 0, "Quit", "Exit", "Quit, Cancel or ESC to exit" }
 	};
 
 	if (bsddialog_init() == BSDDIALOG_ERROR) {
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
-
+	conf.ascii_lines = true;
 	bsddialog_backtitle(&conf, "Theme Example");
-
+	bsddialog_initconf(&conf);
+	conf.key.enable_esc = true;
 	conf.title = " Theme ";
 	focusitem = -1;
 	while (true) {
-		output = bsddialog_menu(&conf, "Choose theme", 15, 45, 5, 5,
+		output = bsddialog_menu(&conf, "Choose theme", 15, 45, 4, 4,
 		    items, &focusitem);
 
-		if (output != BSDDIALOG_OK || items[4].on)
+		if (output != BSDDIALOG_OK || items[3].on)
 			break;
 
 		if (items[0].on) {
 			theme = BSDDIALOG_THEME_FLAT;
 			focusitem = 0;
-		}
-		else if (items[1].on) {
-			theme = BSDDIALOG_THEME_DIALOG;
+		} else if (items[1].on) {
+			theme = BSDDIALOG_THEME_3D;
 			focusitem = 1;
-		}
-		else if (items[2].on) {
-			theme = BSDDIALOG_THEME_BSDDIALOG;
-			focusitem = 2;
-		}
-		else if (items[3].on) {
+		} else if (items[2].on) {
 			theme = BSDDIALOG_THEME_BLACKWHITE;
-			focusitem = 3;
+			focusitem = 2;
 		}
-
 		bsddialog_set_default_theme(theme);
 	}
 
 	bsddialog_end();
 
-	return (output);
+	return (0);
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/timebox.c b/contrib/bsddialog/examples_library/timebox.c
index f06986423558..a9354c99c9be 100644
--- a/contrib/bsddialog/examples_library/timebox.c
+++ b/contrib/bsddialog/examples_library/timebox.c
@@ -10,7 +10,6 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 #include <time.h>
 
 int main()
@@ -31,24 +30,15 @@ int main()
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "timebox";
 	output = bsddialog_timebox(&conf, "Example", 9, 35, &hh, &mm, &ss);
-
 	bsddialog_end();
-
-	switch (output) {
-	case BSDDIALOG_OK:
-		printf("Time: [%u:%u:%u]\n", hh, mm, ss);
-		break;
-	case BSDDIALOG_CANCEL:
-		printf("Cancel\n");
-		break;
-	case BSDDIALOG_ERROR:
+	if (output == BSDDIALOG_ERROR) {
 		printf("Error: %s\n", bsddialog_geterror());
-		break;
+		return (1);
 	}
+	printf("Time: %u:%u:%u\n", hh, mm, ss);
 
-	return (output);
+	return (0);
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_library/yesno.c b/contrib/bsddialog/examples_library/yesno.c
index 364a6c77fc26..36cb59fa013b 100644
--- a/contrib/bsddialog/examples_library/yesno.c
+++ b/contrib/bsddialog/examples_library/yesno.c
@@ -10,7 +10,6 @@
 
 #include <bsddialog.h>
 #include <stdio.h>
-#include <string.h>
 
 int main()
 {
@@ -21,24 +20,22 @@ int main()
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
-
 	bsddialog_initconf(&conf);
 	conf.title = "yesno";
 	output = bsddialog_yesno(&conf, "Example", 7, 25);
-
 	bsddialog_end();
 
 	switch (output) {
 	case BSDDIALOG_ERROR:
 		printf("Error %s\n", bsddialog_geterror());
-		break;
+		return (1);
 	case BSDDIALOG_YES:
-		printf("YES\n");
+		printf("[YES]\n");
 		break;
 	case BSDDIALOG_NO:
-		printf("NO\n");
+		printf("[NO]\n");
 		break;
 	}
 
-	return (output);
+	return (0);
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/examples_utility/checklist.sh b/contrib/bsddialog/examples_utility/checklist.sh
index fefabc282c80..7ff525cf765d 100755
--- a/contrib/bsddialog/examples_utility/checklist.sh
+++ b/contrib/bsddialog/examples_utility/checklist.sh
@@ -15,11 +15,11 @@
 : ${BSDDIALOG_ESC=5}
 
 ITEMS=$(./bsddialog --title " checklist " --checklist "Hello World!" 15 30 5 \
-	"Tag 1"	"DESC 1 xyz" on  \
-	"Tag 2"	"DESC 2 xyz" off \
-	"Tag 3"	"DESC 3 xyz" on  \
-	"Tag 4"	"DESC 4 xyz" off \
-	"Tag 5"	"DESC 5 xyz" on  \
+	"1 Name"  "DESC 1 xyz" on  \
+	"2 Name"  "DESC 2 xyz" off \
+	"3 Name"  "DESC 3 xyz" on  \
+	"4 Name"  "DESC 4 xyz" off \
+	"5 Name"  "DESC 5 xyz" on  \
 3>&1 1>&2 2>&3 3>&-)
 
 case $? in
@@ -27,12 +27,12 @@ case $? in
 		exit 1
 	;;
 	$BSDDIALOG_ESC )
-		echo "[ESC] focus: $ITEMS"
+		echo "[ESC]"
 	;;
 	$BSDDIALOG_CANCEL )
-		echo "[Cancel] focus: $ITEMS"
+		echo "[Cancel]"
 	;;
 	$BSDDIALOG_OK )
-		echo "[OK] Selected: $ITEMS"
+		echo "[OK] $ITEMS"
 	;;
 esac
diff --git a/contrib/bsddialog/examples_utility/datebox.sh b/contrib/bsddialog/examples_utility/datebox.sh
new file mode 100755
index 000000000000..bea4559dfbec
--- /dev/null
+++ b/contrib/bsddialog/examples_utility/datebox.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+#-
+# SPDX-License-Identifier: CC0-1.0
+#
+# Written in 2023 by Alfonso Sabato Siciliano.
+#
+# To the extent possible under law, the author has dedicated all copyright
+# and related and neighboring rights to this software to the public domain
+# worldwide. This software is distributed without any warranty, see:
+#	<http://creativecommons.org/publicdomain/zero/1.0/>.
+
+: ${BSDDIALOG_ERROR=255}
+: ${BSDDIALOG_OK=0}
+: ${BSDDIALOG_CANCEL=1}
+: ${BSDDIALOG_ESC=5}
+
+DATE=$(./bsddialog --title " datebox " --date-format "%x" \
+	--datebox "Hello World!" 9 30 \
+3>&1 1>&2 2>&3 3>&-)
+
+case $? in
+	$BSDDIALOG_ERROR )
+		exit 1
+	;;
+	$BSDDIALOG_ESC )
+		echo "[ESC]"
+	;;
+	$BSDDIALOG_CANCEL )
+		echo "[Cancel]"
+	;;
+	$BSDDIALOG_OK )
+		echo "[OK] $DATE"
+	;;
+esac
diff --git a/contrib/bsddialog/examples_utility/form.sh b/contrib/bsddialog/examples_utility/form.sh
index 783993d3db30..ee25fa9cf352 100755
--- a/contrib/bsddialog/examples_utility/form.sh
+++ b/contrib/bsddialog/examples_utility/form.sh
@@ -33,8 +33,6 @@ case $? in
 		echo "[Cancel]"
 	;;
 	$BSDDIALOG_OK )
-		echo "[OK]"
+		echo "[OK] $FORMS"
 	;;
 esac
-
-echo "$FORMS"
diff --git a/contrib/bsddialog/examples_utility/infobox.sh b/contrib/bsddialog/examples_utility/infobox.sh
index ff39ad4d5f0e..b782e8cbf69e 100755
--- a/contrib/bsddialog/examples_utility/infobox.sh
+++ b/contrib/bsddialog/examples_utility/infobox.sh
@@ -9,4 +9,4 @@
 # worldwide. This software is distributed without any warranty, see:
 #	<http://creativecommons.org/publicdomain/zero/1.0/>.
 
-./bsddialog --sleep 3 --title " infobox " --infobox "Hello World!\n3 secs" 6 20
+./bsddialog --normal-screen --title " infobox " --infobox "Hello World!" 6 20
diff --git a/contrib/bsddialog/examples_utility/inputbox.sh b/contrib/bsddialog/examples_utility/inputbox.sh
index a359a3b8e833..756aec3c0241 100755
--- a/contrib/bsddialog/examples_utility/inputbox.sh
+++ b/contrib/bsddialog/examples_utility/inputbox.sh
@@ -28,9 +28,6 @@ case $? in
 		echo "[Cancel]"
 	;;
 	$BSDDIALOG_OK )
-		echo "[OK]"
+		echo "[OK] $FORM"
 	;;
 esac
-
-echo "$FORM"
-
diff --git a/contrib/bsddialog/examples_utility/menu.sh b/contrib/bsddialog/examples_utility/menu.sh
index 002a82f6a870..5b2f090037d8 100755
--- a/contrib/bsddialog/examples_utility/menu.sh
+++ b/contrib/bsddialog/examples_utility/menu.sh
@@ -15,10 +15,11 @@
 : ${BSDDIALOG_ESC=5}
 
 ITEM=$(./bsddialog --title " menu " --menu "Hello World!" 15 30 5 \
-	"Tag  1"  "DESC  1  xyz" \
-	"Tag  2"  "DESC  2  xyz" \
-	"Tag  3"  "DESC  3  xyz" \
-	"Tag  4"  "DESC  4  xyz" \
+	"1 Name"  "DESC  1  xyz" \
+	"2 Name"  "DESC  2  xyz" \
+	"3 Name"  "DESC  3  xyz" \
+	"4 Name"  "DESC  4  xyz" \
+	"5 Name"  "DESC  5  xyz" \
 3>&1 1>&2 2>&3 3>&-)
 
 case $? in
@@ -26,10 +27,10 @@ case $? in
 		exit 1
 	;;
 	$BSDDIALOG_ESC )
-		echo "[ESC] $ITEM"
+		echo "[ESC]"
 	;;
 	$BSDDIALOG_CANCEL )
-		echo "[Cancel] $ITEM"
+		echo "[Cancel]"
 	;;
 	$BSDDIALOG_OK )
 		echo "[OK] $ITEM"
diff --git a/contrib/bsddialog/examples_utility/mixedform.sh b/contrib/bsddialog/examples_utility/mixedform.sh
index 8a96fa8d9e72..6b690e7e5b8c 100755
--- a/contrib/bsddialog/examples_utility/mixedform.sh
+++ b/contrib/bsddialog/examples_utility/mixedform.sh
@@ -32,8 +32,6 @@ case $? in
 		echo "[Cancel]"
 	;;
 	$BSDDIALOG_OK )
-		echo "[OK]"
+		echo "[OK] $FORMS"
 	;;
 esac
-
-echo "$FORMS"
diff --git a/contrib/bsddialog/examples_utility/mixedgauge.sh b/contrib/bsddialog/examples_utility/mixedgauge.sh
index e98ff70614db..aa4ff2910cd9 100755
--- a/contrib/bsddialog/examples_utility/mixedgauge.sh
+++ b/contrib/bsddialog/examples_utility/mixedgauge.sh
@@ -10,11 +10,11 @@
 #	<http://creativecommons.org/publicdomain/zero/1.0/>.
 
 perc=0
+mainperc=50
 while [ $perc -le 100 ]
 do
 	./bsddialog --sleep 1 --title " mixedgauge "    \
-		--mixedgauge "Example..." 20 45  $perc \
-		"(Hidden)"   " -9"  \
+		--mixedgauge "Example..." 20 45  $mainperc \
 		"Label  1"   " -1"  \
 		"Label  2"   " -2"  \
 		"Label  3"   " -3"  \
@@ -23,9 +23,11 @@ do
 		"Label  6"   " -6"  \
 		"Label  7"   " -7"  \
 		"Label  8"   " -8"  \
-		"Label  9"   " -10" \
-		"Label 10"   " -11" \
+		"Label  9"   " -9"  \
+		"Label 10"   " -10" \
+		"Label 11"   " -11" \
 		"Label  X"   $perc
 
 	perc=`expr $perc + 20`
+	mainperc=`expr $mainperc + 10`
 done
diff --git a/contrib/bsddialog/examples_utility/passwordbox.sh b/contrib/bsddialog/examples_utility/passwordbox.sh
index 0f93a13c877c..b43ef6f6b994 100755
--- a/contrib/bsddialog/examples_utility/passwordbox.sh
+++ b/contrib/bsddialog/examples_utility/passwordbox.sh
@@ -29,8 +29,6 @@ case $? in
 		echo "[Cancel]"
 	;;
 	$BSDDIALOG_OK )
-		echo "[OK]"
+		echo "[OK] $FORM"
 	;;
 esac
-
-echo "$FORM"
diff --git a/contrib/bsddialog/examples_utility/passwordform.sh b/contrib/bsddialog/examples_utility/passwordform.sh
index 9bfe11a28645..874a185ee66f 100755
--- a/contrib/bsddialog/examples_utility/passwordform.sh
+++ b/contrib/bsddialog/examples_utility/passwordform.sh
@@ -34,8 +34,6 @@ case $? in
 		echo "[Cancel]"
 	;;
 	$BSDDIALOG_OK )
-		echo "[OK]"
+		echo "[OK] $FORMS"
 	;;
 esac
-
-echo "$FORMS"
diff --git a/contrib/bsddialog/examples_utility/radiolist.sh b/contrib/bsddialog/examples_utility/radiolist.sh
index 9de483369c75..359473abf35e 100755
--- a/contrib/bsddialog/examples_utility/radiolist.sh
+++ b/contrib/bsddialog/examples_utility/radiolist.sh
@@ -15,11 +15,11 @@
 : ${BSDDIALOG_ESC=5}
 
 ITEM=$(./bsddialog --title " radiolist " --radiolist "Hello World!" 15 30 5 \
-	"Tag 1"  "DESC 1 xyz"  off \
-	"Tag 2"  "DESC 2 xyz"  off \
-	"Tag 3"  "DESC 3 xyz"  on  \
-	"Tag 4"  "DESC 4 xyz"  off \
-	"Tag 5"  "DESC 5 xyz"  off \
+	"1 Name"  "DESC 1 xyz"  off \
+	"2 Name"  "DESC 2 xyz"  off \
+	"3 Name"  "DESC 3 xyz"  on  \
+	"4 Name"  "DESC 4 xyz"  off \
+	"5 Name"  "DESC 5 xyz"  off \
 3>&1 1>&2 2>&3 3>&-)
 
 case $? in
@@ -27,14 +27,12 @@ case $? in
 		exit 1
 	;;
 	$BSDDIALOG_ESC )
-		echo "[ESC] focus "
+		echo "[ESC]"
 	;;
 	$BSDDIALOG_CANCEL )
-		echo "[Cancel] focus "
+		echo "[Cancel]"
 	;;
 	$BSDDIALOG_OK )
-		echo "[OK]"
+		echo "[OK] $ITEM"
 	;;
 esac
-
-echo "$ITEM"
diff --git a/contrib/bsddialog/examples_utility/rangebox.sh b/contrib/bsddialog/examples_utility/rangebox.sh
new file mode 100644
index 000000000000..9b3213d8acad
--- /dev/null
+++ b/contrib/bsddialog/examples_utility/rangebox.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+#-
+# SPDX-License-Identifier: CC0-1.0
+#
+# Written in 2023 by Alfonso Sabato Siciliano.
+#
+# To the extent possible under law, the author has dedicated all copyright
+# and related and neighboring rights to this software to the public domain
+# worldwide. This software is distributed without any warranty, see:
+#	<http://creativecommons.org/publicdomain/zero/1.0/>.
+
+: ${BSDDIALOG_ERROR=255}
+: ${BSDDIALOG_OK=0}
+: ${BSDDIALOG_CANCEL=1}
+: ${BSDDIALOG_ESC=5}
+
+VALUE=$(./bsddialog --title " rangebox " --rangebox "Hello World!" 7 35 0 10 5 \
+3>&1 1>&2 2>&3 3>&-)
+
+case $? in
+	$BSDDIALOG_ERROR )
+		exit 1
+	;;
+	$BSDDIALOG_ESC )
+		echo "[ESC]"
+	;;
+	$BSDDIALOG_CANCEL )
+		echo "[Cancel]"
+	;;
+	$BSDDIALOG_OK )
+		echo "[OK] Value: $VALUE"
+	;;
+esac
diff --git a/contrib/bsddialog/lib/GNUMakefile b/contrib/bsddialog/lib/GNUmakefile
similarity index 65%
rename from contrib/bsddialog/lib/GNUMakefile
rename to contrib/bsddialog/lib/GNUmakefile
index 3c31c78fdf88..7c7a9bc25ee4 100644
--- a/contrib/bsddialog/lib/GNUMakefile
+++ b/contrib/bsddialog/lib/GNUmakefile
@@ -3,16 +3,19 @@
 #
 # Written in 2021 by Alfonso Sabato Siciliano
 
-VERSION = 0.4
 LIBRARY = bsddialog
 LIBRARY_SO = lib${LIBRARY:=.so}
 HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h
-SOURCES = barbox.c calendarbox.c formbox.c infobox.c libbsddialog.c \
-	lib_util.c menubox.c messagebox.c textbox.c theme.c timebox.c
+SOURCES = barbox.c datebox.c formbox.c libbsddialog.c lib_util.c \
+	menubox.c messagebox.c textbox.c theme.c timebox.c
 OBJECTS = $(SOURCES:.c=.o)
-CFLAGS = -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE -D_GNU_SOURCE -Wall -Wextra \
-	-Wno-implicit-fallthrough -Werror -fpic
-LDFLAGS = -lncursesw -ltinfo
+
+ifneq ($(ENABLEDEBUG),)
+CFLAGS += -g
+endif
+CFLAGS += -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE -D_GNU_SOURCE \
+	-Wall -Wextra -Werror -fpic
+LDFLAGS += -lncursesw -ltinfo
 LIBFLAG = -shared
 
 RM = rm -f
diff --git a/contrib/bsddialog/lib/Makefile b/contrib/bsddialog/lib/Makefile
index 0f536fb38743..252b33f79848 100644
--- a/contrib/bsddialog/lib/Makefile
+++ b/contrib/bsddialog/lib/Makefile
@@ -3,39 +3,27 @@
 #
 # Written in 2021 by Alfonso Sabato Siciliano
 
-VERSION = 0.4
 LIBRARY = bsddialog
 LIBRARY_SO = lib${LIBRARY:=.so}
 LIBRARY_A = lib${LIBRARY:=.a}
 HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h
-SOURCES = barbox.c calendarbox.c formbox.c infobox.c libbsddialog.c \
-	lib_util.c menubox.c messagebox.c textbox.c theme.c timebox.c
+SOURCES = barbox.c datebox.c formbox.c libbsddialog.c lib_util.c \
+	menubox.c messagebox.c textbox.c theme.c timebox.c
 OBJECTS = ${SOURCES:.c=.o}
-CFLAGS += -D_XOPEN_SOURCE_EXTENDED -fPIC -Wall -Wextra
-LDFLAGS += -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
-	-Wl,--warn-shared-textrel -Wl,-soname,${LIBRARY_SO}.${VERSION} \
-	-L/usr/lib -lncursesw -ltinfow
 
 .if defined(DEBUG)
-# `make -DDEBUG`
-CFLAGS = -g -D_XOPEN_SOURCE_EXTENDED -fPIC -Wall -Wextra
-.else
-CFLAGS += -std=gnu99 -fstack-protector-strong
+CFLAGS += -g
 .endif
+CFLAGS += -D_XOPEN_SOURCE_EXTENDED -fPIC -Wall -Wextra -std=gnu99 \
+	-fstack-protector-strong
+LDFLAGS += -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
+	-Wl,--warn-shared-textrel -Wl,-soname,${LIBRARY_SO}.${VERSION} \
+	-L/usr/lib -lncursesw -ltinfow
 
-LOCALBASE = /usr/local
 LN = ln -s -f
 RM = rm -f
-CP = cp
-GZIP = gzip -cn
-LDCONFIG = /sbin/ldconfig -m
-MAN = ${OUTPUT}.3
-GZIP = gzip -cn
-MANDIR = ${LOCALBASE}/share/man/man3
-INSTALL = install
-RM = rm -f
 
-all : man ${LIBRARY}
+all : ${LIBRARY}
 
 ${LIBRARY}: ${LIBRARY_SO} ${LIBRARY_A}
 
@@ -52,24 +40,5 @@ ${LIBRARY_A}: ${OBJECTS}
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
-man:
-	${GZIP} ${LIBRARY}.3 > ${LIBRARY}.3.gz
-
 clean:
 	${RM} ${LIBRARY_SO}* *.o *~ *.gz ${LIBRARY_A}
-
-
-install:
-	${INSTALL} -m 644 ${HEADERS} ${LOCALBASE}/include
-	${INSTALL} -m 644 -s ${LIBRARY_SO}.${VERSION} ${LOCALBASE}/lib/
-	${INSTALL} -l rs ${LOCALBASE}/lib/${LIBRARY_SO}.${VERSION} ${LOCALBASE}/lib/${LIBRARY_SO}
-	${INSTALL} -m 644 ${LIBRARY_A} ${LOCALBASE}/lib
-	${LDCONFIG} ${LOCALBASE}/lib
-	${INSTALL} -m 644 ${LIBRARY}.3.gz ${MANDIR}
-
-unistall:
-	${RM} ${LOCALBASE}/include/${LIBRARY}*.h
-	${RM} ${LOCALBASE}/lib/${LIBRARY_SO}
-	${RM} ${LOCALBASE}/lib/${LIBRARY_SO}.${VERSION}
-	${LDCONFIG} ${LOCALBASE}/lib
-	${RM} ${MANDIR}/${LIBRARY}.3.gz
diff --git a/contrib/bsddialog/lib/barbox.c b/contrib/bsddialog/lib/barbox.c
index e0ff4157336e..7db65644becd 100644
--- a/contrib/bsddialog/lib/barbox.c
+++ b/contrib/bsddialog/lib/barbox.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,9 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
-
-#include <ctype.h>
 #include <curses.h>
 #include <stdlib.h>
 #include <string.h>
@@ -39,139 +36,138 @@
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
-#define BARPADDING     2
-#define MINBARLEN      15
-#define MINBARWIDTH    (2 + 2 * BARPADDING + MINBARLEN)
-#define MINMGBARLEN    18
-#define MINMGBARWIDTH  (2 + 2 * BARPADDING + MINMGBARLEN)
+#define BARPADDING   2  /* widget border | BARPADDING | box bar */
+#define BOXBORDERS   2
+#define MIN_WBAR     15
+#define MIN_WBOX     (BARPADDING + BOXBORDERS + MIN_WBAR + BARPADDING)
+#define MIN_WMGBAR   18
+#define MIN_WMGBOX   (BARPADDING + BOXBORDERS + MIN_WMGBAR + BARPADDING)
+#define HBOX         3
+#define WBOX(d)      ((d)->w - BORDERS - BARPADDING - BARPADDING)
+#define WBAR(d)      (WBOX(d) - BOXBORDERS)
 
 bool bsddialog_interruptprogview;
 bool bsddialog_abortprogview;
-int  bsddialog_total_progview;
-
-static void
-draw_bar(WINDOW *win, int y, int x, int barlen, int perc, bool withlabel,
-    int label)
+long long int bsddialog_total_progview;
+
+static const char states[12][14] = {
+	"  Succeeded  ", /* -1  */
+	"   Failed    ", /* -2  */
+	"   Passed    ", /* -3  */
+	"  Completed  ", /* -4  */
+	"   Checked   ", /* -5  */
+	"    Done     ", /* -6  */
+	"   Skipped   ", /* -7  */
+	" In Progress ", /* -8  */
+	"(blank)      ", /* -9  */
+	"     N/A     ", /* -10 */
+	"   Pending   ", /* -11 */
+	"   UNKNOWN   ", /* < -11, no API */
+};
+
+struct bar {
+	bool toupdate;
+	WINDOW *win;
+	int y;           /* bar y in win */
+	int x;           /* bar x in win */
+	int w;           /* width in win */
+	int perc;        /* barlen = (w * perc) / 100 */
+	const char* fmt; /* format for label */
+	int label;       /* rangebox and pause perc!=label */
+};
+
+static void draw_bar(struct bar *b)
 {
-	int i, blue_x, color, stringlen;
-	char labelstr[128];
-
-	blue_x = perc > 0 ? (perc * barlen) / 100 : -1;
-
-	wmove(win, y, x);
-	for (i = 0; i < barlen; i++) {
-		color = (i <= blue_x) ? t.bar.f_color : t.bar.color;
-		wattron(win, color);
-		waddch(win, ' ');
-		wattroff(win, color);
-	}
-
-	if (withlabel)
-		sprintf(labelstr, "%d", label);
-	else
-		sprintf(labelstr, "%3d%%", perc);
-	stringlen = (int)strlen(labelstr); /* number, always 1-byte-ch string */
-	wmove(win, y, x + barlen/2 - stringlen/2);
-	for (i = 0; i < stringlen; i++) {
-		color = (blue_x + 1 <= barlen/2 - stringlen/2 + i ) ?
-		    t.bar.color : t.bar.f_color;
-		wattron(win, color);
-		waddch(win, labelstr[i]);
-		wattroff(win, color);
-	}
-}
-
-static int
-bar_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w,
-    const char *text, struct buttons *bs)
-{
-	int htext, wtext;
-
-	if (cols == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_AUTOSIZE) {
-		if (text_size(conf, rows, cols, text, bs, 3, MINBARWIDTH,
-		    &htext, &wtext) != 0)
-			return (BSDDIALOG_ERROR);
-	}
-
-	if (cols == BSDDIALOG_AUTOSIZE)
-		*w = widget_min_width(conf, wtext, MINBARWIDTH, bs);
-
-	if (rows == BSDDIALOG_AUTOSIZE)
-		*h = widget_min_height(conf, htext, 3 /* bar */, bs != NULL);
-
-	return (0);
+	int barlen, xlabel;
+	chtype ch;
+	char label[128];
+
+	barlen = b->perc > 0 ? (b->perc * b->w) / 100 : 0;
+
+	ch = ' ' | t.bar.f_color;
+	mvwhline(b->win, b->y, b->x, ch, barlen);
+	ch = ' ' | t.bar.color;
+	mvwhline(b->win, b->y, b->x + barlen, ch, b->w - barlen);
+
+	sprintf(label, b->fmt, b->label);
+	xlabel = b->x + b->w/2 - (int)strlen(label)/2; /* 1-byte-char string */
+	wattron(b->win, t.bar.color);   /* x+barlen < xlabel */
+	mvwaddstr(b->win, b->y, xlabel, label);
+	wattroff(b->win, t.bar.color);
+	wattron(b->win, t.bar.f_color); /* x+barlen >= xlabel */
+	mvwaddnstr(b->win, b->y, xlabel, label, MAX((b->x+barlen) - xlabel, 0));
+	wattroff(b->win, t.bar.f_color);
+
+	if (b->toupdate)
+		wnoutrefresh(b->win);
+	b->toupdate = false;
 }
 
-static int
-bar_checksize(int rows, int cols, struct buttons *bs)
+static void update_barbox(struct dialog *d, struct bar *b, bool buttons)
 {
-	int minheight, minwidth;
-
-	minwidth = 0;
-	if (bs != NULL) /* gauge has not buttons */
-		minwidth = buttons_min_width(*bs);
-
-	minwidth = MAX(minwidth, MINBARWIDTH);
-	minwidth += VBORDERS;
-
-	if (cols < minwidth)
-		RETURN_ERROR("Few cols to draw bar and/or buttons");
+	int y;
 
-	minheight = HBORDERS + 3;
-	if (bs != NULL)
-		minheight += 2;
-	if (rows < minheight)
-		RETURN_ERROR("Few rows to draw bar");
-
-	return (0);
+	y = d->y + d->h - BORDER - HBOX;
+	if (buttons)
+		y -= HBUTTONS;
+	update_box(d->conf, b->win, y, d->x + BORDER + BARPADDING, HBOX,
+	    WBOX(d), RAISED);
 }
 
 int
 bsddialog_gauge(struct bsddialog_conf *conf, const char *text, int rows,
-    int cols, unsigned int perc, int fd, const char *sep)
+    int cols, unsigned int perc, int fd, const char *sep, const char *end)
 {
 	bool mainloop;
-	int y, x, h, w, fd2;
+	int fd2;
 	FILE *input;
-	WINDOW *widget, *textpad, *bar, *shadow;
 	char inputbuf[2048], ntext[2048], *pntext;
+	struct bar b;
+	struct dialog d;
 
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-		return (BSDDIALOG_ERROR);
-	if (bar_autosize(conf, rows, cols, &h, &w, text, NULL) != 0)
-		return (BSDDIALOG_ERROR);
-	if (bar_checksize(h, w, NULL) != 0)
+	if (prepare_dialog(conf, text, rows, cols, &d) != 0)
 		return (BSDDIALOG_ERROR);
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
-		return (BSDDIALOG_ERROR);
-
-	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, NULL,
-	    false) != 0)
-		return (BSDDIALOG_ERROR);
-
-	bar = new_boxed_window(conf, y+h-4, x+3, 3, w-6, RAISED);
+	if ((b.win = newwin(1, 1, 1, 1)) == NULL)
+		RETURN_ERROR("Cannot build WINDOW bar");
+	b.y = b.x = 1;
+	b.fmt = "%3d%%";
 
 	input = NULL;
 	if (fd >= 0) {
+		CHECK_PTR(sep);
+		CHECK_PTR(end);
+
 		fd2 = dup(fd);
 		if ((input = fdopen(fd2, "r")) == NULL)
-			RETURN_ERROR("Cannot build FILE* from fd");
+			RETURN_FMTERROR("Cannot build FILE* from fd %d", fd);
 	}
 
+	perc = MIN(perc, 100);
 	mainloop = true;
 	while (mainloop) {
-		wrefresh(widget);
-		prefresh(textpad, 0, 0, y+1, x+1+TEXTHMARGIN, y+h-4,
-		    x+w-1-TEXTHMARGIN);
-		draw_borders(conf, bar, 3, w-6, RAISED);
-		draw_bar(bar, 1, 1, w-8, perc, false, -1 /*unused*/);
-		wrefresh(bar);
+		if (d.built) {
+			hide_dialog(&d);
+			refresh(); /* Important for decreasing screen */
+		}
+		if (dialog_size_position(&d, HBOX, MIN_WBOX, NULL) != 0)
+			return (BSDDIALOG_ERROR);
+		if (draw_dialog(&d))
+			return (BSDDIALOG_ERROR);
+		if (d.built)
+			refresh(); /* fix grey lines expanding screen */
+		TEXTPAD(&d, HBOX);
+		update_barbox(&d, &b, false);
+		b.w = WBAR(&d);
+		b.perc = b.label = perc;
+		b.toupdate = true;
+		draw_bar(&b);
+		doupdate();
 		if (input == NULL) /* that is fd < 0 */
 			break;
 
 		while (true) {
 			fscanf(input, "%s", inputbuf);
-			if (strcmp(inputbuf,"EOF") == 0) {
+			if (strcmp(inputbuf, end) == 0) {
 				mainloop = false;
 				break;
 			}
@@ -181,12 +177,12 @@ bsddialog_gauge(struct bsddialog_conf *conf, const char *text, int rows,
 		if (mainloop == false)
 			break;
 		fscanf(input, "%d", &perc);
-		perc = perc > 100 ? 100 : perc;
+		perc = MIN(perc, 100);
 		pntext = &ntext[0];
 		ntext[0] = '\0';
 		while (true) {
 			fscanf(input, "%s", inputbuf);
-			if (strcmp(inputbuf,"EOF") == 0) {
+			if (strcmp(inputbuf, end) == 0) {
 				mainloop = false;
 				break;
 			}
@@ -198,15 +194,13 @@ bsddialog_gauge(struct bsddialog_conf *conf, const char *text, int rows,
 			pntext++;
 		}
 		pntext[0] = '\0';
-		if (update_dialog(conf, shadow, widget, y, x, h, w, textpad,
-		    ntext, NULL, false) != 0)
-			return (BSDDIALOG_ERROR);
+		d.text = ntext;
 	}
 
 	if (input != NULL)
 		fclose(input);
-	delwin(bar);
-	end_dialog(conf, shadow, widget, textpad);
+	delwin(b.win);
+	end_dialog(&d);
 
 	return (BSDDIALOG_OK);
 }
@@ -217,83 +211,65 @@ do_mixedgauge(struct bsddialog_conf *conf, const char *text, int rows, int cols,
     unsigned int mainperc, unsigned int nminibars, const char **minilabels,
     int *minipercs, bool color)
 {
-	int i, retval, miniperc, y, x, h, w, ypad, max_minbarlen;
-	int htextpad, htext, wtext;
-	int colorperc, red, green;
-	int label_len_cap;
+	int i, miniperc, max_minibarlen;
+	int ystext, htext;
+	int minicolor, red, green;
+	int hnotext, label_len_cap, maxh, maxw;
 	bool hiddenminibars;
-	WINDOW *widget, *textpad, *bar, *shadow;
-	char states[12][14] = {
-		"  Succeeded  ", /* -1  */
-		"   Failed    ", /* -2  */
-		"   Passed    ", /* -3  */
-		"  Completed  ", /* -4  */
-		"   Checked   ", /* -5  */
-		"    Done     ", /* -6  */
-		"   Skipped   ", /* -7  */
-		" In Progress ", /* -8  */
-		"(blank)      ", /* -9  */
-		"     N/A     ", /* -10 */
-		"   Pending   ", /* -11 */
-		"   UNKNOWN   ", /* < -11, no API */
-	};
+	struct bar b;
+	struct dialog d;
+
+	CHECK_ARRAY(nminibars, minilabels);
+	CHECK_ARRAY(nminibars, minipercs);
 
 	red   = bsddialog_color(BSDDIALOG_WHITE,BSDDIALOG_RED,  BSDDIALOG_BOLD);
 	green = bsddialog_color(BSDDIALOG_WHITE,BSDDIALOG_GREEN,BSDDIALOG_BOLD);
 
-	max_minbarlen = 0;
+	max_minibarlen = 0;
 	for (i = 0; i < (int)nminibars; i++)
-		max_minbarlen = MAX(max_minbarlen, (int)strcols(minilabels[i]));
-	max_minbarlen += 3 + 16; /* seps + [...] */
-	max_minbarlen = MAX(max_minbarlen, MINMGBARWIDTH); /* mainbar */
+		max_minibarlen = MAX(max_minibarlen,
+		    (int)strcols(CHECK_STR(minilabels[i])));
+	max_minibarlen += 3 + 16; /* seps + [...] */
+	max_minibarlen = MAX(max_minibarlen, MIN_WMGBOX); /* mainbar */
 
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
+	if (prepare_dialog(conf, text, rows, cols, &d) != 0)
 		return (BSDDIALOG_ERROR);
 
-	/* mixedgauge autosize */
-	if (cols == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_AUTOSIZE) {
-		if (text_size(conf, rows, cols, text, NULL, nminibars + 3,
-		    max_minbarlen, &htext, &wtext) != 0)
+	label_len_cap = -1;
+	hiddenminibars = false;
+	hnotext = nminibars + HBOX;
+	if (conf->auto_truncate) {
+		if (dialog_maxsize(&d, &maxh, &maxw) != 0)
 			return (BSDDIALOG_ERROR);
+		if (maxh < hnotext) {
+			nminibars = maxh - HBOX - 1; /* "..." */
+			hiddenminibars = true;
+			hnotext = maxh;
+		}
+		if (maxw < max_minibarlen) {
+			label_len_cap = maxw - (3 + 16); /* seps + [...] */
+			max_minibarlen = maxw;
+		}
 	}
-	if (cols == BSDDIALOG_AUTOSIZE)
-		w = widget_min_width(conf, wtext, max_minbarlen, NULL);
-	if (rows == BSDDIALOG_AUTOSIZE)
-		h = widget_min_height(conf, htext, nminibars + 3, false);
-
-	/* mixedgauge checksize */
-	if (w < max_minbarlen + 2) {
-		if (!conf->auto_truncate || w <= 2 + 3 + 16 + 3)
-			RETURN_ERROR("Few cols for this mixedgauge");
-		label_len_cap = w - 2 - 3 - 16;
-	} else
-		label_len_cap = -1;
-	if (h < 5 + (int)nminibars + htext) {
-		if (!conf->auto_truncate || h <= 5 + htext)
-			RETURN_ERROR("Few rows for this mixedgauge");
-		nminibars = h - 5 - htext - 1;
-		hiddenminibars = true;
-	} else
-		hiddenminibars = false;
-
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
-		return (BSDDIALOG_ERROR);
 
-	retval = new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text,
-	    NULL, false);
-	if (retval == BSDDIALOG_ERROR)
-		return (retval);
+	if (dialog_size_position(&d, hnotext, max_minibarlen, &htext) != 0)
+		return (BSDDIALOG_ERROR);
+	if (draw_dialog(&d) != 0)
+		return (BSDDIALOG_ERROR);
 
 	/* mini bars */
+	b.win = d.widget;
+	b.x = 1 + d.w - 2 - 15;
+	b.w = 13;
+	b.fmt = "%3d%%";
+	b.toupdate = false;
 	for (i = 0; i < (int)nminibars; i++) {
 		miniperc = minipercs[i];
-		if (miniperc == BSDDIALOG_MG_BLANK)
-			continue;
 		/* label */
-		if (color && (miniperc >= 0))
-			wattron(widget, A_BOLD);
+		if (color && miniperc >= 0)
+			wattron(d.widget, A_BOLD);
 		if (label_len_cap > 0 &&
-		    (int)strcols(minilabels[i]) > label_len_cap) {
+		    (int)strcols(CHECK_STR(minilabels[i])) > label_len_cap) {
 			char *trunclabel, *seeklabel;
 
 			trunclabel = strdup(minilabels[i]);
@@ -303,64 +279,64 @@ do_mixedgauge(struct bsddialog_conf *conf, const char *text, int rows, int cols,
 			if (seeklabel == NULL)
 				RETURN_ERROR("Could not seek to column limit");
 			memcpy(seeklabel, "...", 4);
-			mvwaddstr(widget, i+1, 2, trunclabel);
+			mvwaddstr(d.widget, i+1, 2, trunclabel);
 			free(trunclabel);
 		} else
-			mvwaddstr(widget, i+1, 2, minilabels[i]);
-		if (color && (miniperc >= 0))
-			wattroff(widget, A_BOLD);
+			mvwaddstr(d.widget, i+1, 2, CHECK_STR(minilabels[i]));
+		if (color && miniperc >= 0)
+			wattroff(d.widget, A_BOLD);
 		/* perc */
-		if (miniperc < -11)
-			mvwaddstr(widget, i+1, w-2-15, states[11]);
-		else if (miniperc < 0) {
-			mvwaddstr(widget, i+1, w-2-15, "[             ]");
-			colorperc = -1;
+		if (miniperc == BSDDIALOG_MG_BLANK)
+			continue;
+		mvwaddstr(d.widget, i+1, d.w-2-15, "[             ]");
+		if (miniperc >= 0) {
+			b.y = i + 1;
+			b.perc = b.label = MIN(miniperc, 100);
+			draw_bar(&b);
+		} else { /* miniperc < 0 */
+			if (miniperc < BSDDIALOG_MG_PENDING)
+				miniperc = -12; /* UNKNOWN */
+			minicolor = t.dialog.color;
 			if (color && miniperc == BSDDIALOG_MG_FAILED)
-				colorperc = red;
-			if (color && miniperc == BSDDIALOG_MG_DONE)
-				colorperc = green;
-			if (colorperc != -1)
-				wattron(widget, colorperc);
+				minicolor = red;
+			else if (color && miniperc == BSDDIALOG_MG_DONE)
+				minicolor = green;
+			wattron(d.widget, minicolor);
 			miniperc = abs(miniperc + 1);
-			mvwaddstr(widget, i+1, 1+w-2-15, states[miniperc]);
-			if (colorperc != -1)
-				wattroff(widget, colorperc);
-		}
-		else { /* miniperc >= 0 */
-			if (miniperc > 100)
-				miniperc = 100;
-			mvwaddstr(widget, i+1, w-2-15, "[             ]");
-			draw_bar(widget, i+1, 1+w-2-15, 13, miniperc, false,
-			    -1 /*unused*/);
+			mvwaddstr(d.widget, i+1, 1+d.w-2-15, states[miniperc]);
+			wattroff(d.widget, minicolor);
 		}
 	}
-
 	if (hiddenminibars) {
 		++nminibars;
-		mvwaddstr(widget, nminibars, 2, "...");
+		mvwaddstr(d.widget, nminibars, 2, "...");
 	}
+	wnoutrefresh(d.widget);
 
-	wrefresh(widget);
-	getmaxyx(textpad, htextpad, i /* unused */);
-	ypad =  y + h - 4 - htextpad;
-	ypad = ypad < y+(int)nminibars ? y+(int)nminibars : ypad;
-	prefresh(textpad, 0, 0, ypad, x+2, y+h-4, x+w-2);
+	/* text */
+	ystext = MAX(d.h - BORDERS - htext - HBOX, (int)nminibars);
+	rtextpad(&d, 0, 0, ystext, HBOX);
 
 	/* main bar */
-	bar = new_boxed_window(conf, y+h -4, x+3, 3, w-6, RAISED);
+	if ((b.win = newwin(1, 1, 1, 1)) == NULL)
+		RETURN_ERROR("Cannot build WINDOW bar");
+	update_barbox(&d, &b, false);
+	wattron(b.win, t.bar.color);
+	mvwaddstr(b.win, 0, 2, "Overall Progress");
+	wattroff(b.win, t.bar.color);
+
+	b.y = b.x = 1;
+	b.w = WBAR(&d);
+	b.fmt = "%3d%%";
+	b.perc = b.label = MIN(mainperc, 100);
+	b.toupdate = true;
+	draw_bar(&b);
 
-	draw_bar(bar, 1, 1, w-8, mainperc, false, -1 /*unused*/);
-
-	wattron(bar, t.bar.color);
-	mvwaddstr(bar, 0, 2, "Overall Progress");
-	wattroff(bar, t.bar.color);
-
-	wrefresh(bar);
-
-	/* getch(); alternate mode (port devel/ncurses) shows nothing */
+	doupdate();
+	/* getch(); to test with "alternate mode" */
 
-	delwin(bar);
-	end_dialog(conf, shadow, widget, textpad);
+	delwin(b.win);
+	end_dialog(&d);
 
 	return (BSDDIALOG_OK);
 }
@@ -444,7 +420,8 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows,
 			minipercs[i] = BSDDIALOG_MG_DONE;
 			update = true;
 			i++;
-		} else if (minibar[i].status == BSDDIALOG_MG_FAILED || perc < 0) {
+		} else if (minibar[i].status == BSDDIALOG_MG_FAILED ||
+		    perc < 0) {
 			minipercs[i] = BSDDIALOG_MG_FAILED;
 			update = true;
 		} else /* perc >= 0 */
@@ -456,73 +433,73 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows,
 	return (retval);
 }
 
+static int rangebox_redraw(struct dialog *d, struct bar *b, int *bigchange)
+{
+	if (d->built) {
+		hide_dialog(d);
+		refresh(); /* Important for decreasing screen */
+	}
+	if (dialog_size_position(d, HBOX, MIN_WBOX, NULL) != 0)
+		return (BSDDIALOG_ERROR);
+	if (draw_dialog(d) != 0)
+		return (BSDDIALOG_ERROR);
+	if (d->built)
+		refresh(); /* Important to fix grey lines expanding screen */
+	TEXTPAD(d, HBOX + HBUTTONS);
+
+	b->w = WBAR(d);
+	*bigchange = MAX(1, b->w  / 10);
+	update_barbox(d, b, true);
+	b->toupdate = true;
+
+	return (0);
+}
+
 int
 bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, int min, int max, int *value)
 {
-	bool loop, buttupdate, barupdate;
-	int y, x, h, w;
-	int currvalue, retval, sizebar, bigchange, positions;
+	bool loop;
+	int currvalue, retval, bigchange, positions;
 	wint_t input;
-	float perc;
-	WINDOW *widget, *textpad, *bar, *shadow;
-	struct buttons bs;
-
-	if (value == NULL)
-		RETURN_ERROR("*value cannot be NULL");
+	struct bar b;
+	struct dialog d;
 
+	CHECK_PTR(value);
 	if (min >= max)
-		RETURN_ERROR("min >= max");
+		RETURN_FMTERROR("min (%d) >= max (%d)", min, max);
+	if (*value < min)
+		RETURN_FMTERROR("value (%d) < min (%d)", *value, min);
+	if (*value > max)
+		RETURN_FMTERROR("value (%d) > max (%d)", *value, max);
 
 	currvalue = *value;
 	positions = max - min + 1;
 
-	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
-
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-		return (BSDDIALOG_ERROR);
-	if (bar_autosize(conf, rows, cols, &h, &w, text, &bs) != 0)
+	if (prepare_dialog(conf, text, rows, cols, &d) != 0)
 		return (BSDDIALOG_ERROR);
-	if (bar_checksize(h, w, &bs) != 0)
+	set_buttons(&d, true, OK_LABEL, CANCEL_LABEL);
+	if ((b.win = newwin(1, 1, 1, 1)) == NULL)
+		RETURN_ERROR("Cannot build WINDOW bar");
+	b.y = b.x = 1;
+	b.fmt = "%d";
+	if (rangebox_redraw(&d, &b, &bigchange) != 0)
 		return (BSDDIALOG_ERROR);
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
-		return (BSDDIALOG_ERROR);
-
-	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
-	    true) != 0)
-		return (BSDDIALOG_ERROR);
-
-	doupdate();
-
-	prefresh(textpad, 0, 0, y+1, x+1+TEXTHMARGIN, y+h-7, x+w-1-TEXTHMARGIN);
-
-	sizebar = w - HBORDERS - (2 * BARPADDING) - 2;
-	bigchange = MAX(1, sizebar/10);
 
-	bar = new_boxed_window(conf, y + h - 6, x + 1 + BARPADDING, 3,
-	    sizebar + 2, RAISED);
-
-	loop = buttupdate = barupdate = true;
+	loop = true;
 	while (loop) {
-		if (buttupdate) {
-			draw_buttons(widget, bs, true);
-			wrefresh(widget);
-			buttupdate = false;
-		}
-		if (barupdate) {
-			perc = ((float)(currvalue - min)*100) / (positions-1);
-			draw_bar(bar, 1, 1, sizebar, perc, true, currvalue);
-			barupdate = false;
-			wrefresh(bar);
+		if (b.toupdate) {
+			b.perc = ((float)(currvalue - min)*100) / (positions-1);
+			b.label = currvalue;
+			draw_bar(&b);
 		}
-
+		doupdate();
 		if (get_wch(&input) == ERR)
 			continue;
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
-			retval = bs.value[bs.curr];
-			*value = currvalue;
+			retval = BUTTONVALUE(d.bs);
 			loop = false;
 			break;
 		case 27: /* Esc */
@@ -532,159 +509,132 @@ bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows,
 			}
 			break;
 		case '\t': /* TAB */
-			bs.curr = (bs.curr + 1) % bs.nbuttons;
-			buttupdate = true;
+		case KEY_RIGHT:
+			d.bs.curr = (d.bs.curr + 1) % d.bs.nbuttons;
+			DRAW_BUTTONS(d);
 			break;
 		case KEY_LEFT:
-			if (bs.curr > 0) {
-				bs.curr--;
-				buttupdate = true;
-			}
-			break;
-		case KEY_RIGHT:
-			if (bs.curr < (int) bs.nbuttons - 1) {
-				bs.curr++;
-				buttupdate = true;
-			}
+			d.bs.curr--;
+			if (d.bs.curr < 0)
+				 d.bs.curr = d.bs.nbuttons - 1;
+			DRAW_BUTTONS(d);
 			break;
 		case KEY_HOME:
 			currvalue = max;
-			barupdate = true;
+			b.toupdate = true;
 			break;
 		case KEY_END:
 			currvalue = min;
-			barupdate = true;
+			b.toupdate = true;
 			break;
 		case KEY_NPAGE:
 			currvalue -= bigchange;
 			if (currvalue < min)
 				currvalue = min;
-			barupdate = true;
+			b.toupdate = true;
 			break;
 		case KEY_PPAGE:
 			currvalue += bigchange;
 			if (currvalue > max)
 				currvalue = max;
-			barupdate = true;
+			b.toupdate = true;
 			break;
 		case KEY_UP:
 			if (currvalue < max) {
 				currvalue++;
-				barupdate = true;
+				b.toupdate = true;
 			}
 			break;
 		case KEY_DOWN:
 			if (currvalue > min) {
 				currvalue--;
-				barupdate = true;
+				b.toupdate = true;
 			}
 			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
-			if (f1help(conf) != 0)
-				return (BSDDIALOG_ERROR);
-			/* No break, screen size can change */
-		case KEY_RESIZE:
-			/* Important for decreasing screen */
-			hide_widget(y, x, h, w, conf->shadow);
-			refresh();
-
-			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-				return (BSDDIALOG_ERROR);
-			if (bar_autosize(conf, rows, cols, &h, &w, text,
-			    &bs) != 0)
-				return (BSDDIALOG_ERROR);
-			if (bar_checksize(h, w, &bs) != 0)
+			if (f1help_dialog(conf) != 0)
 				return (BSDDIALOG_ERROR);
-			if (set_widget_position(conf, &y, &x, h, w) != 0)
+			if (rangebox_redraw(&d, &b, &bigchange) != 0)
 				return (BSDDIALOG_ERROR);
-
-			if (update_dialog(conf, shadow, widget,y, x, h, w,
-			    textpad, text, &bs, true) != 0)
+			break;
+		case KEY_RESIZE:
+			if (rangebox_redraw(&d, &b, &bigchange) != 0)
 				return (BSDDIALOG_ERROR);
-
-			doupdate();
-
-			sizebar = w - HBORDERS - (2 * BARPADDING) - 2;
-			bigchange = MAX(1, sizebar/10);
-			wclear(bar);
-			mvwin(bar, y + h - 6, x + 1 + BARPADDING);
-			wresize(bar, 3, sizebar + 2);
-			draw_borders(conf, bar, 3, sizebar+2, RAISED);
-
-			prefresh(textpad, 0, 0, y+1, x+1+TEXTHMARGIN, y+h-7,
-			    x+w-1-TEXTHMARGIN);
-
-			barupdate = true;
 			break;
 		default:
-			if (shortcut_buttons(input, &bs)) {
-				retval = bs.value[bs.curr];
+			if (shortcut_buttons(input, &d.bs)) {
+				DRAW_BUTTONS(d);
+				doupdate();
+				retval = BUTTONVALUE(d.bs);
 				loop = false;
 			}
 		}
 	}
 
-	delwin(bar);
-	end_dialog(conf, shadow, widget, textpad);
+	*value = currvalue;
+
+	delwin(b.win);
+	end_dialog(&d);
 
 	return (retval);
 }
 
-int
-bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows,
-    int cols, unsigned int sec)
+static int pause_redraw(struct dialog *d, struct bar *b)
 {
-	bool loop, buttupdate, barupdate;
-	int retval, y, x, h, w, tout, sizebar;
-	wint_t input;
-	float perc;
-	WINDOW *widget, *textpad, *bar, *shadow;
-	struct buttons bs;
-
-	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
-
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-		return (BSDDIALOG_ERROR);
-	if (bar_autosize(conf, rows, cols, &h, &w, text, &bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (bar_checksize(h, w, &bs) != 0)
+	if (d->built) {
+		hide_dialog(d);
+		refresh(); /* Important for decreasing screen */
+	}
+	if (dialog_size_position(d, HBOX, MIN_WBOX, NULL) != 0)
 		return (BSDDIALOG_ERROR);
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
+	if (draw_dialog(d) != 0)
 		return (BSDDIALOG_ERROR);
+	if (d->built)
+		refresh(); /* Important to fix grey lines expanding screen */
+	TEXTPAD(d, HBOX + HBUTTONS);
 
-	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
-	    true) != 0)
-		return (BSDDIALOG_ERROR);
+	b->w = WBAR(d);
+	update_barbox(d, b, true);
+	b->toupdate = true;
 
-	doupdate();
+	return (0);
+}
 
-	prefresh(textpad, 0, 0, y+1, x+1+TEXTHMARGIN, y+h-7, x+w-1-TEXTHMARGIN);
+int
+bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows,
+    int cols, unsigned int *seconds)
+{
+	bool loop;
+	int retval, tout;
+	wint_t input;
+	struct bar b;
+	struct dialog d;
 
-	sizebar = w - HBORDERS - (2 * BARPADDING) - 2;
-	bar = new_boxed_window(conf, y + h - 6, x + 1 + BARPADDING, 3,
-	    sizebar + 2, RAISED);
+	CHECK_PTR(seconds);
+	if (prepare_dialog(conf, text, rows, cols, &d) != 0)
+		return (BSDDIALOG_ERROR);
+	set_buttons(&d, true, OK_LABEL, CANCEL_LABEL);
+	if ((b.win = newwin(1, 1, 1, 1)) == NULL)
+		RETURN_ERROR("Cannot build WINDOW bar");
+	b.y = b.x = 1;
+	b.fmt = "%d";
+	if (pause_redraw(&d, &b) != 0)
+		return (BSDDIALOG_ERROR);
 
-	tout = sec;
+	tout = *seconds;
 	nodelay(stdscr, TRUE);
 	timeout(1000);
-	loop = buttupdate = barupdate = true;
+	loop = true;
 	while (loop) {
-		if (barupdate) {
-			perc = (float)tout * 100 / sec;
-			draw_bar(bar, 1, 1, sizebar, perc, true, tout);
-			barupdate = false;
-			wrefresh(bar);
+		if (b.toupdate) {
+			b.perc = (float)tout * 100 / *seconds;
+			b.label = tout;
+			draw_bar(&b);
 		}
-
-		if (buttupdate) {
-			draw_buttons(widget, bs, true);
-			wrefresh(widget);
-			buttupdate = false;
-		}
-
+		doupdate();
 		if (get_wch(&input) == ERR) { /* timeout */
 			tout--;
 			if (tout < 0) {
@@ -692,14 +642,14 @@ bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows,
 				break;
 			}
 			else {
-				barupdate = true;
+				b.toupdate = true;
 				continue;
 			}
 		}
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
-			retval = bs.value[bs.curr];
+			retval = BUTTONVALUE(d.bs);
 			loop = false;
 			break;
 		case 27: /* Esc */
@@ -709,72 +659,44 @@ bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows,
 			}
 			break;
 		case '\t': /* TAB */
-			bs.curr = (bs.curr + 1) % bs.nbuttons;
-			buttupdate = true;
+		case KEY_RIGHT:
+			d.bs.curr = (d.bs.curr + 1) % d.bs.nbuttons;
+			DRAW_BUTTONS(d);
 			break;
 		case KEY_LEFT:
-			if (bs.curr > 0) {
-				bs.curr--;
-				buttupdate = true;
-			}
-			break;
-		case KEY_RIGHT:
-			if (bs.curr < (int) bs.nbuttons - 1) {
-				bs.curr++;
-				buttupdate = true;
-			}
+			d.bs.curr--;
+			if (d.bs.curr < 0)
+				 d.bs.curr = d.bs.nbuttons - 1;
+			DRAW_BUTTONS(d);
 			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
-			if (f1help(conf) != 0)
+			if (f1help_dialog(conf) != 0)
 				return (BSDDIALOG_ERROR);
-			/* No break, screen size can change */
-		case KEY_RESIZE:
-			/* Important for decreasing screen */
-			hide_widget(y, x, h, w, conf->shadow);
-			refresh();
-
-			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-				return (BSDDIALOG_ERROR);
-			if (bar_autosize(conf, rows, cols, &h, &w, text,
-			    &bs) != 0)
+			if (pause_redraw(&d, &b) != 0)
 				return (BSDDIALOG_ERROR);
-			if (bar_checksize(h, w, &bs) != 0)
-				return (BSDDIALOG_ERROR);
-			if (set_widget_position(conf, &y, &x, h, w) != 0)
-				return (BSDDIALOG_ERROR);
-
-			if (update_dialog(conf, shadow, widget,y, x, h, w,
-			    textpad, text, &bs, true) != 0)
+			break;
+		case KEY_RESIZE:
+			if (pause_redraw(&d, &b) != 0)
 				return (BSDDIALOG_ERROR);
-
-			doupdate();
-
-			sizebar = w - HBORDERS - (2 * BARPADDING) - 2;
-			wclear(bar);
-			mvwin(bar, y + h - 6, x + 1 + BARPADDING);
-			wresize(bar, 3, sizebar + 2);
-			draw_borders(conf, bar, 3, sizebar+2, LOWERED);
-
-			prefresh(textpad, 0, 0, y+1, x+1+TEXTHMARGIN, y+h-7,
-			    x+w-1-TEXTHMARGIN);
-
-			barupdate = true;
 			break;
 		default:
-			if (shortcut_buttons(input, &bs)) {
-				retval = bs.value[bs.curr];
+			if (shortcut_buttons(input, &d.bs)) {
+				DRAW_BUTTONS(d);
+				doupdate();
+				retval = BUTTONVALUE(d.bs);
 				loop = false;
 			}
 		}
 	}
-
 	nodelay(stdscr, FALSE);
 
-	delwin(bar);
-	end_dialog(conf, shadow, widget, textpad);
+	*seconds = MAX(tout, 0);
+
+	delwin(b.win);
+	end_dialog(&d);
 
 	return (retval);
-}
\ No newline at end of file
+}
diff --git a/contrib/bsddialog/lib/bsddialog.3 b/contrib/bsddialog/lib/bsddialog.3
index 9cc68a90ff62..38885bfe3ea4 100644
--- a/contrib/bsddialog/lib/bsddialog.3
+++ b/contrib/bsddialog/lib/bsddialog.3
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+.\" Copyright (c) 2021-2023 Alfonso Sabato Siciliano
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,13 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd September 23, 2022
+.Dd July 28, 2023
 .Dt BSDDIALOG 3
 .Os
 .Sh NAME
 .Nm bsddialog_backtitle ,
 .Nm bsddialog_calendar ,
-.Nm bsddialog_clearterminal ,
+.Nm bsddialog_clear ,
 .Nm bsddialog_color ,
 .Nm bsddialog_color_attrs ,
 .Nm bsddialog_checklist ,
@@ -43,6 +43,7 @@
 .Nm bsddialog_init ,
 .Nm bsddialog_init_notheme ,
 .Nm bsddialog_initconf ,
+.Nm bsddialog_inmode ,
 .Nm bsddialog_menu ,
 .Nm bsddialog_mixedgauge ,
 .Nm bsddialog_mixedlist ,
@@ -50,6 +51,7 @@
 .Nm bsddialog_pause ,
 .Nm bsddialog_radiolist ,
 .Nm bsddialog_rangebox ,
+.Nm bsddialog_refresh ,
 .Nm bsddialog_set_theme ,
 .Nm bsddialog_set_default_theme ,
 .Nm bsddialog_textbox ,
@@ -68,9 +70,9 @@
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
-.Fa "unsigned int *yy"
-.Fa "unsigned int *mm"
-.Fa "unsigned int *dd"
+.Fa "unsigned int *year"
+.Fa "unsigned int *month"
+.Fa "unsigned int *day"
 .Fc
 .Ft int
 .Fo bsddialog_checklist
@@ -83,17 +85,17 @@
 .Fa "struct bsddialog_menuitem *items"
 .Fa "int *focusitem"
 .Fc
-.Ft int
-.Fn bsddialog_clearterminal "void"
+.Ft void
+.Fn bsddialog_clear "unsigned int y"
 .Ft int
 .Fo bsddialog_datebox
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
-.Fa "unsigned int *yy"
-.Fa "unsigned int *mm"
-.Fa "unsigned int *dd"
+.Fa "unsigned int *year"
+.Fa "unsigned int *month"
+.Fa "unsigned int *day"
 .Fc
 .Ft int
 .Fn bsddialog_end "void"
@@ -106,6 +108,7 @@
 .Fa "unsigned int formrows"
 .Fa "unsigned int nitems"
 .Fa "struct bsddialog_formitem *items"
+.Fa "int *focusitem"
 .Fc
 .Ft int
 .Fo bsddialog_gauge
@@ -116,6 +119,7 @@
 .Fa "unsigned int perc"
 .Fa "int fd"
 .Fa "const char *sep"
+.Fa "const char *end"
 .Fc
 .Ft const char *
 .Fn bsddialog_geterror "void"
@@ -130,6 +134,8 @@
 .Fn bsddialog_init "void"
 .Ft int
 .Fn bsddialog_init_notheme "void"
+.Ft bool
+.Fn bsddialog_inmode "void"
 .Ft int
 .Fn bsddialog_initconf "struct bsddialog_conf *conf"
 .Ft int
@@ -179,7 +185,7 @@
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
-.Fa "unsigned int seconds"
+.Fa "unsigned int *seconds"
 .Fc
 .Ft int
 .Fo bsddialog_radiolist
@@ -202,6 +208,8 @@
 .Fa "int max"
 .Fa "int *value"
 .Fc
+.Ft void
+.Fn bsddialog_refresh "void"
 .Ft int
 .Fo bsddialog_textbox
 .Fa "struct bsddialog_conf *conf"
@@ -251,8 +259,7 @@
 .Sh DESCRIPTION
 The
 .Nm bsddialog
-library provides an API to build Text User Interface dialogs and widgets: to
-display messages, to get input and to inform about a computation status.
+library provides an API to build Text User Interface dialogs and widgets.
 .Pp
 .Fn bsddialog_init
 initializes the library, the only functions that can be called before is
@@ -260,10 +267,7 @@ initializes the library, the only functions that can be called before is
 described later.
 After the initialization the input and output should be handled via the library
 API.
-.Fn bsddialog_end
-restores the screen like before
-.Fn bsddialog_init ,
-then it is not possible to use the library functions.
+.Pp
 .Fn bsddialog_init_notheme
 is equivalent to
 .Fn bsddialog_init
@@ -271,41 +275,64 @@ except it does not set the default graphical theme; see
 .Sx Theme
 subsection to set a theme explicitly.
 .Pp
-.Fn bsddialog_error
-returns a string to describe the last error, it should be called after a
-.Dv BSDDIALOG_ERROR
-returned value.
-.Fn bsddialog_clearterminal
-clears the screen.
+.Fn bsddialog_end
+restores the screen like before
+.Fn bsddialog_init .
+After the call is not possible to use the library functions.
+.Pp
+.Fn bsddialog_inmode
+returns
+.Dv true
+after
+.Fn bsddialog_init
+or
+.Fn bsddialog_init_notheme
+and before
+.Fn bsddialog_end ,
+.Dv false
+otherwise.
+.Pp
 .Fn bsddialog_backtitle
 prints
 .Fa backtitle
-on the top of the screen, it is possible to set
+on the top of the screen.
+The function handles
 .Fa conf.ascii_lines
 and
-.Fa conf.no_lines ;
-.Fa conf
-is described later.
+.Fa conf.no_lines
+described later.
 .Pp
-Each
-.Fa char*
-argument has to be a well terminated string, it can be a multibyte character
-string depending on current locale, see
-.Xr setlocale 3 .
+.Fn bsddialog_error
+returns a string to describe the last error.
+The function should be called after a
+.Dv BSDDIALOG_ERROR
+returned value.
+.Pp
+.Fn bsddialog_clear
+clears the screen from
+.Fa y .
+.Pp
+.Fn bsddialog_refresh
+useful to refresh the screen after a terminal mode change, see
+.Xr terminfo 5 .
 .Ss Dialogs
 The dialogs have common arguments.
 .Fa text
 is a string printed inside the dialog.
+Each
+.Fa char*
+parameter can be a multibyte character string depending on current locale, see
+.Xr setlocale 3 .
 .Fa rows
 and
 .Fa cols
-are height and width, their value can be between 2 and the screen size,
+are height and width, their value can be a fixed size,
 .Dv BSDDIALOG_AUTOSIZE
 or
 .Dv BSDDIALOG_FULLSCREEN .
 .Fa conf
-is a struct to customize the dialog, it does not set global properties to the
-library.
+is a struct to customize the current dialog, it does not set global properties
+to the library.
 .Pp
 .Bd -literal -offset indent -compact
 struct bsddialog_conf {
@@ -331,24 +358,28 @@ struct bsddialog_conf {
 	} key;
 	struct {
 		unsigned int cols_per_row;
-		bool highlight;
+		bool escape;
 		unsigned int tablen;
 	} text;
 	struct {
 		bool align_left;
 		bool no_desc;
 		bool no_name;
-		bool on_without_ok;
 		bool shortcut_buttons;
 	} menu;
 	struct {
 		char securech;
 		char *securembch;
 		bool value_wchar;
-		bool value_without_ok;
 	} form;
+	struct {
+		const char *format;
+	} date;
 	struct {
 		bool always_active;
+		const char *left1_label;
+		const char *left2_label;
+		const char *left3_label;
 		bool without_ok;
 		const char *ok_label;
 		bool with_extra;
@@ -358,8 +389,9 @@ struct bsddialog_conf {
 		bool default_cancel;
 		bool with_help;
 		const char *help_label;
-		const char *generic1_label;
-		const char *generic2_label;
+		const char *right1_label;
+		const char *right2_label;
+		const char *right3_label;
 		const char *default_label;
 	} button;
 };
@@ -396,7 +428,7 @@ is
 or
 .Dv BSDDIALOG_FULLSCREEN .
 .It Fa conf.bottomtitle
-subtitle at the dialog bottom side.
+dialog subtitle.
 .It Fa conf.clear
 hide the dialog at exit.
 .It Fa conf.get_height
@@ -414,36 +446,35 @@ draw shadow.
 .It Fa conf.sleep
 wait before to return, the value is in seconds.
 .It Fa conf.title
-title at the top dialog side.
+dialog title.
 .It Fa conf.y
-vertical position, 0 is top screen size, can be
+dialog vertical position, 0 is top screen, can be
 .Dv BSDDIALOG_CENTER .
 .It Fa conf.x
-horizontal position, 0 is left screen side, can be
+dialog horizontal position, 0 is left screen, can be
 .Dv BSDDIALOG_CENTER .
 .El
 .Pp
 .Bl -column -compact
 .It Fa conf.key.enable_esc
-enables
+enable
 .Dv ESC
 key to close the dialog.
 .It Fa conf.key.f1_file
-file to open if F1 is pressed.
+open a file in a textbox if F1 is pressed.
 .It Fa conf.key.f1_message
-message to display if F1 is pressed.
+build a msgbox with message if F1 is pressed.
 .El
 .Pp
 .Bl -column -compact
 .It Fa conf.text.cols_per_row
 Try to set the number of columns for a row of
 .Fa text
-with autosizing; default
+with autosizing, default
 .Dv 10 .
-.It Fa conf.text.highlight
-enables highlights for
-.Fa text ,
-properly the following sequences are considered escapes:
+.It Fa conf.text.escape
+enable escapes in
+.Fa text :
 .It Dq \eZ0
 black.
 .It Dq \eZ1
@@ -460,14 +491,26 @@ magenta.
 cyan.
 .It Dq \eZ7
 white.
-.It Dq \eZr
-reverse foreground and background.
-.It Dq \eZR
-disable reverse.
 .It Dq \eZb
 bold.
 .It Dq \eZB
 disable bold.
+.It Dq \eZd
+Half bright.
+.It Dq \eZD
+disable half bright.
+.It Dq \eZk
+Blink.
+.It Dq \eZK
+disable blinking.
+.It Dq \eZr
+reverse foreground and background.
+.It Dq \eZR
+disable reverse.
+.It Dq \eZs
+Highlight.
+.It Dq \eZS
+disable highlighting.
 .It Dq \eZu
 underline.
 .It Dq \eZU
@@ -484,13 +527,19 @@ function.
 .Pp
 .Bl -column -compact
 .It Fa conf.button.always_active
-buttons always active, avoidind focus switch between buttons and input fields or
+buttons always active, avoiding focus switch between buttons and input fields or
 input boxes in
 .Fn bsddialog_form ,
 .Fn bsddialog_datebox ,
 .Fn bsddialog_calendar
 and
 .Fn bsddialog_timebox .
+.It Fa conf.button.left1_label
+add a button with the specified label.
+.It Fa conf.button.left2_label
+add a button with the specified label.
+.It Fa conf.button.left3_label
+add a button with the specified label.
 .It Fa conf.button.without_ok
 disable OK button.
 .It Fa conf.button.ok_label
@@ -509,9 +558,11 @@ on startup focus on the Cancel button.
 add Help button.
 .It Fa conf.button.help_label
 set a label for Help button.
-.It Fa conf.button.generic1_label
+.It Fa conf.button.right1_label
 add a button with the specified label.
-.It Fa conf.button.generic2_label
+.It Fa conf.button.right2_label
+add a button with the specified label.
+.It Fa conf.button.right3_label
 add a button with the specified label.
 .It Fa conf.button.default_label
 focus on the button with the specified label.
@@ -532,143 +583,35 @@ to
 to
 .Dv 10 .
 .Pp
-.Fn bsddialog_infobox
-builds a dialog without buttons and returns instantly.
-.Fn bsddialog_msgbox
-builds a dialog with OK button.
-.Fn bsddialog_yesno
-provides a dialog for a
-.Dq Yes-No Question ,
-the labels on buttons are Yes and No.
-.Pp
-.Fn bsddialog_pause
-builds a dialog waiting until the timeout in
-.Fa seconds
-expires or a button is pressed.
-.Pp
 .Fn bsddialog_calendar
+builds a dialog to select a date.
+.Fa year ,
+.Fa month ,
 and
-.Fn bsddialog_datebox
-build a dialog to select a date,
-.Fa yy ,
-.Fa mm ,
-and
-.Fa dd
+.Fa day
 are default values on startup, selected date at exit.
-.Fn bsddialog_timebox
-builds a dialog to choose a time,
-.Fa hh ,
-.Fa mm ,
-and
-.Fa ss
-are default values on startup, selected time at exit.
 .Pp
-.Fn bsddialog_checklist ,
-.Fn bsddialog_menu
-and
-.Fn bsddialog_radiolist
-build dialogs to select some item from a list via the SPACE key, an item is
-defined like:
+.Fn bsddialog_checklist
+builds dialogs to select some item from a list via the SPACE key, can be
+customized by
+.Fa conf.menu.* .
+See
+.Fn bsddialog_menu .
 .Pp
-.Bd -literal -offset indent -compact
-struct bsddialog_menuitem {
-	const char *prefix;
-	bool on;
-	unsigned int depth;
-	const char *name;
-	const char *desc;
-	const char *bottomdesc;
-};
-.Ed
-.Pp
-.Fa prefix ,
-.Fa name
-and
-.Fa desc
-are strings to describe the item and are printed on its row,
-.Fa bottomdesc
-is printed on the bottom side of the screen,
-.Fa depth
-is a margin between the
-.Fa prefix
-and
-.Fa name
-useful to implement a
-.Dq treeview,
-.Fa on
-is set to
-.Dv true
-if the item is selected,
-.Dv false
-otherwise.
-.Fa items
-is an array of items of
-.Fa nitem
-elements,
-.Fa menurows
-specifies the graphical fixed height of the list, if
-.Fa cols
-is set to
-.Dv BSDDIALOG_AUTOSIZE
-.Fa menurows
-specifies a maximum value.
-Finally, if not
-.Dv NULL ,
-.Fa focusitem
-specifies the default item on startup and the last focused item at exit, could
-be a negative value if no item is focused.
-.Pp
-.Fn bsddialog_mixedlist
-builds a dialog with collections of checklists, radiolists and separators.
-A collection is a set defined like:
-.Pp
-.Bd -literal -offset indent -compact
-enum bsddialog_menutype {
-	BSDDIALOG_CHECKLIST,
-	BSDDIALOG_RADIOLIST,
-	BSDDIALOG_SEPARATOR,
-};
-
-struct bsddialog_menugroup {
-	enum bsddialog_menutype type;
-	unsigned int nitems;
-	struct bsddialog_menuitem *items;
-};
-.Ed
-.Pp
-.Fa groups
-is an array of sets of
-.Fa ngroups
-elements.
-.Fa menurows
-is the graphical height size for the list.
-If not
-.Dv NULL ,
-.Fa focuslist
-and
-.Fa focusitem
-specify the default item on startup and the last focused item at exit, could be
-a negative value if no item is focused.
-.Pp
-.Fn bsddialog_checklist ,
-.Fn bsddialog_menu ,
-.Fn bsddialog_mixedlist
+.Fn bsddialog_datebox
+builds a dialog to select a date.
+.Fa year ,
+.Fa month ,
 and
-.Fn bsddialog_radiolist
-can be costomizated by:
+.Fa day
+are default values on startup, selected date at exit.
+The function can be customized by:
 .Bl -column -compact
-.It Fa conf.menu.align_left
-aligns items to left, default center.
-.It Fa conf.menu.no_desc
-hide description.
-.It Fa conf.menu.no_name
-hide names.
-.It Fa conf.menu.on_without_ok
-set items
-.Fa on
-also if the OK button is not pressed.
-.It Fa conf.menu.shortcut_buttons
-enable shortcut keys on buttons, default on items.
+.It Fa conf.date.format
+date format user interface, possible values:
+.Dq d/m/y ,
+.Dq m/d/y ,
+.Dq y/m/d .
 .El
 .Pp
 .Fn bsddialog_form
@@ -676,11 +619,16 @@ builds a dialog to display an array of
 .Fa items
 of
 .Fa nitems
-elements to get strings in input.
+elements to get input strings.
 .Fa formrows
-specifies the graphical height for the box around the items,
+is the graphical height for the items inside the dialog,
 .Dv 0
 for autosizing.
+If not
+.Dv NULL
+.Fa focusitem
+is the default item index on startup and the last focused item at exit, a
+negative value if no item is focused.
 An item is defined like:
 .Pp
 .Bd -literal -offset indent -compact
@@ -703,7 +651,7 @@ struct bsddialog_formitem {
 .Ed
 .Pp
 .Fa label
-is a string to describe the request, it is printed at the position
+is a string to describe the request at the position
 .Fa ylabel
 and
 .Fa xlabel .
@@ -717,22 +665,20 @@ is its graphical width, while
 is the maximum number of characters of the input string.
 .Fa init
 is the default field value.
-If the OK button is pressed
+If no error occurs
 .Fa value
-is the allocated memory with the current field string, its size depends on
-the current locale.
+is the allocated memory with the current field string at exit, its size depends
+on the current locale.
 .Fa flags
-is an OR value to set the
+is an OR value to set the field:
 .Dv BSDDIALOG_FIELDHIDDEN ,
 .Dv BSDDIALOG_FIELDREADONLY ,
 .Dv BSDDIALOG_FIELDNOCOLOR ,
 .Dv BSDDIALOG_FIELDCURSOREND ,
-.Dv BSDDIALOG_FIELDEXTEND
-and
+.Dv BSDDIALOG_FIELDEXTEND ,
 .Dv BSDDIALOG_FIELDSINGLEBYTE .
-flags for the field.
 .Fa bottomdesc
-is printed on the bottom side of the screen if the item is focused.
+is printed at bottom screen if the item is focused.
 .Pp
 .Fn bsddialog_form
 can be customized by:
@@ -751,38 +697,108 @@ the allocated
 is a
 .Em wchar_t*
 string.
-.It Fa conf.form.value_without_ok
-allocate memory and set
-.Fa value
-also if the OK button is not pressed.
 .El
 .Pp
 .Fn bsddialog_gauge
-builds a dialog with a bar to shows
-.Fa perc ,
-if the file descriptor
+builds a dialog with a bar to show
+.Fa perc .
+If the file descriptor
 .Fa fd
 is greater or equal to 0 the dialog waits to read
-.Fa separator
+.Fa sep
 from it, then the first string replaces
 .Fa perc
 and the following strings replace
 .Fa text
 until the next
-.Fa separator ,
+.Fa sep ,
 the loop ends reading
-.Dv EOF .
+.Fa end .
+.Pp
+.Fn bsddialog_infobox
+builds a dialog without buttons and returns instantly.
+.Pp
+.Fn bsddialog_menu
+builds a dialog to select an item from a list via SPACE or ENTER.
+An item is
+defined like:
+.Pp
+.Bd -literal -offset indent -compact
+struct bsddialog_menuitem {
+	const char *prefix;
+	bool on;
+	unsigned int depth;
+	const char *name;
+	const char *desc;
+	const char *bottomdesc;
+};
+.Ed
+.Pp
+.Fa prefix ,
+.Fa name
+and
+.Fa desc
+are printed at the item row.
+.Fa bottomdesc
+is printed at bottom screen if the item is focused.
+.Fa depth
+is a margin between
+.Fa prefix
+and
+.Fa name .
+At exit
+.Fa on
+is set to
+.Dv true
+if the item is selected,
+.Dv false
+otherwise.
+.Fa items
+is an array of items of
+.Fa nitem
+elements.
+.Fa menurows
+is the graphical height of the list inside the dialog, if
+.Fa cols
+is
+.Dv BSDDIALOG_AUTOSIZE
+.Fa menurows
+specifies a maximum value.
+if not
+.Dv NULL
+.Fa focusitem
+is the default item index on startup and the last focused item at exit, a
+negative value if no item is focused.
+.Pp
+.Fn bsddialog_checklist ,
+.Fn bsddialog_menu ,
+.Fn bsddialog_mixedlist
+and
+.Fn bsddialog_radiolist
+can be customized by:
+.Bl -column -compact
+.It Fa conf.menu.align_left
+align items to left, default center.
+.It Fa conf.menu.no_desc
+hide items description.
+.It Fa conf.menu.no_name
+hide items name, mutually exclusive with
+.Fa conf.menu.no_desc .
+.It Fa conf.menu.shortcut_buttons
+enable shortcut keys on buttons, default on items.
+.El
 .Pp
 .Fn bsddialog_mixedgauge
-draws a main bar with the
+builds a dialog with a main bar with the
 .Fa mainperc
 percentage and
 .Fa nminibars
 each one with a
 .Fa minilabel
 and a
+.Fa miniperc .
 .Fa miniperc
-with a value between 0 and 100 or
+can be: a positive value to print a bar with a percentace, a negative constant
 .Dv BSDDIALOG_MG_SUCCEEDED ,
 .Dv BSDDIALOG_MG_FAILED ,
 .Dv BSDDIALOG_MG_PASSED ,
@@ -791,11 +807,69 @@ with a value between 0 and 100 or
 .Dv BSDDIALOG_MG_DONE ,
 .Dv BSDDIALOG_MG_SKIPPED ,
 .Dv BSDDIALOG_MG_INPROGRESS ,
-.Dv BSDDIALOG_MG_BLANK ,
-.Dv BSDDIALOG_MG_NA
-or
+.Dv BSDDIALOG_MG_BLANK
+to hide
+.Fa miniperc ,
+.Dv BSDDIALOG_MG_NA ,
 .Dv BSDDIALOG_MG_PENDING
-to print a descriptive string.
+to print a descriptive string, otherwise
+.Dq "UNKNOWN"
+is printed.
+.Pp
+.Fn bsddialog_mixedlist
+builds a dialog with collections of checklists, radiolists and separators.
+A collection is a set defined like:
+.Pp
+.Bd -literal -offset indent -compact
+enum bsddialog_menutype {
+	BSDDIALOG_CHECKLIST,
+	BSDDIALOG_RADIOLIST,
+	BSDDIALOG_SEPARATOR,
+};
+
+struct bsddialog_menugroup {
+	enum bsddialog_menutype type;
+	unsigned int nitems;
+	struct bsddialog_menuitem *items;
+	unsigned int min_on; /* unused for now */
+};
+.Ed
+.Pp
+.Fa groups
+is an array of sets of
+.Fa ngroups
+elements.
+.Fa menurows
+is the graphical height size for the list.
+If not
+.Dv NULL ,
+.Fa focuslist
+and
+.Fa focusitem
+specify the default item on startup and the last focused item at exit, could be
+a negative value if no item is focused.
+The dialog can be customized by
+.Fa conf.menu.* ,
+see
+.Fn bsddialog_menu .
+.Pp
+.Fn bsddialog_msgbox
+builds a dialog with OK button.
+.Pp
+.Fn bsddialog_pause
+builds a dialog waiting until the timeout in
+.Fa seconds
+expires or a button is pressed.
+At exit
+.Fa seconds
+is set like remaining time.
+.Pp
+.Fn bsddialog_radiolist
+builds dialogs to select at most an item from a list via the SPACE key, can be
+customized by
+.Fa conf.menu.* .
+See
+.Fn bsddialog_menu .
 .Pp
 .Fn bsddialog_rangebox
 to select a value between
@@ -809,12 +883,28 @@ and PAGEDOWN can change it.
 .Pp
 .Fn bsddialog_textbox
 opens and prints
-.Fa file
-in a dialog, the UP, DOWN, HOME, END, PAGEUP and PAGEDOWN keys are availble to
-navigate the file.
-OK button is renamed EXIT.
+.Fa file .
+UP, DOWN, LEFT, RIGHT, HOME, END, PAGEUP and PAGEDOWN keys are available to
+navigate the file, TAB changes button.
+.Dq OK
+button is renamed
+.Dq EXIT .
+.Pp
+.Fn bsddialog_timebox
+builds a dialog to choose a time.
+.Fa hh ,
+.Fa mm ,
+and
+.Fa ss
+are default values on startup, selected time at exit.
+.Pp
+.Fn bsddialog_yesno
+provides a dialog for a
+.Dq Yes-No Question ,
+the labels on buttons are Yes and No.
 .Ss Theme
-The graphical properties are global to the library, they are represented by
+The graphical properties are global to the library.
+They are represented by
 .Fa struct bsddialog_theme
 and can be customized at runtime via the
 .In bsddialog_theme.h
@@ -840,17 +930,19 @@ struct bsddialog_theme {
 		int  arrowcolor;
 	} dialog;
 	struct {
+		int f_prefixcolor;
+		int prefixcolor;
 		int f_selectorcolor;
 		int selectorcolor;
 		int f_namecolor;
 		int namecolor;
 		int f_desccolor;
 		int desccolor;
-		int namesepcolor;
-		int descsepcolor;
 		int f_shortcutcolor;
 		int shortcutcolor;
 		int bottomdesccolor;
+		int sepnamecolor;
+		int sepdesccolor;
 	} menu;
 	struct {
 		int f_fieldcolor;
@@ -867,32 +959,27 @@ struct bsddialog_theme {
 		unsigned int maxmargin;
 		char leftdelim;
 		char rightdelim;
-		int delimcolor;
 		int f_delimcolor;
-		int color;
+		int delimcolor;
 		int f_color;
-		int shortcutcolor;
+		int color;
 		int f_shortcutcolor;
+		int shortcutcolor;
 	} button;
 };
 .Ed
 .Pp
 A member with the
 .Dq f_
-prefix refers to an element with focus.
-.Pp
-.Fn bsddialog_get_theme
-sets
-.Fa theme
-like the current theme.
+refers to focus when an element can be in selected or not selected state.
 .Pp
-A color can be set by the value returned by
-.Fn bsddialog_color ,
-Possible values for
-.Fa background
-and
-.Fa foreground
-are:
+.Fn bsddialog_color
+generates and returns a color to set a
+.Fa struct bsddialog_theme
+color member.
+An
+.Fa enum bsddialog_color
+can be:
 .Dv BSDDIALOG_BLACK ,
 .Dv BSDDIALOG_RED ,
 .Dv BSDDIALOG_GREEN ,
@@ -900,31 +987,30 @@ are:
 .Dv BSDDIALOG_BLUE ,
 .Dv BSDDIALOG_MAGENTA ,
 .Dv BSDDIALOG_CYAN ,
-and
-.Dv BSDDIALOG_WHITE ,
+.Dv BSDDIALOG_WHITE .
 .Fa flags
-specifies OR-flags, possible values:
+is an OR value:
+.Dv BSDDIALOG_BLINK ,
 .Dv BSDDIALOG_BOLD ,
-.Dv BSDDIALOG_REVERSE
-and
+.Dv BSDDIALOG_HALFBRIGHT ,
+.Dv BSDDIALOG_HIGHLIGHT ,
+.Dv BSDDIALOG_REVERSE ,
 .Dv BSDDIALOG_UNDERLINE .
+.Pp
 .Fn bsddialog_color_attrs
-gets the properties of a color.
+sets, if not NULL,
+.Fa foreground ,
+.Fa background ,
+.Fa flags ,
+like the properties of
+.Fa color ,
+see
+.Fn bsddialog_color .
 .Pp
-.Fn bsddialog_set_theme
+.Fn bsddialog_get_theme
 sets
 .Fa theme
-like current theme, the changes takes effect only for dialogs built after the
-call.
-.Pp
-The library provides predefined themes:
-.Dv BSDDIALOG_THEME_BLACKWHITE ,
-.Dv BSDDIALOG_THEME_BSDDIALOG ,
-.Dv BSDDIALOG_THEME_FLAT
-and
-.Dv BSDDIALOG_THEME_DIALOG ,
-they can be set via
-.Fn bsddialog_set_default_theme .
+like the current runtime theme.
 .Pp
 .Fn bsddialog_hascolors
 returns
@@ -932,6 +1018,20 @@ returns
 if the terminal provides colors,
 .Dv false
 otherwise.
+.Pp
+.Fn bsddialog_set_theme
+sets
+.Fa theme
+like current runtime theme.
+Changes take effect only for dialogs built after
+the call.
+.Pp
+.Fn bsddialog_set_default_theme
+sets a library default theme like current theme, possible values:
+.Dv BSDDIALOG_THEME_BLACKWHITE ,
+.Dv BSDDIALOG_THEME_FLAT ,
+.Dv BSDDIALOG_THEME_3D .
+Changes take effect only for dialogs built after the call.
 .Sh RETURN VALUES
 The functions return the value
 .Dv BSDDIALOG_ERROR
@@ -942,9 +1042,12 @@ returned:
 .Dv BSDDIALOG_CANCEL ,
 .Dv BSDDIALOG_HELP ,
 .Dv BSDDIALOG_EXTRA ,
-.Dv BSDDIALOG_GENERIC1
-or
-.Dv BSDDIALOG_GENERIC2 .
+.Dv BSDDIALOG_LEFT1 ,
+.Dv BSDDIALOG_LEFT2 ,
+.Dv BSDDIALOG_LEFT3 ,
+.Dv BSDDIALOG_RIGHT1 ,
+.Dv BSDDIALOG_RIGHT2 ,
+.Dv BSDDIALOG_RIGHT3 .
 .Dv BSDDIALOG_YES
 and
 .Dv BSDDIALOG_NO
@@ -990,6 +1093,7 @@ case BSDDIALOG_NO
 	break;
 case BSDDIALOG_ERROR:
 	printf("Error: %s\\n", bsddialog_geterror());
+	break;
 }
 .Ed
 .Pp
diff --git a/contrib/bsddialog/lib/bsddialog.h b/contrib/bsddialog/lib/bsddialog.h
index fddb837b3cfd..6e672a61ec99 100644
--- a/contrib/bsddialog/lib/bsddialog.h
+++ b/contrib/bsddialog/lib/bsddialog.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,9 +30,9 @@
 
 #include <stdbool.h>
 
-#define LIBBSDDIALOG_VERSION     "0.4"
+#define LIBBSDDIALOG_VERSION     "1.0"
 
-/* Exit status */
+/* Return values */
 #define BSDDIALOG_ERROR          -1
 #define BSDDIALOG_OK              0
 #define BSDDIALOG_YES             BSDDIALOG_OK
@@ -42,8 +42,12 @@
 #define BSDDIALOG_EXTRA           3
 #define BSDDIALOG_TIMEOUT         4
 #define BSDDIALOG_ESC             5
-#define BSDDIALOG_GENERIC1        6
-#define BSDDIALOG_GENERIC2        7
+#define BSDDIALOG_LEFT1           6
+#define BSDDIALOG_LEFT2           7
+#define BSDDIALOG_LEFT3           8
+#define BSDDIALOG_RIGHT1          9
+#define BSDDIALOG_RIGHT2          10
+#define BSDDIALOG_RIGHT3          11
 
 /* Size and position */
 #define BSDDIALOG_FULLSCREEN     -1
@@ -95,24 +99,28 @@ struct bsddialog_conf {
 	} key;
 	struct {
 		unsigned int cols_per_row;
-		bool highlight;
+		bool escape;
 		unsigned int tablen;
 	} text;
 	struct {
 		bool align_left;
 		bool no_desc;
 		bool no_name;
-		bool on_without_ok;
 		bool shortcut_buttons;
 	} menu;
 	struct {
 		char securech;
 		char *securembch;
 		bool value_wchar;
-		bool value_without_ok;
 	} form;
+	struct {
+		const char *format;
+	} date;
 	struct {
 		bool always_active;
+		const char *left1_label;
+		const char *left2_label;
+		const char *left3_label;
 		bool without_ok;
 		const char *ok_label;
 		bool with_extra;
@@ -122,8 +130,9 @@ struct bsddialog_conf {
 		bool default_cancel;
 		bool with_help;
 		const char *help_label;
-		const char *generic1_label;
-		const char *generic2_label;
+		const char *right1_label;
+		const char *right2_label;
+		const char *right3_label;
 		const char *default_label;
 	} button;
 };
@@ -147,6 +156,7 @@ struct bsddialog_menugroup {
 	enum bsddialog_menutype type;
 	unsigned int nitems;
 	struct bsddialog_menuitem *items;
+	unsigned int min_on; /* unused for now */
 };
 
 struct bsddialog_formitem {
@@ -167,16 +177,18 @@ struct bsddialog_formitem {
 
 int bsddialog_init(void);
 int bsddialog_init_notheme(void);
+bool bsddialog_inmode(void);
 int bsddialog_end(void);
 int bsddialog_backtitle(struct bsddialog_conf *conf, const char *backtitle);
 int bsddialog_initconf(struct bsddialog_conf *conf);
-int bsddialog_clearterminal(void);
+void bsddialog_clear(unsigned int y);
+void bsddialog_refresh(void);
 const char *bsddialog_geterror(void);
 
 /* Dialogs */
 int
 bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows,
-    int cols, unsigned int *yy, unsigned int *mm, unsigned int *dd);
+    int cols, unsigned int *year, unsigned int *month, unsigned int *day);
 
 int
 bsddialog_checklist(struct bsddialog_conf *conf, const char *text, int rows,
@@ -185,16 +197,16 @@ bsddialog_checklist(struct bsddialog_conf *conf, const char *text, int rows,
 
 int
 bsddialog_datebox(struct bsddialog_conf *conf, const char *text, int rows,
-    int cols, unsigned int *yy, unsigned int *mm, unsigned int *dd);
+    int cols, unsigned int *year, unsigned int *month, unsigned int *day);
 
 int
 bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int formheight, unsigned int nitems,
-    struct bsddialog_formitem *items);
+    struct bsddialog_formitem *items, int *focusitem);
 
 int
 bsddialog_gauge(struct bsddialog_conf *conf, const char *text, int rows,
-    int cols, unsigned int perc, int fd, const char *sep);
+    int cols, unsigned int perc, int fd, const char *sep, const char *end);
 
 int
 bsddialog_infobox(struct bsddialog_conf *conf, const char *text, int rows,
@@ -221,7 +233,7 @@ bsddialog_msgbox(struct bsddialog_conf *conf, const char *text, int rows,
 
 int
 bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows,
-    int cols, unsigned int seconds);
+    int cols, unsigned int *seconds);
 
 int
 bsddialog_radiolist(struct bsddialog_conf *conf, const char *text, int rows,
diff --git a/contrib/bsddialog/lib/bsddialog_progressview.h b/contrib/bsddialog/lib/bsddialog_progressview.h
index 0cd9368a1040..5203b798bb07 100644
--- a/contrib/bsddialog/lib/bsddialog_progressview.h
+++ b/contrib/bsddialog/lib/bsddialog_progressview.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -36,14 +36,14 @@
 
 extern bool bsddialog_interruptprogview;
 extern bool bsddialog_abortprogview;
-extern int  bsddialog_total_progview;
+extern long long int bsddialog_total_progview;
 
 struct bsddialog_fileminibar {
 	const char *path;
 	const char *label;
 	int status; /* next if BSDDIALOG_MG_DONE or BSDDIALOG_MG_FAILED */
-	long long size;
-	long long read;
+	long long int size;
+	long long int read;
 };
 
 struct bsddialog_progviewconf {
diff --git a/contrib/bsddialog/lib/bsddialog_theme.h b/contrib/bsddialog/lib/bsddialog_theme.h
index 2f20d7b5a79c..2071896b61f0 100644
--- a/contrib/bsddialog/lib/bsddialog_theme.h
+++ b/contrib/bsddialog/lib/bsddialog_theme.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,9 +29,12 @@
 #define _LIBBSDDIALOG_THEME_H_
 
 /* color flags */
-#define BSDDIALOG_BOLD         1U
-#define BSDDIALOG_REVERSE      2U
-#define BSDDIALOG_UNDERLINE    4U
+#define BSDDIALOG_BLINK       1U
+#define BSDDIALOG_BOLD        2U
+#define BSDDIALOG_HALFBRIGHT  4U
+#define BSDDIALOG_HIGHLIGHT   8U
+#define BSDDIALOG_REVERSE    16U
+#define BSDDIALOG_UNDERLINE  32U
 
 struct bsddialog_theme {
 	struct {
@@ -52,17 +55,19 @@ struct bsddialog_theme {
 		int  arrowcolor;
 	} dialog;
 	struct {
+		int f_prefixcolor;
+		int prefixcolor;
 		int f_selectorcolor;
 		int selectorcolor;
 		int f_namecolor;
 		int namecolor;
 		int f_desccolor;
 		int desccolor;
-		int namesepcolor;
-		int descsepcolor;
 		int f_shortcutcolor;
 		int shortcutcolor;
 		int bottomdesccolor;
+		int sepnamecolor;
+		int sepdesccolor;
 	} menu;
 	struct {
 		int f_fieldcolor;
@@ -79,20 +84,19 @@ struct bsddialog_theme {
 		unsigned int maxmargin;
 		char leftdelim;
 		char rightdelim;
-		int delimcolor;
 		int f_delimcolor;
-		int color;
+		int delimcolor;
 		int f_color;
-		int shortcutcolor;
+		int color;
 		int f_shortcutcolor;
+		int shortcutcolor;
 	} button;
 };
 
 enum bsddialog_default_theme {
+	BSDDIALOG_THEME_3D,
 	BSDDIALOG_THEME_BLACKWHITE,
-	BSDDIALOG_THEME_BSDDIALOG,
-	BSDDIALOG_THEME_FLAT,
-	BSDDIALOG_THEME_DIALOG
+	BSDDIALOG_THEME_FLAT
 };
 
 enum bsddialog_color {
diff --git a/contrib/bsddialog/lib/calendarbox.c b/contrib/bsddialog/lib/calendarbox.c
deleted file mode 100644
index 3b55b26a13b8..000000000000
--- a/contrib/bsddialog/lib/calendarbox.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2022 Alfonso Sabato Siciliano
- *
- * 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.
- */
-
-#include <sys/param.h>
-
-#include <curses.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "bsddialog.h"
-#include "bsddialog_theme.h"
-#include "lib_util.h"
-
-#define MINHCAL   13
-#define MINWCAL   36 /* 34 calendar, 1 + 1 margins */
-#define MINYEAR   1900
-#define MAXYEAR   999999999
-
-static int month_days(int yy, int mm)
-{
-	int days;
-
-	if (mm == 2)
-		days = ISLEAP(yy) ? 29 : 28;
-	else if (mm == 4 || mm == 6 || mm == 9 || mm == 11)
-		days = 30;
-	else
-		days = 31;
-
-	return (days);
-}
-
-enum operation {
-	UP_DAY,
-	DOWN_DAY,
-	LEFT_DAY,
-	RIGHT_DAY,
-	UP_MONTH,
-	DOWN_MONTH,
-	UP_YEAR,
-	DOWN_YEAR
-};
-
-static void datectl(enum operation op, int *yy, int *mm, int *dd)
-{
-	int ndays;
-
-	ndays = month_days(*yy, *mm);
-
-	switch (op) {
-	case UP_DAY:
-		if (*dd > 7)
-			*dd -= 7;
-		else {
-			if (*mm == 1) {
-				*yy -= 1;
-				*mm = 12;
-			} else
-				*mm -= 1;
-			ndays = month_days(*yy, *mm);
-			*dd = ndays - abs(7 - *dd);
-		}
-		break;
-	case DOWN_DAY:
-		if (*dd + 7 < ndays)
-			*dd += 7;
-		else {
-			if (*mm == 12) {
-				*yy += 1;
-				*mm = 1;
-			} else
-				*mm += 1;
-			*dd = *dd + 7 - ndays;
-		}
-		break;
-	case LEFT_DAY:
-		if (*dd > 1)
-			*dd -= 1;
-		else {
-			if (*mm == 1) {
-				*yy -= 1;
-				*mm = 12;
-			} else
-				*mm -= 1;
-			*dd = month_days(*yy, *mm);
-		}
-		break;
-	case RIGHT_DAY:
-		if (*dd < ndays)
-			*dd += 1;
-		else {
-			if (*mm == 12) {
-				*yy += 1;
-				*mm = 1;
-			} else
-				*mm += 1;
-			*dd = 1;
-		}
-		break;
-	case UP_MONTH:
-		if (*mm == 1) {
-			*mm = 12;
-			*yy -= 1;
-		} else
-			*mm -= 1;
-		ndays = month_days(*yy, *mm);
-		if (*dd > ndays)
-			*dd = ndays;
-		break;
-	case DOWN_MONTH:
-		if (*mm == 12) {
-			*mm = 1;
-			*yy += 1;
-		} else
-			*mm += 1;
-		ndays = month_days(*yy, *mm);
-		if (*dd > ndays)
-			*dd = ndays;
-		break;
-	case UP_YEAR:
-		*yy -= 1;
-		ndays = month_days(*yy, *mm);
-		if (*dd > ndays)
-			*dd = ndays;
-		break;
-	case DOWN_YEAR:
-		*yy += 1;
-		ndays = month_days(*yy, *mm);
-		if (*dd > ndays)
-			*dd = ndays;
-		break;
-	}
-
-	if (*yy < MINYEAR) {
-		*yy = MINYEAR;
-		*mm = 1;
-		*dd = 1;
-	}
-	if (*yy > MAXYEAR) {
-		*yy = MAXYEAR;
-		*mm = 12;
-		*dd = 31;
-	}
-}
-
-static int week_day(int yy, int mm, int dd)
-{
-	int wd;
-
-	dd += mm < 3 ? yy-- : yy - 2;
-	wd = 23*mm/9 + dd + 4 + yy/4 - yy/100 + yy/400;
-	wd %= 7;
-
-	return (wd);
-}
-
-static void
-print_calendar(struct bsddialog_conf *conf, WINDOW *win, int yy, int mm, int dd,
-    bool active)
-{
-	int ndays, i, y, x, wd, h, w;
-
-	getmaxyx(win, h, w);
-	wclear(win);
-	draw_borders(conf, win, h, w, RAISED);
-	if (active) {
-		wattron(win, t.dialog.arrowcolor);
-		mvwhline(win, 0, 15, conf->ascii_lines ? '^' : ACS_UARROW, 4);
-		mvwhline(win, h-1, 15, conf->ascii_lines ? 'v' : ACS_DARROW, 4);
-		mvwvline(win, 3, 0, conf->ascii_lines ? '<' : ACS_LARROW, 3);
-		mvwvline(win, 3, w-1, conf->ascii_lines ? '>' : ACS_RARROW, 3);
-		wattroff(win, t.dialog.arrowcolor);
-	}
-
-	mvwaddstr(win, 1, 5, "Sun Mon Tue Wed Thu Fri Sat");
-	ndays = month_days(yy, mm);
-	y = 2;
-	wd = week_day(yy, mm, 1);
-	for (i = 1; i <= ndays; i++) {
-		x = 5 + (4 * wd); /* x has to be 6 with week number */
-		wmove(win, y, x);
-		mvwprintw(win, y, x, "%2d", i);
-		if (i == dd) {
-			wattron(win, t.menu.f_namecolor);
-			mvwprintw(win, y, x, "%2d", i);
-			wattroff(win, t.menu.f_namecolor);
-		}
-		wd++;
-		if (wd > 6) {
-			wd = 0;
-			y++;
-		}
-	}
-
-	wrefresh(win);
-}
-
-static void
-drawsquare(struct bsddialog_conf *conf, WINDOW *win, const char *fmt,
-    const void *value, bool focus)
-{
-	int h, w;
-
-	getmaxyx(win, h, w);
-	draw_borders(conf, win, h, w, RAISED);
-	if (focus) {
-		wattron(win, t.dialog.arrowcolor);
-		mvwhline(win, 0, 7, conf->ascii_lines ? '^' : ACS_UARROW, 3);
-		mvwhline(win, 2, 7, conf->ascii_lines ? 'v' : ACS_DARROW, 3);
-		wattroff(win, t.dialog.arrowcolor);
-	}
-
-	if (focus)
-		wattron(win, t.menu.f_namecolor);
-	if (strchr(fmt, 's') != NULL)
-		mvwprintw(win, 1, 1, fmt, (const char*)value);
-	else
-		mvwprintw(win, 1, 1, fmt, *((const int*)value));
-	if (focus)
-		wattroff(win, t.menu.f_namecolor);
-
-	wrefresh(win);
-}
-
-static int
-calendar_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
-    int *w, const char *text, struct buttons bs)
-{
-	int htext, wtext;
-
-	if (cols == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_AUTOSIZE) {
-		if (text_size(conf, rows, cols, text, &bs, MINHCAL, MINWCAL,
-		    &htext, &wtext) != 0)
-			return (BSDDIALOG_ERROR);
-	}
-
-	if (cols == BSDDIALOG_AUTOSIZE)
-		*w = widget_min_width(conf, wtext, MINWCAL, &bs);
-
-	if (rows == BSDDIALOG_AUTOSIZE)
-		*h = widget_min_height(conf, htext, MINHCAL, true);
-
-	return (0);
-}
-
-static int calendar_checksize(int rows, int cols, struct buttons bs)
-{
-	int mincols;
-
-	mincols = MAX(MINWCAL, buttons_min_width(bs));
-	mincols += VBORDERS;
-
-	if (cols < mincols)
-		RETURN_ERROR("Few cols for this calendar (at least 38)");
-
-	if (rows < MINHCAL + 2 + 2) /* 2 buttons + 2 borders */
-		RETURN_ERROR("Few rows for calendar (at least 17)");
-
-	return (0);
-}
-
-int
-bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows,
-    int cols, unsigned int *yy, unsigned int *mm, unsigned int *dd)
-{
-	bool loop, focusbuttons;
-	int retval, y, x, h, w, sel, ycal, xcal, year, month, day;
-	wint_t input;
-	WINDOW *widget, *textpad, *shadow, *yearwin, *monthwin, *daywin;
-	struct buttons bs;
-	const char *m[12] = {
-		"January", "February", "March", "April", "May", "June", "July",
-		"August", "September", "October", "November", "December"
-	};
-
-	if (yy == NULL || mm == NULL || dd == NULL)
-		RETURN_ERROR("yy / mm / dd cannot be NULL");
-
-	year = *yy > MAXYEAR ? MAXYEAR : *yy;
-	if (year < MINYEAR)
-		year = MINYEAR;
-	month = *mm > 12 ? 12 : *mm;
-	if (month == 0)
-		month = 1;
-	day = *dd == 0 ? 1 : *dd;
-	if(day > month_days(year, month))
-		day = month_days(year, month);
-
-	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
-
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-		return (BSDDIALOG_ERROR);
-	if (calendar_autosize(conf, rows, cols, &h, &w, text, bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (calendar_checksize(h, w, bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
-		return (BSDDIALOG_ERROR);
-
-	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
-	    true) != 0)
-		return (BSDDIALOG_ERROR);
-
-	pnoutrefresh(textpad, 0, 0, y+1, x+2, y+h-17, x+w-2);
-	doupdate();
-
-	ycal = y + h - 15;
-	xcal = x + w/2 - 17;
-	mvwaddstr(widget, h - 16, w/2 - 17, "Month");
-	monthwin = new_boxed_window(conf, ycal, xcal, 3, 17, RAISED);
-	mvwaddstr(widget, h - 16, w/2, "Year");
-	yearwin = new_boxed_window(conf, ycal, xcal + 17, 3, 17, RAISED);
-	daywin = new_boxed_window(conf, ycal + 3, xcal, 9, 34, RAISED);
-
-	wrefresh(widget);
-
-	sel = -1;
-	loop = focusbuttons = true;
-	while (loop) {
-		drawsquare(conf, monthwin, "%15s", m[month - 1], sel == 0);
-		drawsquare(conf, yearwin, "%15d", &year, sel == 1);
-		print_calendar(conf, daywin, year, month, day, sel == 2);
-
-		if (get_wch(&input) == ERR)
-			continue;
-		switch(input) {
-		case KEY_ENTER:
-		case 10: /* Enter */
-			if (focusbuttons || conf->button.always_active) {
-				retval = bs.value[bs.curr];
-				loop = false;
-			}
-			break;
-		case 27: /* Esc */
-			if (conf->key.enable_esc) {
-				retval = BSDDIALOG_ESC;
-				loop = false;
-			}
-			break;
-		case '\t': /* TAB */
-			if (focusbuttons) {
-				bs.curr++;
-				if (bs.curr >= (int)bs.nbuttons) {
-					focusbuttons = false;
-					sel = 0;
-					bs.curr = conf->button.always_active ?
-					    0 : -1;
-				}
-			} else {
-				sel++;
-				if (sel > 2) {
-					focusbuttons = true;
-					sel = -1;
-					bs.curr = 0;
-				}
-			}
-			draw_buttons(widget, bs, true);
-			wrefresh(widget);
-			break;
-		case KEY_RIGHT:
-			if (focusbuttons) {
-				bs.curr++;
-				if (bs.curr >= (int)bs.nbuttons) {
-					focusbuttons = false;
-					sel = 0;
-					bs.curr = conf->button.always_active ?
-					    0 : -1;
-				}
-			} else if (sel == 2) {
-				datectl(RIGHT_DAY, &year, &month, &day);
-			} else { /* Month or Year*/
-				sel++;
-			}
-			draw_buttons(widget, bs, true);
-			wrefresh(widget);
-			break;
-		case KEY_LEFT:
-			if (focusbuttons) {
-				bs.curr--;
-				if (bs.curr < 0) {
-					focusbuttons = false;
-					sel = 2;
-					bs.curr = conf->button.always_active ?
-					    0 : -1;
-				}
-			} else if (sel == 2) {
-				datectl(LEFT_DAY, &year, &month, &day);
-			} else if (sel == 1) {
-				sel = 0;
-			} else { /* sel = 0, Month */
-				focusbuttons = true;
-				sel = -1;
-				bs.curr = 0;
-			}
-			draw_buttons(widget, bs, true);
-			wrefresh(widget);
-			break;
-		case KEY_UP:
-			if (focusbuttons) {
-				sel = 2;
-				focusbuttons = false;
-				bs.curr = conf->button.always_active ? 0 : -1;
-				draw_buttons(widget, bs, true);
-				wrefresh(widget);
-			} else if (sel == 0) {
-				datectl(UP_MONTH, &year, &month, &day);
-			} else if (sel == 1) {
-				datectl(UP_YEAR, &year, &month, &day);
-			} else { /* sel = 2 */
-				datectl(UP_DAY, &year, &month, &day);
-			}
-			break;
-		case KEY_DOWN:
-			if (focusbuttons) {
-				break;
-			} else if (sel == 0) {
-				datectl(DOWN_MONTH, &year, &month, &day);
-			} else if (sel == 1) {
-				datectl(DOWN_YEAR, &year, &month, &day);
-			} else { /* sel = 2 */
-				datectl(DOWN_DAY, &year, &month, &day);
-			}
-			break;
-		case KEY_HOME:
-			datectl(UP_MONTH, &year, &month, &day);
-			break;
-		case KEY_END:
-			datectl(DOWN_MONTH, &year, &month, &day);
-			break;
-		case KEY_PPAGE:
-			datectl(UP_YEAR, &year, &month, &day);
-			break;
-		case KEY_NPAGE:
-			datectl(DOWN_YEAR, &year, &month, &day);
-			break;
-		case KEY_F(1):
-			if (conf->key.f1_file == NULL &&
-			    conf->key.f1_message == NULL)
-				break;
-			if (f1help(conf) != 0)
-				return (BSDDIALOG_ERROR);
-			/* No break, screen size can change */
-		case KEY_RESIZE:
-			/* Important for decreasing screen */
-			hide_widget(y, x, h, w, conf->shadow);
-			refresh();
-
-			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-				return (BSDDIALOG_ERROR);
-			if (calendar_autosize(conf, rows, cols, &h, &w, text,
-			    bs) != 0)
-				return (BSDDIALOG_ERROR);
-			if (calendar_checksize(h, w, bs) != 0)
-				return (BSDDIALOG_ERROR);
-			if (set_widget_position(conf, &y, &x, h, w) != 0)
-				return (BSDDIALOG_ERROR);
-
-			if (update_dialog(conf, shadow, widget, y, x, h, w,
-			    textpad, text, &bs, true) != 0)
-				return (BSDDIALOG_ERROR);
-			pnoutrefresh(textpad, 0, 0, y+1, x+2, y+h-17, x+w-2);
-			doupdate();
-
-			ycal = y + h - 15;
-			xcal = x + w/2 - 17;
-			mvwaddstr(widget, h - 16, w/2 - 17, "Month");
-			mvwin(monthwin, ycal, xcal);
-			mvwaddstr(widget, h - 16, w/2, "Year");
-			mvwin(yearwin, ycal, xcal + 17);
-			mvwin(daywin, ycal + 3, xcal);
-			wrefresh(widget);
-
-			/* Important to avoid grey lines expanding screen */
-			refresh();
-			break;
-		default:
-			if (shortcut_buttons(input, &bs)) {
-				retval = bs.value[bs.curr];
-				loop = false;
-			}
-		}
-	}
-
-	if (retval == BSDDIALOG_OK) {
-		*yy = year;
-		*mm = month;
-		*dd = day;
-	}
-
-	delwin(yearwin);
-	delwin(monthwin);
-	delwin(daywin);
-	end_dialog(conf, shadow, widget, textpad);
-
-	return (retval);
-}
\ No newline at end of file
diff --git a/contrib/bsddialog/lib/datebox.c b/contrib/bsddialog/lib/datebox.c
new file mode 100644
index 000000000000..9f26b2d08093
--- /dev/null
+++ b/contrib/bsddialog/lib/datebox.c
@@ -0,0 +1,715 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022-2023 Alfonso Sabato Siciliano
+ *
+ * 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.
+ */
+
+#include <curses.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "bsddialog.h"
+#include "bsddialog_theme.h"
+#include "lib_util.h"
+
+/* Calendar */
+#define MIN_YEAR_CAL   0
+#define MAX_YEAR_CAL   999999999
+#define MINHCAL        13
+#define MINWCAL        36 /* 34 calendar, 1 + 1 margins */
+/* Datebox */
+#define MIN_YEAR_DATE  0
+#define MAX_YEAR_DATE  9999
+#define MINWDATE       23 /* 3 windows and their borders */
+
+#define ISLEAP(year) ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)
+
+static int minyear;
+static int maxyear;
+
+static const char *m[12] = {
+	"January",
+	"February",
+	"March",
+	"April",
+	"May",
+	"June",
+	"July",
+	"August",
+	"September",
+	"October",
+	"November",
+	"December"
+};
+
+enum operation {
+	UP_DAY,
+	DOWN_DAY,
+	LEFT_DAY,
+	RIGHT_DAY,
+	UP_MONTH,
+	DOWN_MONTH,
+	UP_YEAR,
+	DOWN_YEAR
+};
+
+/* private datebox item */
+struct dateitem {
+	enum operation up;
+	enum operation down;
+	WINDOW *win;
+	int width;
+	const char *fmt;
+	int *value;
+};
+
+static int month_days(int yy, int mm)
+{
+	int days;
+
+	if (mm == 2)
+		days = ISLEAP(yy) ? 29 : 28;
+	else if (mm == 4 || mm == 6 || mm == 9 || mm == 11)
+		days = 30;
+	else
+		days = 31;
+
+	return (days);
+}
+
+static int week_day(int yy, int mm, int dd)
+{
+	int wd;
+
+	dd += mm < 3 ? yy-- : yy - 2;
+	wd = 23*mm/9 + dd + 4 + yy/4 - yy/100 + yy/400;
+	wd %= 7;
+
+	return (wd);
+}
+
+static void
+init_date(unsigned int *year, unsigned int *month, unsigned int *day, int *yy,
+    int *mm, int *dd)
+{
+	*yy = MIN(*year, (unsigned int)maxyear);
+	if (*yy < minyear)
+		*yy = minyear;
+	*mm = MIN(*month, 12);
+	if (*mm == 0)
+		*mm = 1;
+	*dd = (*day == 0) ? 1 : *day;
+	if(*dd > month_days(*yy, *mm))
+		*dd = month_days(*yy, *mm);
+}
+
+static void datectl(enum operation op, int *yy, int *mm, int *dd)
+{
+	int ndays;
+
+	ndays = month_days(*yy, *mm);
+
+	switch (op) {
+	case UP_DAY:
+		if (*dd > 7)
+			*dd -= 7;
+		else {
+			if (*mm == 1) {
+				*yy -= 1;
+				*mm = 12;
+			} else
+				*mm -= 1;
+			ndays = month_days(*yy, *mm);
+			*dd = ndays - abs(7 - *dd);
+		}
+		break;
+	case DOWN_DAY:
+		if (*dd + 7 < ndays)
+			*dd += 7;
+		else {
+			if (*mm == 12) {
+				*yy += 1;
+				*mm = 1;
+			} else
+				*mm += 1;
+			*dd = *dd + 7 - ndays;
+		}
+		break;
+	case LEFT_DAY:
+		if (*dd > 1)
+			*dd -= 1;
+		else {
+			if (*mm == 1) {
+				*yy -= 1;
+				*mm = 12;
+			} else
+				*mm -= 1;
+			*dd = month_days(*yy, *mm);
+		}
+		break;
+	case RIGHT_DAY:
+		if (*dd < ndays)
+			*dd += 1;
+		else {
+			if (*mm == 12) {
+				*yy += 1;
+				*mm = 1;
+			} else
+				*mm += 1;
+			*dd = 1;
+		}
+		break;
+	case UP_MONTH:
+		if (*mm == 1) {
+			*mm = 12;
+			*yy -= 1;
+		} else
+			*mm -= 1;
+		ndays = month_days(*yy, *mm);
+		if (*dd > ndays)
+			*dd = ndays;
+		break;
+	case DOWN_MONTH:
+		if (*mm == 12) {
+			*mm = 1;
+			*yy += 1;
+		} else
+			*mm += 1;
+		ndays = month_days(*yy, *mm);
+		if (*dd > ndays)
+			*dd = ndays;
+		break;
+	case UP_YEAR:
+		*yy -= 1;
+		ndays = month_days(*yy, *mm);
+		if (*dd > ndays)
+			*dd = ndays;
+		break;
+	case DOWN_YEAR:
+		*yy += 1;
+		ndays = month_days(*yy, *mm);
+		if (*dd > ndays)
+			*dd = ndays;
+		break;
+	}
+
+	if (*yy < minyear) {
+		*yy = minyear;
+		*mm = 1;
+		*dd = 1;
+	}
+	if (*yy > maxyear) {
+		*yy = maxyear;
+		*mm = 12;
+		*dd = 31;
+	}
+}
+
+static void
+drawsquare(struct bsddialog_conf *conf, WINDOW *win, enum elevation elev,
+    const char *fmt, int value, bool focus)
+{
+	int h, l, w;
+
+	getmaxyx(win, h, w);
+	draw_borders(conf, win, elev);
+	if (focus) {
+		l = 2 + w%2;
+		wattron(win, t.dialog.arrowcolor);
+		mvwhline(win, 0, w/2 - l/2,
+		    conf->ascii_lines ? '^' : ACS_UARROW, l);
+		mvwhline(win, h-1, w/2 - l/2,
+		    conf->ascii_lines ? 'v' : ACS_DARROW, l);
+		wattroff(win, t.dialog.arrowcolor);
+	}
+
+	if (focus)
+		wattron(win, t.menu.f_namecolor);
+	if (strchr(fmt, 's') != NULL)
+		mvwprintw(win, 1, 1, fmt, m[value - 1]);
+	else
+		mvwprintw(win, 1, 1, fmt, value);
+	if (focus)
+		wattroff(win, t.menu.f_namecolor);
+
+	wnoutrefresh(win);
+}
+
+static void
+print_calendar(struct bsddialog_conf *conf, WINDOW *win, int yy, int mm, int dd,
+    bool active)
+{
+	int ndays, i, y, x, wd, h, w;
+
+	getmaxyx(win, h, w);
+	wclear(win);
+	draw_borders(conf, win, RAISED);
+	if (active) {
+		wattron(win, t.dialog.arrowcolor);
+		mvwhline(win, 0, 15, conf->ascii_lines ? '^' : ACS_UARROW, 4);
+		mvwhline(win, h-1, 15, conf->ascii_lines ? 'v' : ACS_DARROW, 4);
+		mvwvline(win, 3, 0, conf->ascii_lines ? '<' : ACS_LARROW, 3);
+		mvwvline(win, 3, w-1, conf->ascii_lines ? '>' : ACS_RARROW, 3);
+		wattroff(win, t.dialog.arrowcolor);
+	}
+
+	mvwaddstr(win, 1, 5, "Sun Mon Tue Wed Thu Fri Sat");
+	ndays = month_days(yy, mm);
+	y = 2;
+	wd = week_day(yy, mm, 1);
+	for (i = 1; i <= ndays; i++) {
+		x = 5 + (4 * wd); /* x has to be 6 with week number */
+		wmove(win, y, x);
+		mvwprintw(win, y, x, "%2d", i);
+		if (i == dd) {
+			wattron(win, t.menu.f_namecolor);
+			mvwprintw(win, y, x, "%2d", i);
+			wattroff(win, t.menu.f_namecolor);
+		}
+		wd++;
+		if (wd > 6) {
+			wd = 0;
+			y++;
+		}
+	}
+
+	wnoutrefresh(win);
+}
+
+static int
+calendar_redraw(struct dialog *d, WINDOW *yy_win, WINDOW *mm_win,
+    WINDOW *dd_win)
+{
+	int ycal, xcal;
+
+	if (d->built) {
+		hide_dialog(d);
+		refresh(); /* Important for decreasing screen */
+	}
+	if (dialog_size_position(d, MINHCAL, MINWCAL, NULL) != 0)
+		return (BSDDIALOG_ERROR);
+	if (draw_dialog(d) != 0)
+		return (BSDDIALOG_ERROR);
+	if (d->built)
+		refresh(); /* Important to fix grey lines expanding screen */
+	TEXTPAD(d, MINHCAL + HBUTTONS);
+
+	ycal = d->y + d->h - 15;
+	xcal = d->x + d->w/2 - 17;
+	mvwaddstr(d->widget, d->h - 16, d->w/2 - 17, "Month");
+	update_box(d->conf, mm_win, ycal, xcal, 3, 17, RAISED);
+	mvwaddstr(d->widget, d->h - 16, d->w/2, "Year");
+	update_box(d->conf, yy_win, ycal, xcal + 17, 3, 17, RAISED);
+	update_box(d->conf, dd_win, ycal + 3, xcal, 9, 34, RAISED);
+	wnoutrefresh(d->widget);
+
+	return (0);
+}
+
+int
+bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows,
+    int cols, unsigned int *year, unsigned int *month, unsigned int *day)
+{
+	bool loop, focusbuttons;
+	int retval, sel, yy, mm, dd;
+	wint_t input;
+	WINDOW *yy_win, *mm_win, *dd_win;
+	struct dialog d;
+
+	CHECK_PTR(year);
+	CHECK_PTR(month);
+	CHECK_PTR(day);
+	minyear = MIN_YEAR_CAL;
+	maxyear = MAX_YEAR_CAL;
+	init_date(year, month, day, &yy, &mm, &dd);
+
+	if (prepare_dialog(conf, text, rows, cols, &d) != 0)
+		return (BSDDIALOG_ERROR);
+	set_buttons(&d, true, OK_LABEL, CANCEL_LABEL);
+	if ((yy_win = newwin(1, 1, 1, 1)) == NULL)
+		RETURN_ERROR("Cannot build WINDOW for yy");
+	wbkgd(yy_win, t.dialog.color);
+	if ((mm_win = newwin(1, 1, 1, 1)) == NULL)
+		RETURN_ERROR("Cannot build WINDOW for mm");
+	wbkgd(mm_win, t.dialog.color);
+	if ((dd_win = newwin(1, 1, 1, 1)) == NULL)
+		RETURN_ERROR("Cannot build WINDOW for dd");
+	wbkgd(dd_win, t.dialog.color);
+	if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0)
+		return (BSDDIALOG_ERROR);
+
+	sel = -1;
+	loop = focusbuttons = true;
+	while (loop) {
+		drawsquare(conf, mm_win, RAISED, "%15s", mm, sel == 0);
+		drawsquare(conf, yy_win, RAISED, "%15d", yy, sel == 1);
+		print_calendar(conf, dd_win, yy, mm, dd, sel == 2);
+		doupdate();
+
+		if (get_wch(&input) == ERR)
+			continue;
+		switch(input) {
+		case KEY_ENTER:
+		case 10: /* Enter */
+			if (focusbuttons || conf->button.always_active) {
+				retval = BUTTONVALUE(d.bs);
+				loop = false;
+			}
+			break;
+		case 27: /* Esc */
+			if (conf->key.enable_esc) {
+				retval = BSDDIALOG_ESC;
+				loop = false;
+			}
+			break;
+		case '\t': /* TAB */
+			if (focusbuttons) {
+				d.bs.curr++;
+				if (d.bs.curr >= (int)d.bs.nbuttons) {
+					focusbuttons = false;
+					sel = 0;
+					d.bs.curr = conf->button.always_active ?
+					    0 : -1;
+				}
+			} else {
+				sel++;
+				if (sel > 2) {
+					focusbuttons = true;
+					sel = -1;
+					d.bs.curr = 0;
+				}
+			}
+			DRAW_BUTTONS(d);
+			break;
+		case KEY_RIGHT:
+			if (focusbuttons) {
+				d.bs.curr++;
+				if (d.bs.curr >= (int)d.bs.nbuttons) {
+					focusbuttons = false;
+					sel = 0;
+					d.bs.curr = conf->button.always_active ?
+					    0 : -1;
+				}
+			} else if (sel == 2) {
+				datectl(RIGHT_DAY, &yy, &mm, &dd);
+			} else { /* Month or Year*/
+				sel++;
+			}
+			DRAW_BUTTONS(d);
+			break;
+		case KEY_LEFT:
+			if (focusbuttons) {
+				d.bs.curr--;
+				if (d.bs.curr < 0) {
+					focusbuttons = false;
+					sel = 2;
+					d.bs.curr = conf->button.always_active ?
+					    0 : -1;
+				}
+			} else if (sel == 2) {
+				datectl(LEFT_DAY, &yy, &mm, &dd);
+			} else if (sel == 1) {
+				sel = 0;
+			} else { /* sel = 0, Month */
+				focusbuttons = true;
+				sel = -1;
+				d.bs.curr = 0;
+			}
+			DRAW_BUTTONS(d);
+			break;
+		case KEY_UP:
+			if (focusbuttons) {
+				sel = 2;
+				focusbuttons = false;
+				d.bs.curr = conf->button.always_active ? 0 : -1;
+				DRAW_BUTTONS(d);
+			} else if (sel == 0) {
+				datectl(UP_MONTH, &yy, &mm, &dd);
+			} else if (sel == 1) {
+				datectl(UP_YEAR, &yy, &mm, &dd);
+			} else { /* sel = 2 */
+				datectl(UP_DAY, &yy, &mm, &dd);
+			}
+			break;
+		case KEY_DOWN:
+			if (focusbuttons) {
+				break;
+			} else if (sel == 0) {
+				datectl(DOWN_MONTH, &yy, &mm, &dd);
+			} else if (sel == 1) {
+				datectl(DOWN_YEAR, &yy, &mm, &dd);
+			} else { /* sel = 2 */
+				datectl(DOWN_DAY, &yy, &mm, &dd);
+			}
+			break;
+		case KEY_HOME:
+			datectl(UP_MONTH, &yy, &mm, &dd);
+			break;
+		case KEY_END:
+			datectl(DOWN_MONTH, &yy, &mm, &dd);
+			break;
+		case KEY_PPAGE:
+			datectl(UP_YEAR, &yy, &mm, &dd);
+			break;
+		case KEY_NPAGE:
+			datectl(DOWN_YEAR, &yy, &mm, &dd);
+			break;
+		case KEY_F(1):
+			if (conf->key.f1_file == NULL &&
+			    conf->key.f1_message == NULL)
+				break;
+			if (f1help_dialog(conf) != 0)
+				return (BSDDIALOG_ERROR);
+			if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0)
+				return (BSDDIALOG_ERROR);
+			break;
+		case KEY_RESIZE:
+			if (calendar_redraw(&d, yy_win, mm_win, dd_win) != 0)
+				return (BSDDIALOG_ERROR);
+			break;
+		default:
+			if (shortcut_buttons(input, &d.bs)) {
+				DRAW_BUTTONS(d);
+				doupdate();
+				retval = BUTTONVALUE(d.bs);
+				loop = false;
+			}
+		}
+	}
+
+	*year  = yy;
+	*month = mm;
+	*day   = dd;
+
+	delwin(yy_win);
+	delwin(mm_win);
+	delwin(dd_win);
+	end_dialog(&d);
+
+	return (retval);
+}
+
+static int datebox_redraw(struct dialog *d, struct dateitem *di)
+{
+	int y, x;
+
+	if (d->built) {
+		hide_dialog(d);
+		refresh(); /* Important for decreasing screen */
+	}
+	if (dialog_size_position(d, 3 /*windows*/, MINWDATE, NULL) != 0)
+		return (BSDDIALOG_ERROR);
+	if (draw_dialog(d) != 0)
+		return (BSDDIALOG_ERROR);
+	if (d->built)
+		refresh(); /* Important to fix grey lines expanding screen */
+	TEXTPAD(d, 3 /*windows*/ + HBUTTONS);
+
+	y = d->y + d->h - 6;
+	x = (d->x + d->w / 2) - 11;
+	update_box(d->conf, di[0].win, y, x, 3, di[0].width, LOWERED);
+	mvwaddch(d->widget, d->h - 5, x - d->x + di[0].width, '/');
+	x += di[0].width + 1;
+	update_box(d->conf, di[1].win, y, x , 3, di[1].width, LOWERED);
+	mvwaddch(d->widget, d->h - 5, x - d->x + di[1].width, '/');
+	x += di[1].width + 1;
+	update_box(d->conf, di[2].win, y, x, 3, di[2].width, LOWERED);
+	wnoutrefresh(d->widget);
+
+	return (0);
+}
+
+static int
+build_dateitem(const char *format, int *yy, int *mm, int *dd,
+    struct dateitem *dt)
+{
+	int i;
+	wchar_t *wformat;
+	struct dateitem init[3] = {
+		{UP_YEAR,  DOWN_YEAR,  NULL, 6,  "%4d",  yy},
+		{UP_MONTH, DOWN_MONTH, NULL, 11, "%9s",  mm},
+		{LEFT_DAY, RIGHT_DAY,  NULL, 4,  "%02d", dd},
+	};
+
+	for (i = 0; i < 3; i++) {
+		if ((init[i].win = newwin(1, 1, 1, 1)) == NULL)
+			RETURN_FMTERROR("Cannot build WINDOW dateitem[%d]", i);
+		wbkgd(init[i].win, t.dialog.color);
+	}
+
+	if ((wformat = alloc_mbstows(CHECK_STR(format))) == NULL)
+		RETURN_ERROR("Cannot allocate conf.date.format in wchar_t*");
+	if (format == NULL || wcscmp(wformat, L"d/m/y") == 0) {
+		dt[0] = init[2];
+		dt[1] = init[1];
+		dt[2] = init[0];
+	} else if (wcscmp(wformat, L"m/d/y") == 0) {
+		dt[0] = init[1];
+		dt[1] = init[2];
+		dt[2] = init[0];
+	} else if (wcscmp(wformat, L"y/m/d") == 0) {
+		dt[0] = init[0];
+		dt[1] = init[1];
+		dt[2] = init[2];
+	} else
+		RETURN_FMTERROR("Invalid conf.date.format=\"%s\"", format);
+	free(wformat);
+
+	return (0);
+}
+
+int
+bsddialog_datebox(struct bsddialog_conf *conf, const char *text, int rows,
+    int cols, unsigned int *year, unsigned int *month, unsigned int *day)
+{
+	bool loop, focusbuttons;
+	int retval, i, sel, yy, mm, dd;
+	wint_t input;
+	struct dateitem  di[3];
+	struct dialog d;
+
+	CHECK_PTR(year);
+	CHECK_PTR(month);
+	CHECK_PTR(day);
+	minyear = MIN_YEAR_DATE;
+	maxyear = MAX_YEAR_DATE;
+	init_date(year, month, day, &yy, &mm, &dd);
+
+	if (prepare_dialog(conf, text, rows, cols, &d) != 0)
+		return (BSDDIALOG_ERROR);
+	set_buttons(&d, true, OK_LABEL, CANCEL_LABEL);
+	if (build_dateitem(conf->date.format, &yy, &mm, &dd, di) != 0)
+		return (BSDDIALOG_ERROR);
+	if (datebox_redraw(&d, di) != 0)
+		return (BSDDIALOG_ERROR);
+
+	sel = -1;
+	loop = focusbuttons = true;
+	while (loop) {
+		for (i = 0; i < 3; i++)
+			drawsquare(conf, di[i].win, LOWERED, di[i].fmt,
+			    *di[i].value, sel == i);
+		doupdate();
+
+		if (get_wch(&input) == ERR)
+			continue;
+		switch(input) {
+		case KEY_ENTER:
+		case 10: /* Enter */
+			if (focusbuttons || conf->button.always_active) {
+				retval = BUTTONVALUE(d.bs);
+				loop = false;
+			}
+			break;
+		case 27: /* Esc */
+			if (conf->key.enable_esc) {
+				retval = BSDDIALOG_ESC;
+				loop = false;
+			}
+			break;
+		case KEY_RIGHT:
+		case '\t': /* TAB */
+			if (focusbuttons) {
+				d.bs.curr++;
+				focusbuttons = d.bs.curr < (int)d.bs.nbuttons ?
+				    true : false;
+				if (focusbuttons == false) {
+					sel = 0;
+					d.bs.curr = conf->button.always_active ?
+					    0 : -1;
+				}
+			} else {
+				sel++;
+				focusbuttons = sel > 2 ? true : false;
+				if (focusbuttons) {
+					d.bs.curr = 0;
+				}
+			}
+			DRAW_BUTTONS(d);
+			break;
+		case KEY_LEFT:
+			if (focusbuttons) {
+				d.bs.curr--;
+				focusbuttons = d.bs.curr < 0 ? false : true;
+				if (focusbuttons == false) {
+					sel = 2;
+					d.bs.curr = conf->button.always_active ?
+					    0 : -1;
+				}
+			} else {
+				sel--;
+				focusbuttons = sel < 0 ? true : false;
+				if (focusbuttons)
+					d.bs.curr = (int)d.bs.nbuttons - 1;
+			}
+			DRAW_BUTTONS(d);
+			break;
+		case KEY_UP:
+			if (focusbuttons) {
+				sel = 0;
+				focusbuttons = false;
+				d.bs.curr = conf->button.always_active ? 0 : -1;
+				DRAW_BUTTONS(d);
+			} else {
+				datectl(di[sel].up, &yy, &mm, &dd);
+			}
+			break;
+		case KEY_DOWN:
+			if (focusbuttons)
+				break;
+			datectl(di[sel].down, &yy, &mm, &dd);
+			break;
+		case KEY_F(1):
+			if (conf->key.f1_file == NULL &&
+			    conf->key.f1_message == NULL)
+				break;
+			if (f1help_dialog(conf) != 0)
+				return (BSDDIALOG_ERROR);
+			if (datebox_redraw(&d, di) != 0)
+				return (BSDDIALOG_ERROR);
+			break;
+		case KEY_RESIZE:
+			if (datebox_redraw(&d, di) != 0)
+				return (BSDDIALOG_ERROR);
+			break;
+		default:
+			if (shortcut_buttons(input, &d.bs)) {
+				DRAW_BUTTONS(d);
+				doupdate();
+				retval = BUTTONVALUE(d.bs);
+				loop = false;
+			}
+		}
+	}
+
+	*year  = yy;
+	*month = mm;
+	*day   = dd;
+
+	for (i = 0; i < 3 ; i++)
+		delwin(di[i].win);
+	end_dialog(&d);
+
+	return (retval);
+}
\ No newline at end of file
diff --git a/contrib/bsddialog/lib/formbox.c b/contrib/bsddialog/lib/formbox.c
index 5b1d2ab61de2..5e80471c6974 100644
--- a/contrib/bsddialog/lib/formbox.c
+++ b/contrib/bsddialog/lib/formbox.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,18 +25,23 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
-
 #include <curses.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
+enum field_action {
+	MOVE_CURSOR_BEGIN,
+	MOVE_CURSOR_END,
+	MOVE_CURSOR_RIGHT,
+	MOVE_CURSOR_LEFT,
+	DEL_LETTER
+};
+
 struct privateitem {
 	const char *label;      /* formitem.label */
 	unsigned int ylabel;    /* formitem.ylabel */
@@ -63,39 +68,157 @@ struct privateitem {
 };
 
 struct privateform {
-	WINDOW *border;
-
+	WINDOW *box;         /* window to draw borders */
 	WINDOW *pad;
-	unsigned int h;    /* only to create pad */
-	unsigned int w;    /* only to create pad */
-	unsigned int wmin; /* to refresh, w can change for FIELDEXTEND */
-	unsigned int ys;   /* to refresh */
-	unsigned int ye;   /* to refresh */
-	unsigned int xs;   /* to refresh */
-	unsigned int xe;   /* to refresh */
-	unsigned int y;    /* changes moving focus around items */
+	unsigned int h;      /* only to create pad */
+	unsigned int w;      /* only to create pad */
+	unsigned int wmin;   /* to refresh, w can change for FIELDEXTEND */
+	unsigned int ys;     /* to refresh */
+	unsigned int ye;     /* to refresh */
+	unsigned int xs;     /* to refresh */
+	unsigned int xe;     /* to refresh */
+	unsigned int y;      /* changes moving focus around items */
+	unsigned int formheight;  /* API formheight */
 	unsigned int viewrows;    /* visible rows, real formheight */
 	unsigned int minviewrows; /* min viewrows, ylabel != yfield */
-
-	wchar_t securewch; /* wide char of conf.form.secure[mb]ch */
+	wchar_t securewch;   /* wide char of conf.form.secure[mb]ch */
+	unsigned int nitems; /* like API nkitems */
+	struct privateitem *pritems;
+	int sel;             /* selected item in pritem, can be -1 */
+	bool hasbottomdesc;  /* some item has bottomdesc */
 };
 
-enum operation {
-	MOVE_CURSOR_BEGIN,
-	MOVE_CURSOR_END,
-	MOVE_CURSOR_RIGHT,
-	MOVE_CURSOR_LEFT,
-	DEL_LETTER
-};
+static int
+build_privateform(struct bsddialog_conf*conf, unsigned int nitems,
+    struct bsddialog_formitem *items, struct privateform *f)
+{
+	bool insecurecursor;
+	int mbchsize;
+	unsigned int i, j, itemybeg, itemxbeg, tmp;
+	wchar_t *winit;
+	struct privateitem *item;
 
-static bool fieldctl(struct privateitem *item, enum operation op)
+	/* checks */
+	CHECK_ARRAY(nitems, items);
+	for (i = 0; i < nitems; i++) {
+		if (items[i].maxvaluelen == 0)
+			RETURN_FMTERROR("item %u [0-%u] maxvaluelen = 0",
+			    i, nitems);
+		if (items[i].fieldlen == 0)
+			RETURN_FMTERROR("item %u [0-%u] fieldlen = 0",
+			    i, nitems);
+	}
+	f->nitems = nitems;
+
+	/* insecure ch */
+	insecurecursor = false;
+	if (conf->form.securembch != NULL) {
+		mbchsize = mblen(conf->form.securembch, MB_LEN_MAX);
+		if(mbtowc(&f->securewch, conf->form.securembch, mbchsize) < 0)
+			RETURN_ERROR("Cannot convert securembch to wchar_t");
+		insecurecursor = true;
+	} else if (conf->form.securech != '\0') {
+		f->securewch = btowc(conf->form.securech);
+		insecurecursor = true;
+	} else {
+		f->securewch = L' ';
+	}
+
+	/* alloc and set private items */
+	f->pritems = malloc(f->nitems * sizeof(struct privateitem));
+	if (f->pritems == NULL)
+		RETURN_ERROR("Cannot allocate internal form.pritems");
+	f->hasbottomdesc = false;
+	f->h = f->w = f->minviewrows = 0;
+	for (i = 0; i < f->nitems; i++) {
+		item = &f->pritems[i];
+		item->label = CHECK_STR(items[i].label);
+		item->ylabel = items[i].ylabel;
+		item->xlabel = items[i].xlabel;
+		item->yfield = items[i].yfield;
+		item->xfield = items[i].xfield;
+		item->secure = items[i].flags & BSDDIALOG_FIELDHIDDEN;
+		item->readonly = items[i].flags & BSDDIALOG_FIELDREADONLY;
+		item->fieldnocolor = items[i].flags & BSDDIALOG_FIELDNOCOLOR;
+		item->extendfield = items[i].flags & BSDDIALOG_FIELDEXTEND;
+		item->fieldonebyte = items[i].flags &
+		    BSDDIALOG_FIELDSINGLEBYTE;
+		item->cursorend = items[i].flags & BSDDIALOG_FIELDCURSOREND;
+		item->bottomdesc = CHECK_STR(items[i].bottomdesc);
+		if (items[i].bottomdesc != NULL)
+			f->hasbottomdesc = true;
+		if (item->readonly || (item->secure && !insecurecursor))
+			item->cursor = false;
+		else
+			item->cursor = true;
+
+		item->maxletters = items[i].maxvaluelen;
+		item->privwbuf = calloc(item->maxletters + 1, sizeof(wchar_t));
+		if (item->privwbuf == NULL)
+			RETURN_ERROR("Cannot allocate item private buffer");
+		memset(item->privwbuf, 0, item->maxletters + 1);
+		item->pubwbuf = calloc(item->maxletters + 1, sizeof(wchar_t));
+		if (item->pubwbuf == NULL)
+			RETURN_ERROR("Cannot allocate item private buffer");
+		memset(item->pubwbuf, 0, item->maxletters + 1);
+
+		if ((winit = alloc_mbstows(CHECK_STR(items[i].init))) == NULL)
+			RETURN_ERROR("Cannot allocate item.init in wchar_t*");
+		wcsncpy(item->privwbuf, winit, item->maxletters);
+		wcsncpy(item->pubwbuf, winit, item->maxletters);
+		free(winit);
+		item->nletters = wcslen(item->pubwbuf);
+		if (item->secure) {
+			for (j = 0; j < item->nletters; j++)
+				item->pubwbuf[j] = f->securewch;
+		}
+
+		item->fieldcols = items[i].fieldlen;
+		item->xposdraw = 0;
+		item->xcursor = 0;
+		item->pos = 0;
+
+		/* size and position */
+		f->h = MAX(f->h, item->ylabel);
+		f->h = MAX(f->h, item->yfield);
+		f->w = MAX(f->w, item->xlabel + strcols(item->label));
+		f->w = MAX(f->w, item->xfield + item->fieldcols);
+		if (i == 0) {
+			itemybeg = MIN(item->ylabel, item->yfield);
+			itemxbeg = MIN(item->xlabel, item->xfield);
+		} else {
+			tmp = MIN(item->ylabel, item->yfield);
+			itemybeg = MIN(itemybeg, tmp);
+			tmp = MIN(item->xlabel, item->xfield);
+			itemxbeg = MIN(itemxbeg, tmp);
+		}
+		tmp = abs((int)item->ylabel - (int)item->yfield);
+		f->minviewrows = MAX(f->minviewrows, tmp);
+	}
+	if (f->nitems > 0) {
+		f->h = f->h + 1 - itemybeg;
+		f->w -= itemxbeg;
+		f->minviewrows += 1;
+	}
+	f->wmin = f->w;
+	for (i = 0; i < f->nitems; i++) {
+		f->pritems[i].ylabel -= itemybeg;
+		f->pritems[i].yfield -= itemybeg;
+		f->pritems[i].xlabel -= itemxbeg;
+		f->pritems[i].xfield -= itemxbeg;
+	}
+
+	return (0);
+}
+
+static bool fieldctl(struct privateitem *item, enum field_action act)
 {
 	bool change;
 	int width, oldwidth, nextwidth, cols;
 	unsigned int i;
 
 	change = false;
-	switch (op){
+	switch (act){
 	case MOVE_CURSOR_BEGIN:
 		if (item->pos == 0 && item->xcursor == 0)
 			break;
@@ -191,71 +314,7 @@ static bool fieldctl(struct privateitem *item, enum operation op)
 	return (change);
 }
 
-static void
-drawitem(struct privateform *form, struct privateitem *item, bool focus)
-{
-	int color;
-	unsigned int n, cols;
-
-	/* Label */
-	wattron(form->pad, t.dialog.color);
-	mvwaddstr(form->pad, item->ylabel, item->xlabel, item->label);
-	wattroff(form->pad, t.dialog.color);
-
-	/* Field */
-	if (item->readonly)
-		color = t.form.readonlycolor;
-	else if (item->fieldnocolor)
-		color = t.dialog.color;
-	else
-		color = focus ? t.form.f_fieldcolor : t.form.fieldcolor;
-	wattron(form->pad, color);
-	mvwhline(form->pad, item->yfield, item->xfield, ' ', item->fieldcols);
-	n = 0;
-	cols = wcwidth(item->pubwbuf[item->xposdraw]);
-	while (cols <= item->fieldcols && item->xposdraw + n <
-	    wcslen(item->pubwbuf)) {
-		n++;
-		cols += wcwidth(item->pubwbuf[item->xposdraw + n]);
-
-	}
-	mvwaddnwstr(form->pad, item->yfield, item->xfield,
-	    &item->pubwbuf[item->xposdraw], n);
-	wattroff(form->pad, color);
-
-	/* Bottom Desc */
-	move(SCREENLINES - 1, 2);
-	clrtoeol();
-	if (item->bottomdesc != NULL && focus) {
-		attron(t.form.bottomdesccolor);
-		addstr(item->bottomdesc);
-		attroff(t.form.bottomdesccolor);
-		refresh();
-	}
-
-	/* Cursor */
-	curs_set((focus && item->cursor) ? 1 : 0);
-	wmove(form->pad, item->yfield, item->xfield + item->xcursor);
-
-	prefresh(form->pad, form->y, 0, form->ys, form->xs, form->ye, form->xe);
-}
-
-/*
- * Trick: draw 2 times an item switching focus.
- * Problem: curses tries to optimize the rendering but sometimes it misses some
- * updates or draws old stuff. libformw has a similar problem fixed by the
- * same trick.
- * Case 1: KEY_DC and KEY_BACKSPACE, deleted multicolumn letters are drawn
- * again. It seems fixed by new items pad and prefresh(), previously WINDOW.
- * Case2: some terminal, tmux and ssh does not show the cursor.
- */
-#define DRAWITEM_TRICK(form,item,focus) do {                                   \
-	drawitem(form, item, !focus);                                          \
-	drawitem(form, item, focus);                                           \
-} while (0)
-
-static bool
-insertch(struct privateform *form, struct privateitem *item, wchar_t wch)
+static bool insertch(struct privateitem *item, wchar_t wch, wchar_t securewch)
 {
 	int i;
 
@@ -268,7 +327,7 @@ insertch(struct privateform *form, struct privateitem *item, wchar_t wch)
 	}
 
 	item->privwbuf[item->pos] = wch;
-	item->pubwbuf[item->pos] = item->secure ? form->securewch : wch;
+	item->pubwbuf[item->pos] = item->secure ? securewch : wch;
 	item->nletters += 1;
 	item->privwbuf[item->nletters] = L'\0';
 	item->pubwbuf[item->nletters] = L'\0';
@@ -296,25 +355,40 @@ static char* alloc_wstomb(wchar_t *wstr)
 }
 
 static int
-return_values(struct bsddialog_conf *conf, int output, int nitems,
-    struct bsddialog_formitem *apiitems, struct privateitem *items)
+return_values(struct bsddialog_conf *conf, struct privateform *f,
+    struct bsddialog_formitem *items)
 {
-	int i;
+	unsigned int i;
 
-	if (output != BSDDIALOG_OK && conf->form.value_without_ok == false)
-		return (output);
+	for (i = 0; i < f->nitems; i++) {
+		if (conf->form.value_wchar)
+			items[i].value = (char*)wcsdup(f->pritems[i].privwbuf);
+		else
+			items[i].value = alloc_wstomb(f->pritems[i].privwbuf);
 
-	for (i = 0; i < nitems; i++) {
-		if (conf->form.value_wchar) {
-			apiitems[i].value = (char*)wcsdup(items[i].privwbuf);
-		} else {
-			apiitems[i].value = alloc_wstomb(items[i].privwbuf);
-		}
-		if (apiitems[i].value == NULL)
-			RETURN_ERROR("Cannot allocate memory for form value");
+		if (items[i].value == NULL)
+			RETURN_FMTERROR(
+			    "Cannot allocate memory for item[%d].value", i);
 	}
 
-	return (output);
+	return (0);
+}
+
+static void set_first_with_default(struct privateform *f, int *focusitem)
+{
+	unsigned int i;
+
+	f->sel = -1;
+	if(focusitem != NULL && *focusitem >=0 && *focusitem < (int)f->nitems)
+		if (f->pritems[*focusitem].readonly == false) {
+			f->sel = *focusitem;
+			return;
+		}
+	for (i = 0 ; i < f->nitems; i++)
+		if (f->pritems[i].readonly == false) {
+			f->sel = i;
+			break;
+		}
 }
 
 static unsigned int firstitem(unsigned int nitems, struct privateitem *items)
@@ -371,323 +445,277 @@ nextitem(unsigned int nitems, struct privateitem *items, int curritem)
 	return (curritem);
 }
 
-static void
-redrawbuttons(WINDOW *window, struct buttons *bs, bool focus, bool shortcut)
+static void redrawbuttons(struct dialog *d, bool focus, bool shortcut)
 {
 	int selected;
 
-	selected = bs->curr;
+	selected = d->bs.curr;
 	if (focus == false)
-		bs->curr = -1;
-	draw_buttons(window, *bs, shortcut);
-	wrefresh(window);
-	bs->curr = selected;
+		d->bs.curr = -1;
+	d->bs.shortcut = shortcut;
+	draw_buttons(d);
+	d->bs.curr = selected;
 }
 
 static void
-update_formborders(struct bsddialog_conf *conf, struct privateform *form)
+drawitem(struct privateform *f, int idx, bool focus)
 {
-	int h, w;
+	int color;
+	unsigned int n, cols;
+	struct privateitem *item;
 
-	getmaxyx(form->border, h, w);
-	draw_borders(conf, form->border, h, w, LOWERED);
+	item = &f->pritems[idx];
 
-	if (form->viewrows < form->h) {
-		wattron(form->border, t.dialog.arrowcolor);
-		if (form->y > 0)
-			mvwhline(form->border, 0, (w / 2) - 2,
-			    conf->ascii_lines ? '^' : ACS_UARROW, 5);
+	/* Label */
+	wattron(f->pad, t.dialog.color);
+	mvwaddstr(f->pad, item->ylabel, item->xlabel, item->label);
+	wattroff(f->pad, t.dialog.color);
 
-		if (form->y + form->viewrows < form->h)
-			mvwhline(form->border, h-1, (w / 2) - 2,
-			    conf->ascii_lines ? 'v' : ACS_DARROW, 5);
-		wattroff(form->border, t.dialog.arrowcolor);
-		wrefresh(form->border);
-	}
-}
+	/* Field */
+	if (item->readonly)
+		color = t.form.readonlycolor;
+	else if (item->fieldnocolor)
+		color = t.dialog.color;
+	else
+		color = focus ? t.form.f_fieldcolor : t.form.fieldcolor;
+	wattron(f->pad, color);
+	mvwhline(f->pad, item->yfield, item->xfield, ' ', item->fieldcols);
+	n = 0;
+	cols = wcwidth(item->pubwbuf[item->xposdraw]);
+	while (cols <= item->fieldcols &&
+	    item->xposdraw + n < wcslen(item->pubwbuf)) {
+		n++;
+		cols += wcwidth(item->pubwbuf[item->xposdraw + n]);
 
-/* use menu autosizing, linelen = form.w, nitems = form.h */
-static int
-menu_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w,
-    const char *text, int linelen, unsigned int *menurows, int nitems,
-    struct buttons bs)
-{
-	int htext, wtext, menusize, notext;
-
-	notext = 2;
-	if (*menurows == BSDDIALOG_AUTOSIZE) {
-		/* algo 1): grows vertically */
-		/* notext = 1; */
-		/* algo 2): grows horizontally, better with little screens */
-		notext += nitems;
-		notext = MIN(notext, widget_max_height(conf) - HBORDERS - 3);
-	} else
-		notext += *menurows;
-
-	if (text_size(conf, rows, cols, text, &bs, notext, linelen + 4, &htext,
-	    &wtext) != 0)
-		return (BSDDIALOG_ERROR);
+	}
+	mvwaddnwstr(f->pad, item->yfield, item->xfield,
+	    &item->pubwbuf[item->xposdraw], n);
+	wattroff(f->pad, color);
 
-	if (cols == BSDDIALOG_AUTOSIZE)
-		*w = widget_min_width(conf, wtext, linelen + 4, &bs);
-
-	if (rows == BSDDIALOG_AUTOSIZE) {
-		if (*menurows == BSDDIALOG_AUTOSIZE) {
-			menusize = widget_max_height(conf) - HBORDERS -
-			     2 /*buttons*/ - htext;
-			menusize = MIN(menusize, nitems + 2);
-			*menurows = menusize - 2 < 0 ? 0 : menusize - 2;
-		} else /* h autosize with fixed menurows */
-			menusize = *menurows + 2;
-
-		*h = widget_min_height(conf, htext, menusize, true);
-	} else { /* fixed rows */
-		if (*menurows == BSDDIALOG_AUTOSIZE) {
-			if (*h - 6 - htext <= 0)
-				*menurows = 0; /* form_checksize() will check */
-			else
-				*menurows = MIN(*h-6-htext, nitems);
+	/* Bottom Desc */
+	if (f->hasbottomdesc) {
+		move(SCREENLINES - 1, 2);
+		clrtoeol();
+		if (item->bottomdesc != NULL && focus) {
+			attron(t.form.bottomdesccolor);
+			addstr(item->bottomdesc);
+			attroff(t.form.bottomdesccolor);
+			refresh();
 		}
 	}
 
-	/* avoid menurows overflow and menurows becomes at most menurows */
-	if (*h - 6 - htext <= 0)
-		*menurows = 0; /* form_checksize() will check */
-	else
-		*menurows = MIN(*h - 6 - htext, (int)*menurows);
-
-	return (0);
+	/* Cursor */
+	curs_set((focus && item->cursor) ? 1 : 0);
+	wmove(f->pad, item->yfield, item->xfield + item->xcursor);
 }
 
-static int
-form_checksize(int rows, int cols, const char *text, struct privateform *form,
-    int nitems, struct buttons bs)
-{
-	int mincols, textrow, menusize;
-
-	/* cols */
-	mincols = VBORDERS;
-	mincols += buttons_min_width(bs);
-	mincols = MAX(mincols, (int)form->w + 6);
-
-	if (cols < mincols)
-		RETURN_ERROR("Form width, cols < buttons or xlabels/xfields");
+/*
+ * Trick: draw 2 times an item switching focus.
+ * Problem: curses tries to optimize the rendering but sometimes it misses some
+ * updates or draws old stuff. libformw has a similar problem fixed by the
+ * same trick.
+ * Case 1: KEY_DC and KEY_BACKSPACE, deleted multicolumn letters are drawn
+ * again. It seems fixed by new items pad and prefresh(), previously WINDOW.
+ * Case2: some terminal, tmux and ssh does not show the cursor.
+ */
+#define DRAWITEM_TRICK(f, idx, focus) do {                                     \
+	drawitem(f, idx, !focus);                                              \
+	prefresh((f)->pad, (f)->y, 0, (f)->ys, (f)->xs, (f)->ye, (f)->xe);     \
+	drawitem(f, idx, focus);                                               \
+	prefresh((f)->pad, (f)->y, 0, (f)->ys, (f)->xs, (f)->ye, (f)->xe);     \
+} while (0)
 
-	/* rows */
-	if (nitems > 0 && form->viewrows == 0)
-		RETURN_ERROR("items > 0 but viewrows == 0, if formheight = 0 "
-		    "terminal too small");
+static void update_formbox(struct bsddialog_conf *conf, struct privateform *f)
+{
+	int h, w;
 
-	if (form->viewrows < form->minviewrows)
-		RETURN_ERROR("Few formheight rows, if formheight = 0 terminal "
-		    "too small");
+	getmaxyx(f->box, h, w);
+	draw_borders(conf, f->box, LOWERED);
 
-	textrow = text != NULL && text[0] != '\0' ? 1 : 0;
-	menusize = nitems > 0 ? 3 : 0;
-	if (rows < 2  + 2 + menusize + textrow)
-		RETURN_ERROR("Few lines for this form");
+	if (f->viewrows < f->h) {
+		wattron(f->box, t.dialog.arrowcolor);
+		if (f->y > 0)
+			mvwhline(f->box, 0, (w / 2) - 2,
+			    conf->ascii_lines ? '^' : ACS_UARROW, 5);
 
-	return (0);
+		if (f->y + f->viewrows < f->h)
+			mvwhline(f->box, h-1, (w / 2) - 2,
+			    conf->ascii_lines ? 'v' : ACS_DARROW, 5);
+		wattroff(f->box, t.dialog.arrowcolor);
+	}
 }
 
-static void curriteminview(struct privateform *form, struct privateitem *item)
+static void curriteminview(struct privateform *f, struct privateitem *item)
 {
 	unsigned int yup, ydown;
 
 	yup = MIN(item->ylabel, item->yfield);
 	ydown = MAX(item->ylabel, item->yfield);
 
-	if (form->y > yup && form->y > 0)
-		form->y = yup;
-	if ((int)(form->y + form->viewrows) - 1 < (int)ydown)
-		form->y = ydown - form->viewrows + 1;
+	/* selected item in view */
+	if (f->y > yup && f->y > 0)
+		f->y = yup;
+	if ((int)(f->y + f->viewrows) - 1 < (int)ydown)
+		f->y = ydown - f->viewrows + 1;
+	/* lower pad after a terminal expansion */
+	if (f->y > 0 && (f->h - f->y) < f->viewrows)
+		f->y = f->h - f->viewrows;
 }
 
-/* API */
-int
-bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows,
-    int cols, unsigned int formheight, unsigned int nitems,
-    struct bsddialog_formitem *apiitems)
+static int form_size_position(struct dialog *d, struct privateform *f)
 {
-	bool switchfocus, changeitem, focusinform, insecurecursor, loop;
-	int curritem, mbchsize, next, retval, y, x, h, w, wchtype;
-	unsigned int i, j, itemybeg, itemxbeg, tmp;
-	wchar_t *winit;
-	wint_t input;
-	WINDOW *widget, *textpad, *shadow;
-	struct privateitem *items, *item;
-	struct buttons bs;
-	struct privateform form;
+	int htext, hform;
 
-	for (i = 0; i < nitems; i++) {
-		if (apiitems[i].maxvaluelen == 0)
-			RETURN_ERROR("maxvaluelen cannot be zero");
-		if (apiitems[i].fieldlen == 0)
-			RETURN_ERROR("fieldlen cannot be zero");
-	}
+	if (set_widget_size(d->conf, d->rows, d->cols, &d->h, &d->w) != 0)
+		return (BSDDIALOG_ERROR);
 
-	insecurecursor = false;
-	if (conf->form.securembch != NULL) {
-		mbchsize = mblen(conf->form.securembch, MB_LEN_MAX);
-		if(mbtowc(&form.securewch, conf->form.securembch, mbchsize) < 0)
-			RETURN_ERROR("Cannot convert securembch to wchar_t");
-		insecurecursor = true;
-	} else if (conf->form.securech != '\0') {
-		form.securewch = btowc(conf->form.securech);
-		insecurecursor = true;
+	/* autosize */
+	hform = (int) f->viewrows;
+	if (f->viewrows == BSDDIALOG_AUTOSIZE)
+		hform = MAX(f->h, f->minviewrows);
+	hform += 2; /* formborders */
+
+	if (set_widget_autosize(d->conf, d->rows, d->cols, &d->h, &d->w,
+	    d->text, &htext, &d->bs, hform, f->w + 4) != 0)
+		return (BSDDIALOG_ERROR);
+	/* formheight: avoid overflow, "at most" and at least minviewrows */
+	if (d->h - BORDERS - htext - HBUTTONS < 2 + (int)f->minviewrows) {
+		f->viewrows = f->minviewrows; /* for widget_checksize() */
+	} else if (f->viewrows == BSDDIALOG_AUTOSIZE) {
+		f->viewrows = MIN(d->h - BORDERS - htext - HBUTTONS, hform) - 2;
+		f->viewrows = MAX(f->viewrows, f->minviewrows);
 	} else {
-		form.securewch = L' ';
+		f->viewrows = MIN(d->h - BORDERS - htext - HBUTTONS, hform) - 2;
 	}
 
-	if ((items = malloc(nitems * sizeof(struct privateitem))) == NULL)
-		RETURN_ERROR("Cannot allocate internal items");
-	form.h = form.w = form.minviewrows = 0;
-	for (i = 0; i < nitems; i++) {
-		item = &items[i];
-		item->label = apiitems[i].label;
-		item->ylabel = apiitems[i].ylabel;
-		item->xlabel = apiitems[i].xlabel;
-		item->yfield = apiitems[i].yfield;
-		item->xfield = apiitems[i].xfield;
-		item->secure = apiitems[i].flags & BSDDIALOG_FIELDHIDDEN;
-		item->readonly = apiitems[i].flags & BSDDIALOG_FIELDREADONLY;
-		item->fieldnocolor = apiitems[i].flags & BSDDIALOG_FIELDNOCOLOR;
-		item->extendfield = apiitems[i].flags & BSDDIALOG_FIELDEXTEND;
-		item->fieldonebyte = apiitems[i].flags &
-		    BSDDIALOG_FIELDSINGLEBYTE;
-		item->cursorend = apiitems[i].flags & BSDDIALOG_FIELDCURSOREND;
-		item->bottomdesc = apiitems[i].bottomdesc;
-		if (item->readonly || (item->secure && !insecurecursor))
-			item->cursor = false;
-		else
-			item->cursor = true;
+	/* checksize */
+	if (f->viewrows < f->minviewrows)
+		RETURN_FMTERROR("formheight, current: %u needed at least %u",
+		    f->viewrows, f->minviewrows);
+	if (widget_checksize(d->h, d->w, &d->bs,
+	    2 /* borders */ + f->minviewrows, f->w + 4) != 0)
+		return (BSDDIALOG_ERROR);
 
-		item->maxletters = apiitems[i].maxvaluelen;
-		item->privwbuf = calloc(item->maxletters + 1, sizeof(wchar_t));
-		if (item->privwbuf == NULL)
-			RETURN_ERROR("Cannot allocate item private buffer");
-		memset(item->privwbuf, 0, item->maxletters + 1);
-		item->pubwbuf = calloc(item->maxletters + 1, sizeof(wchar_t));
-		if (item->pubwbuf == NULL)
-			RETURN_ERROR("Cannot allocate item private buffer");
-		memset(item->pubwbuf, 0, item->maxletters + 1);
+	if (set_widget_position(d->conf, &d->y, &d->x, d->h, d->w) != 0)
+		return (BSDDIALOG_ERROR);
 
-		if ((winit = alloc_mbstows(apiitems[i].init)) == NULL)
-			RETURN_ERROR("Cannot allocate item.init in wchar_t*");
-		wcsncpy(item->privwbuf, winit, item->maxletters);
-		wcsncpy(item->pubwbuf, winit, item->maxletters);
-		free(winit);
-		item->nletters = wcslen(item->pubwbuf);
-		if (item->secure) {
-			for (j = 0; j < item->nletters; j++)
-				item->pubwbuf[j] = form.securewch;
-		}
+	return (0);
+}
 
-		item->fieldcols = apiitems[i].fieldlen;
-		item->xposdraw = 0;
-		item->xcursor = 0;
-		item->pos = 0;
+static int
+form_redraw(struct dialog *d, struct privateform *f, bool focusinform)
+{
+	unsigned int i;
 
-		form.h = MAX(form.h, items[i].ylabel);
-		form.h = MAX(form.h, items[i].yfield);
-		form.w = MAX(form.w, items[i].xlabel + strcols(items[i].label));
-		form.w = MAX(form.w, items[i].xfield + items[i].fieldcols);
-		if (i == 0) {
-			itemybeg = MIN(items[i].ylabel, items[i].yfield);
-			itemxbeg = MIN(items[i].xlabel, items[i].xfield);
-		} else {
-			tmp = MIN(items[i].ylabel, items[i].yfield);
-			itemybeg = MIN(itemybeg, tmp);
-			tmp = MIN(items[i].xlabel, items[i].xfield);
-			itemxbeg = MIN(itemxbeg, tmp);
-		}
-		tmp = abs((int)items[i].ylabel - (int)items[i].yfield);
-		form.minviewrows = MAX(form.minviewrows, tmp);
-	}
-	if (nitems > 0) {
-		form.h = form.h + 1 - itemybeg;
-		form.w -= itemxbeg;
-		form.minviewrows += 1;
+	if (d->built) {
+		hide_dialog(d);
+		refresh(); /* Important for decreasing screen */
 	}
-	form.wmin = form.w;
-	for (i = 0; i < nitems; i++) {
-		items[i].ylabel -= itemybeg;
-		items[i].yfield -= itemybeg;
-		items[i].xlabel -= itemxbeg;
-		items[i].xfield -= itemxbeg;
+	f->viewrows = f->formheight;
+	f->w = f->wmin;
+	if (form_size_position(d, f) != 0)
+		return (BSDDIALOG_ERROR);
+	if (draw_dialog(d) != 0)
+		return (BSDDIALOG_ERROR);
+	if (d->built)
+		refresh(); /* Important to fix grey lines expanding screen */
+	TEXTPAD(d, 2 /* box borders */ + f->viewrows + HBUTTONS);
+
+	update_box(d->conf, f->box, d->y + d->h - 5 - f->viewrows, d->x + 2,
+	    f->viewrows + 2, d->w - 4, LOWERED);
+
+	for (i = 0; i < f->nitems; i++) {
+		fieldctl(&f->pritems[i], MOVE_CURSOR_BEGIN);
+		if (f->pritems[i].extendfield) {
+			f->w = d->w - 6;
+			f->pritems[i].fieldcols = f->w - f->pritems[i].xfield;
+		}
+		if (f->pritems[i].cursorend)
+			fieldctl(&f->pritems[i], MOVE_CURSOR_END);
 	}
 
-	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
-	form.viewrows = formheight;
+	wresize(f->pad, f->h, f->w);
+	for (i = 0; i < f->nitems; i++)
+		drawitem(f, i, false);
 
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-		return (BSDDIALOG_ERROR);
-	if (menu_autosize(conf, rows, cols, &h, &w, text, form.w,
-	    &form.viewrows, form.h, bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (form_checksize(h, w, text, &form, nitems, bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
-		return (BSDDIALOG_ERROR);
+	f->ys = d->y + d->h - 5 - f->viewrows + 1;
+	f->ye = d->y + d->h - 5 ;
+	if ((int)f->w >= d->w - 6) { /* left */
+		f->xs = d->x + 3;
+		f->xe = f->xs + d->w - 7;
+	} else { /* center */
+		f->xs = d->x + 3 + (d->w - 6)/2 - f->w/2;
+		f->xe = f->xs + d->w - 5;
+	}
 
-	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
-	    true) != 0)
-		return (BSDDIALOG_ERROR);
+	if (f->sel != -1) { /* at least 1 writable item */
+		redrawbuttons(d,
+		    d->conf->button.always_active || !focusinform,
+		    !focusinform);
+		wnoutrefresh(d->widget);
+		curriteminview(f, &f->pritems[f->sel]);
+		update_formbox(d->conf, f);
+		wnoutrefresh(f->box);
+		DRAWITEM_TRICK(f, f->sel, focusinform);
+	} else if (f->sel == -1 && f->nitems > 0) { /* all read only */
+		redrawbuttons(d, true, true);
+		wnoutrefresh(d->widget);
+		update_formbox(d->conf, f);
+		wnoutrefresh(f->box);
+		DRAWITEM_TRICK(f, 0, false); /* to refresh pad*/
+	} else { /* no item */
+		wnoutrefresh(f->box);
+	}
 
-	doupdate();
+	return (0);
+}
 
-	prefresh(textpad, 0, 0, y + 1, x + 1 + TEXTHMARGIN,
-	    y + h - form.viewrows, x + 1 + w - TEXTHMARGIN);
+/* API */
+int
+bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows,
+    int cols, unsigned int formheight, unsigned int nitems,
+    struct bsddialog_formitem *items, int *focusitem)
+{
+	bool switchfocus, changeitem, focusinform, loop;
+	int next, retval, wchtype;
+	unsigned int i;
+	wint_t input;
+	struct privateitem *item;
+	struct privateform form;
+	struct dialog d;
 
-	form.border = new_boxed_window(conf, y + h - 5 - form.viewrows, x + 2,
-	    form.viewrows + 2, w - 4, LOWERED);
+	if (prepare_dialog(conf, text, rows, cols, &d) != 0)
+		return (BSDDIALOG_ERROR);
+	set_buttons(&d, true, OK_LABEL, CANCEL_LABEL);
 
-	for (i = 0; i < nitems; i++) {
-		if (items[i].extendfield) {
-			form.w = w - 6;
-			items[i].fieldcols = form.w - items[i].xfield;
-		}
-		if (items[i].cursorend)
-			fieldctl(item, MOVE_CURSOR_END);
-	}
+	if (build_privateform(conf, nitems, items, &form) != 0)
+		return (BSDDIALOG_ERROR);
 
-	form.pad = newpad(form.h, form.w);
+	if ((form.box = newwin(1, 1, 1, 1)) == NULL)
+		RETURN_ERROR("Cannot build WINDOW form box");
+	wbkgd(form.box, t.dialog.color);
+	if ((form.pad = newpad(1, 1)) == NULL)
+		RETURN_ERROR("Cannot build WINDOW form pad");
 	wbkgd(form.pad, t.dialog.color);
 
-	form.ys = y + h - 5 - form.viewrows + 1;
-	form.ye = y + h - 5 ;
-	if ((int)form.w >= w - 6) { /* left */
-		form.xs = x + 3;
-		form.xe = form.xs + w - 7;
-	} else { /* center */
-		form.xs = x + 3 + (w-6)/2 - form.w/2;
-		form.xe = form.xs + w - 5;
-	}
-
-	curritem = -1;
-	for (i=0 ; i < nitems; i++) {
-		DRAWITEM_TRICK(&form, &items[i], false);
-		if (curritem == -1 && items[i].readonly == false)
-			curritem = i;
-	}
-	if (curritem != -1) {
+	set_first_with_default(&form, focusitem);
+	if (form.sel != -1) {
 		focusinform = true;
-		redrawbuttons(widget, &bs, conf->button.always_active, false);
 		form.y = 0;
-		item = &items[curritem];
-		curriteminview(&form, item);
-		update_formborders(conf, &form);
-		wrefresh(form.border);
-		DRAWITEM_TRICK(&form, item, true);
+		item = &form.pritems[form.sel];
 	} else {
 		item = NULL;
 		focusinform = false;
-		wrefresh(form.border);
 	}
 
+	form.formheight = formheight;
+	if (form_redraw(&d, &form, focusinform) != 0)
+		return (BSDDIALOG_ERROR);
+
 	changeitem = switchfocus = false;
 	loop = true;
 	while (loop) {
+		doupdate();
 		if ((wchtype = get_wch(&input)) == ERR)
 			continue;
 		switch(input) {
@@ -695,14 +723,12 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows,
 		case 10: /* Enter */
 			if (focusinform && conf->button.always_active == false)
 				break;
-			retval = return_values(conf, bs.value[bs.curr],
-			    nitems, apiitems, items);
+			retval = BUTTONVALUE(d.bs);
 			loop = false;
 			break;
 		case 27: /* Esc */
 			if (conf->key.enable_esc) {
-				retval = return_values(conf, BSDDIALOG_ESC,
-				    nitems, apiitems, items);
+				retval = BSDDIALOG_ESC;
 				loop = false;
 			}
 			break;
@@ -710,70 +736,72 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows,
 			if (focusinform) {
 				switchfocus = true;
 			} else {
-				if (bs.curr + 1 < (int)bs.nbuttons) {
-					bs.curr++;
+				if (d.bs.curr + 1 < (int)d.bs.nbuttons) {
+					d.bs.curr++;
 				} else {
-					bs.curr = 0;
-					if (curritem != -1) {
+					d.bs.curr = 0;
+					if (form.sel != -1) {
 						switchfocus = true;
 					}
 				}
-				draw_buttons(widget, bs, true);
-				wrefresh(widget);
+				redrawbuttons(&d, true, true);
+				wnoutrefresh(d.widget);
 			}
 			break;
 		case KEY_LEFT:
 			if (focusinform) {
 				if(fieldctl(item, MOVE_CURSOR_LEFT))
-					DRAWITEM_TRICK(&form, item, true);
-			} else if (bs.curr > 0) {
-				bs.curr--;
-				draw_buttons(widget, bs, true);
-				wrefresh(widget);
-			} else if (curritem != -1) {
+					DRAWITEM_TRICK(&form, form.sel, true);
+			} else if (d.bs.curr > 0) {
+				d.bs.curr--;
+				redrawbuttons(&d, true, true);
+				wnoutrefresh(d.widget);
+			} else if (form.sel != -1) {
 				switchfocus = true;
 			}
 			break;
 		case KEY_RIGHT:
 			if (focusinform) {
 				if(fieldctl(item, MOVE_CURSOR_RIGHT))
-					DRAWITEM_TRICK(&form, item, true);
-			} else if (bs.curr < (int) bs.nbuttons - 1) {
-				bs.curr++;
-				draw_buttons(widget, bs, true);
-				wrefresh(widget);
-			} else if (curritem != -1) {
+					DRAWITEM_TRICK(&form, form.sel, true);
+			} else if (d.bs.curr < (int) d.bs.nbuttons - 1) {
+				d.bs.curr++;
+				redrawbuttons(&d, true, true);
+				wnoutrefresh(d.widget);
+			} else if (form.sel != -1) {
 				switchfocus = true;
 			}
 			break;
 		case KEY_UP:
 			if (focusinform) {
-				next = previtem(nitems, items, curritem);
-				changeitem = curritem != next;
-			} else if (curritem != -1) {
+				next = previtem(form.nitems, form.pritems,
+				    form.sel);
+				changeitem = form.sel != next;
+			} else if (form.sel != -1) {
 				switchfocus = true;
 			}
 			break;
 		case KEY_DOWN:
 			if (focusinform == false)
 				break;
-			if (nitems == 1) {
+			if (form.nitems == 1) {
 				switchfocus = true;
 			} else {
-				next = nextitem(nitems, items, curritem);
-				changeitem = curritem != next;
+				next = nextitem(form.nitems, form.pritems,
+				    form.sel);
+				changeitem = form.sel != next;
 			}
 			break;
 		case KEY_PPAGE:
 			if (focusinform) {
-				next = firstitem(nitems, items);
-				changeitem = curritem != next;
+				next = firstitem(form.nitems, form.pritems);
+				changeitem = form.sel != next;
 			}
 			break;
 		case KEY_NPAGE:
 			if (focusinform) {
-				next = lastitem(nitems, items);
-				changeitem = curritem != next;
+				next = lastitem(form.nitems, form.pritems);
+				changeitem = form.sel != next;
 			}
 			break;
 		case KEY_BACKSPACE:
@@ -782,99 +810,41 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows,
 				break;
 			if(fieldctl(item, MOVE_CURSOR_LEFT))
 				if(fieldctl(item, DEL_LETTER))
-					DRAWITEM_TRICK(&form, item, true);
+					DRAWITEM_TRICK(&form, form.sel, true);
 			break;
 		case KEY_DC:
 			if (focusinform == false)
 				break;
 			if(fieldctl(item, DEL_LETTER))
-				DRAWITEM_TRICK(&form, item, true);
+				DRAWITEM_TRICK(&form, form.sel, true);
 			break;
 		case KEY_HOME:
 			if (focusinform == false)
 				break;
 			if(fieldctl(item, MOVE_CURSOR_BEGIN))
-				DRAWITEM_TRICK(&form, item, true);
+				DRAWITEM_TRICK(&form, form.sel, true);
 			break;
 		case KEY_END:
 			if (focusinform == false)
 				break;
 			if (fieldctl(item, MOVE_CURSOR_END))
-				DRAWITEM_TRICK(&form, item, true);
+				DRAWITEM_TRICK(&form, form.sel, true);
 			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
 			curs_set(0);
-			if (f1help(conf) != 0) {
+			if (f1help_dialog(conf) != 0) {
 				retval = BSDDIALOG_ERROR;
 				loop = false;
 			}
-			/* No break, screen size can change */
-		case KEY_RESIZE:
-			/* Important for decreasing screen */
-			hide_widget(y, x, h, w, conf->shadow);
-			refresh();
-
-			form.viewrows = formheight;
-			form.w = form.wmin;
-			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-				return (BSDDIALOG_ERROR);
-			if (menu_autosize(conf, rows, cols, &h, &w, text, form.w,
-			    &form.viewrows, form.h, bs) != 0)
+			if (form_redraw(&d, &form, focusinform) != 0)
 				return (BSDDIALOG_ERROR);
-			if (form_checksize(h, w, text, &form, nitems, bs) != 0)
-				return (BSDDIALOG_ERROR);
-			if (set_widget_position(conf, &y, &x, h, w) != 0)
+			break;
+		case KEY_RESIZE:
+			if (form_redraw(&d, &form, focusinform) != 0)
 				return (BSDDIALOG_ERROR);
-
-			if (update_dialog(conf, shadow, widget, y, x, h, w,
-			    textpad, text, &bs, true) != 0)
-			return (BSDDIALOG_ERROR);
-
-			doupdate();
-
-			prefresh(textpad, 0, 0, y + 1, x + 1 + TEXTHMARGIN,
-			    y + h - form.viewrows, x + 1 + w - TEXTHMARGIN);
-
-			wclear(form.border);
-			mvwin(form.border, y + h - 5 - form.viewrows, x + 2);
-			wresize(form.border, form.viewrows + 2, w - 4);
-
-			for (i = 0; i < nitems; i++) {
-				fieldctl(&items[i], MOVE_CURSOR_BEGIN);
-				if (items[i].extendfield) {
-					form.w = w - 6;
-					items[i].fieldcols =
-					    form.w - items[i].xfield;
-				}
-				if (items[i].cursorend)
-					fieldctl(&items[i], MOVE_CURSOR_END);
-			}
-
-			form.ys = y + h - 5 - form.viewrows + 1;
-			form.ye = y + h - 5 ;
-			if ((int)form.w >= w - 6) { /* left */
-				form.xs = x + 3;
-				form.xe = form.xs + w - 7;
-			} else { /* center */
-				form.xs = x + 3 + (w-6)/2 - form.w/2;
-				form.xe = form.xs + w - 5;
-			}
-
-			if (curritem != -1) {
-				redrawbuttons(widget, &bs,
-				    conf->button.always_active || !focusinform,
-				    !focusinform);
-				curriteminview(&form, item);
-				update_formborders(conf, &form);
-				wrefresh(form.border);
-				/* drawitem just to prefresh() pad */
-				DRAWITEM_TRICK(&form, item, focusinform);
-			} else {
-				wrefresh(form.border);
-			}
 			break;
 		default:
 			if (wchtype == KEY_CODE_YES)
@@ -887,55 +857,67 @@ bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows,
 				 * because the cursor remains on the new letter,
 				 * "if" and "while" update the positions.
 				 */
-				if(insertch(&form, item, input)) {
+				if(insertch(item, input, form.securewch)) {
 					fieldctl(item, MOVE_CURSOR_RIGHT);
 					/*
 					 * no if(fieldctl), update always
 					 * because it fails with maxletters.
 					 */
-					DRAWITEM_TRICK(&form, item, true);
+					DRAWITEM_TRICK(&form, form.sel, true);
 				}
 			} else {
-				if (shortcut_buttons(input, &bs)) {
-					retval = return_values(conf,
-					    bs.value[bs.curr], nitems, apiitems,
-					    items);
+				if (shortcut_buttons(input, &d.bs)) {
+					DRAW_BUTTONS(d);
+					doupdate();
+					retval = BUTTONVALUE(d.bs);
 					loop = false;
 				}
 			}
 			break;
-		} /* end switch handler */
+		} /* end switch get_wch() */
 
 		if (switchfocus) {
 			focusinform = !focusinform;
-			bs.curr = 0;
-			redrawbuttons(widget, &bs,
+			d.bs.curr = 0;
+			redrawbuttons(&d,
 			    conf->button.always_active || !focusinform,
 			    !focusinform);
-			DRAWITEM_TRICK(&form, item, focusinform);
+			wnoutrefresh(d.widget);
+			DRAWITEM_TRICK(&form, form.sel, focusinform);
 			switchfocus = false;
 		}
 
 		if (changeitem) {
-			DRAWITEM_TRICK(&form, item, false);
-			curritem = next;
-			item = &items[curritem];
+			DRAWITEM_TRICK(&form, form.sel, false);
+			form.sel = next;
+			item = &form.pritems[form.sel];
 			curriteminview(&form, item);
-			update_formborders(conf, &form);
-			DRAWITEM_TRICK(&form, item, true);
+			update_formbox(conf, &form);
+			wnoutrefresh(form.box);
+			DRAWITEM_TRICK(&form, form.sel, true);
 			changeitem = false;
 		}
-	} /* end while handler */
+	} /* end while(loop) */
 
 	curs_set(0);
 
-	delwin(form.pad);
-	delwin(form.border);
-	for (i = 0; i < nitems; i++) {
-		free(items[i].privwbuf);
-		free(items[i].pubwbuf);
+	if (return_values(conf, &form, items) == BSDDIALOG_ERROR)
+		return (BSDDIALOG_ERROR);
+
+	if (focusitem != NULL)
+		*focusitem = form.sel;
+
+	if (form.hasbottomdesc && conf->clear) {
+		move(SCREENLINES - 1, 2);
+		clrtoeol();
 	}
-	end_dialog(conf, shadow, widget, textpad);
+	for (i = 0; i < form.nitems; i++) {
+		free(form.pritems[i].privwbuf);
+		free(form.pritems[i].pubwbuf);
+	}
+	delwin(form.pad);
+	delwin(form.box);
+	end_dialog(&d);
 
 	return (retval);
 }
diff --git a/contrib/bsddialog/lib/infobox.c b/contrib/bsddialog/lib/infobox.c
deleted file mode 100644
index c8a0b6e90c8e..000000000000
--- a/contrib/bsddialog/lib/infobox.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
- *
- * 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.
- */
-
-#include <sys/param.h>
-
-#include <curses.h>
-
-#include "bsddialog.h"
-#include "lib_util.h"
-
-static int
-infobox_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
-    int *w, const char *text)
-{
-	int htext, wtext;
-
-	if (cols == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_AUTOSIZE) {
-		if (text_size(conf, rows, cols, text, NULL, 0, 1, &htext,
-		    &wtext) != 0)
-			return (BSDDIALOG_ERROR);
-	}
-
-	if (cols == BSDDIALOG_AUTOSIZE)
-		*w = widget_min_width(conf, wtext, TEXTHMARGINS + 1, NULL);
-
-	if (rows == BSDDIALOG_AUTOSIZE)
-		*h = widget_min_height(conf, htext, 0, false);
-
-	return (0);
-}
-
-static int infobox_checksize(int rows, int cols)
-{
-	if (cols < HBORDERS)
-		RETURN_ERROR("Few cols, infobox needs at least width 2");
-
-	if (rows < VBORDERS)
-		RETURN_ERROR("Infobox needs at least height 2");
-
-	return (0);
-}
-
-/* API */
-int
-bsddialog_infobox(struct bsddialog_conf *conf, const char *text, int rows,
-    int cols)
-{
-	int y, x, h, w;
-	WINDOW *shadow, *widget, *textpad;
-
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-		return (BSDDIALOG_ERROR);
-	if (infobox_autosize(conf, rows, cols, &h, &w, text) != 0)
-		return (BSDDIALOG_ERROR);
-	if (infobox_checksize(h, w) != 0)
-		return (BSDDIALOG_ERROR);
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
-		return (BSDDIALOG_ERROR);
-
-	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text,
-	    NULL, false) != 0)
-		return (BSDDIALOG_ERROR);
-
-	pnoutrefresh(textpad, 0, 0, y+1, x+1+TEXTHMARGIN, y+h-2,
-	    x+w-TEXTHMARGIN);
-
-	doupdate();
-
-	end_dialog(conf, shadow, widget, textpad);
-
-	return (BSDDIALOG_OK);
-}
\ No newline at end of file
diff --git a/contrib/bsddialog/lib/lib_util.c b/contrib/bsddialog/lib/lib_util.c
index 6eec5025731d..1ba83f86d269 100644
--- a/contrib/bsddialog/lib/lib_util.c
+++ b/contrib/bsddialog/lib/lib_util.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,23 +25,82 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
-
-#include <ctype.h>
 #include <curses.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <wchar.h>
 #include <wctype.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
-#define ERRBUFLEN    1024 /* Error buffer len */
+/*
+ * -1- Error and diagnostic
+ *
+ *	get_error_string();
+ *	set_error_string();
+ *	set_fmt_error_string();
+ *
+ * ----------------------------------------------------
+ * -2- (Unicode) Multicolumn character strings
+ *
+ *	alloc_mbstows();
+ *	mvwaddwch();
+ *	str_props();
+ *	strcols();
+ *
+ * ----------------------------------------------------
+ * -3- Buttons
+ *
+ * [static] buttons_min_width();
+ * [static] draw_button();
+ *          draw_buttons();
+ *          set_buttons(); (to call 1 time after prepare_dialog()).
+ *          shortcut_buttons();
+ *
+ * ----------------------------------------------------
+ * -4- (Auto) Sizing and (Auto) Position
+ *
+ * [static] widget_max_height(conf);
+ * [static] widget_max_width(struct bsddialog_conf *conf)
+ * [static] is_wtext_attr();
+ * [static] text_properties();
+ * [static] text_autosize();
+ * [static] text_size();
+ * [static] widget_min_height(conf, htext, hnotext, bool buttons);
+ * [static] widget_min_width(conf, wtext, minw, buttons);
+ *          set_widget_size();
+ *          set_widget_autosize();  (not for all dialogs).
+ *          widget_checksize();     (not for all dialogs).
+ *          set_widget_position();
+ *          dialog_size_position(struct dialog); (not for all dialogs).
+ *
+ * ----------------------------------------------------
+ * -5- (Dialog) Widget components and utils
+ *
+ *	hide_dialog(struct dialog);
+ *	f1help_dialog(conf);
+ *	draw_borders(conf, win, elev);
+ *	update_box(conf, win, y, x, h, w, elev);
+ *	rtextpad(); (helper for pnoutrefresh(textpad)).
+ *
+ * ----------------------------------------------------
+ * -6- Dialog init/build, update/draw, destroy
+ *
+ *          end_dialog(struct dialog);
+ * [static] check_set_wtext_attr();
+ * [static] print_string(); (word wrapping).
+ * [static] print_textpad();
+ *          draw_dialog(struct dialog);
+ *          prepare_dialog(struct dialog);
+ */
+
+/*
+ * -1- Error and diagnostic
+ */
+#define ERRBUFLEN    1024
 
-/* Error */
 static char errorbuffer[ERRBUFLEN];
 
 const char *get_error_string(void)
@@ -54,7 +113,18 @@ void set_error_string(const char *str)
 	strncpy(errorbuffer, str, ERRBUFLEN-1);
 }
 
-/* Unicode */
+void set_fmt_error_string(const char *fmt, ...)
+{
+   va_list arg_ptr;
+
+   va_start(arg_ptr, fmt);
+   vsnprintf(errorbuffer, ERRBUFLEN-1, fmt, arg_ptr);
+   va_end(arg_ptr);
+}
+
+/*
+ * -2- (Unicode) Multicolumn character strings
+ */
 wchar_t* alloc_mbstows(const char *mbstring)
 {
 	size_t charlen, nchar;
@@ -85,7 +155,6 @@ void mvwaddwch(WINDOW *w, int y, int x, wchar_t wch)
 	ws[0] = wch;
 	ws[1] = L'\0';
 	mvwaddwstr(w, y, x, ws);
-
 }
 
 int str_props(const char *mbstring, unsigned int *cols, bool *has_multi_col)
@@ -168,52 +237,20 @@ char *strcolseek(const char *mbstring, unsigned int ncol)
 	return (NULL);
 }
 
-/* Clear */
-int hide_widget(int y, int x, int h, int w, bool withshadow)
-{
-	WINDOW *clear;
-
-	if ((clear = newwin(h, w, y + t.shadow.y, x + t.shadow.x)) == NULL)
-		RETURN_ERROR("Cannot hide the widget");
-	wbkgd(clear, t.screen.color);
-
-	if (withshadow)
-		wrefresh(clear);
-
-	mvwin(clear, y, x);
-	wrefresh(clear);
-
-	delwin(clear);
-
-	return (0);
-}
-
-/* F1 help */
-int f1help(struct bsddialog_conf *conf)
+/*
+ * -3- Buttons
+ */
+static int buttons_min_width(struct buttons *bs)
 {
-	int output;
-	struct bsddialog_conf hconf;
-
-	bsddialog_initconf(&hconf);
-	hconf.title           = "HELP";
-	hconf.button.ok_label = "EXIT";
-	hconf.clear           = true;
-	hconf.ascii_lines     = conf->ascii_lines;
-	hconf.no_lines        = conf->no_lines;
-	hconf.shadow          = conf->shadow;
-	hconf.text.highlight  = conf->text.highlight;
-
-	output = BSDDIALOG_OK;
-	if (conf->key.f1_message != NULL)
-		output = bsddialog_msgbox(&hconf, conf->key.f1_message, 0, 0);
+	unsigned int width;
 
-	if (output != BSDDIALOG_ERROR && conf->key.f1_file != NULL)
-		output = bsddialog_textbox(&hconf, conf->key.f1_file, 0, 0);
+	width = bs->nbuttons * bs->sizebutton;
+	if (bs->nbuttons > 0)
+		width += (bs->nbuttons - 1) * t.button.minmargin;
 
-	return (output == BSDDIALOG_ERROR ? BSDDIALOG_ERROR : 0);
+	return (width);
 }
 
-/* Buttons */
 static void
 draw_button(WINDOW *window, int y, int x, int size, const char *text,
     wchar_t first, bool selected, bool shortcut)
@@ -253,125 +290,138 @@ draw_button(WINDOW *window, int y, int x, int size, const char *text,
 	}
 }
 
-void
-draw_buttons(WINDOW *window, struct buttons bs, bool shortcut)
+void draw_buttons(struct dialog *d)
 {
-	int i, x, startx, y, rows, cols;
+	int i, x, startx, y;
 	unsigned int newmargin, margin, wbuttons;
 
-	getmaxyx(window, rows, cols);
-	y = rows - 2;
+	y = d->h - 2;
 
-	newmargin = cols - VBORDERS - (bs.nbuttons * bs.sizebutton);
-	newmargin /= (bs.nbuttons + 1);
+	newmargin = d->w - BORDERS - (d->bs.nbuttons * d->bs.sizebutton);
+	newmargin /= (d->bs.nbuttons + 1);
 	newmargin = MIN(newmargin, t.button.maxmargin);
 	if (newmargin == 0) {
 		margin = t.button.minmargin;
-		wbuttons = buttons_min_width(bs);
+		wbuttons = buttons_min_width(&d->bs);
 	} else {
 		margin = newmargin;
-		wbuttons = bs.nbuttons * bs.sizebutton;
-		wbuttons += (bs.nbuttons + 1) * margin;
+		wbuttons = d->bs.nbuttons * d->bs.sizebutton;
+		wbuttons += (d->bs.nbuttons + 1) * margin;
 	}
 
-	startx = (cols)/2 - wbuttons/2 + newmargin;
-	for (i = 0; i < (int)bs.nbuttons; i++) {
-		x = i * (bs.sizebutton + margin);
-		draw_button(window, y, startx + x, bs.sizebutton, bs.label[i],
-		    bs.first[i],  i == bs.curr, shortcut);
+	startx = d->w/2 - wbuttons/2 + newmargin;
+	for (i = 0; i < (int)d->bs.nbuttons; i++) {
+		x = i * (d->bs.sizebutton + margin);
+		draw_button(d->widget, y, startx + x, d->bs.sizebutton,
+		    d->bs.label[i], d->bs.first[i],  i == d->bs.curr,
+		    d->bs.shortcut);
 	}
 }
 
 void
-get_buttons(struct bsddialog_conf *conf, struct buttons *bs,
-    const char *yesoklabel, const char *nocancellabel)
+set_buttons(struct dialog *d, bool shortcut, const char *oklabel,
+    const char *cancellabel)
 {
 	int i;
 #define SIZEBUTTON              8
-#define DEFAULT_BUTTON_LABEL	BUTTON_OK_LABEL
+#define DEFAULT_BUTTON_LABEL	OK_LABEL
 #define DEFAULT_BUTTON_VALUE	BSDDIALOG_OK
 	wchar_t first;
 
-	bs->nbuttons = 0;
-	bs->curr = 0;
-	bs->sizebutton = 0;
+	d->bs.nbuttons = 0;
+	d->bs.curr = 0;
+	d->bs.sizebutton = 0;
+	d->bs.shortcut = shortcut;
 
-	if (yesoklabel != NULL && conf->button.without_ok == false) {
-		bs->label[0] = conf->button.ok_label != NULL ?
-		    conf->button.ok_label : yesoklabel;
-		bs->value[0] = BSDDIALOG_OK;
-		bs->nbuttons += 1;
+	if (d->conf->button.left1_label != NULL) {
+		d->bs.label[d->bs.nbuttons] = d->conf->button.left1_label;
+		d->bs.value[d->bs.nbuttons] = BSDDIALOG_LEFT1;
+		d->bs.nbuttons += 1;
 	}
 
-	if (conf->button.with_extra) {
-		bs->label[bs->nbuttons] = conf->button.extra_label != NULL ?
-		    conf->button.extra_label : "Extra";
-		bs->value[bs->nbuttons] = BSDDIALOG_EXTRA;
-		bs->nbuttons += 1;
+	if (d->conf->button.left2_label != NULL) {
+		d->bs.label[d->bs.nbuttons] = d->conf->button.left2_label;
+		d->bs.value[d->bs.nbuttons] = BSDDIALOG_LEFT2;
+		d->bs.nbuttons += 1;
 	}
 
-	if (nocancellabel != NULL && conf->button.without_cancel == false) {
-		bs->label[bs->nbuttons] = conf->button.cancel_label ?
-		    conf->button.cancel_label : nocancellabel;
-		bs->value[bs->nbuttons] = BSDDIALOG_CANCEL;
-		if (conf->button.default_cancel)
-			bs->curr = bs->nbuttons;
-		bs->nbuttons += 1;
+	if (d->conf->button.left3_label != NULL) {
+		d->bs.label[d->bs.nbuttons] = d->conf->button.left3_label;
+		d->bs.value[d->bs.nbuttons] = BSDDIALOG_LEFT3;
+		d->bs.nbuttons += 1;
 	}
 
-	if (conf->button.with_help) {
-		bs->label[bs->nbuttons] = conf->button.help_label != NULL ?
-		    conf->button.help_label : "Help";
-		bs->value[bs->nbuttons] = BSDDIALOG_HELP;
-		bs->nbuttons += 1;
+	if (oklabel != NULL && d->conf->button.without_ok == false) {
+		d->bs.label[d->bs.nbuttons] = d->conf->button.ok_label != NULL ?
+		    d->conf->button.ok_label : oklabel;
+		d->bs.value[d->bs.nbuttons] = BSDDIALOG_OK;
+		d->bs.nbuttons += 1;
 	}
 
-	if (conf->button.generic1_label != NULL) {
-		bs->label[bs->nbuttons] = conf->button.generic1_label;
-		bs->value[bs->nbuttons] = BSDDIALOG_GENERIC1;
-		bs->nbuttons += 1;
+	if (d->conf->button.with_extra) {
+		d->bs.label[d->bs.nbuttons] = d->conf->button.extra_label != NULL ?
+		    d->conf->button.extra_label : "Extra";
+		d->bs.value[d->bs.nbuttons] = BSDDIALOG_EXTRA;
+		d->bs.nbuttons += 1;
 	}
 
-	if (conf->button.generic2_label != NULL) {
-		bs->label[bs->nbuttons] = conf->button.generic2_label;
-		bs->value[bs->nbuttons] = BSDDIALOG_GENERIC2;
-		bs->nbuttons += 1;
+	if (cancellabel != NULL && d->conf->button.without_cancel == false) {
+		d->bs.label[d->bs.nbuttons] = d->conf->button.cancel_label ?
+		    d->conf->button.cancel_label : cancellabel;
+		d->bs.value[d->bs.nbuttons] = BSDDIALOG_CANCEL;
+		if (d->conf->button.default_cancel)
+			d->bs.curr = d->bs.nbuttons;
+		d->bs.nbuttons += 1;
 	}
 
-	if (bs->nbuttons == 0) {
-		bs->label[0] = DEFAULT_BUTTON_LABEL;
-		bs->value[0] = DEFAULT_BUTTON_VALUE;
-		bs->nbuttons = 1;
+	if (d->conf->button.with_help) {
+		d->bs.label[d->bs.nbuttons] = d->conf->button.help_label != NULL ?
+		    d->conf->button.help_label : "Help";
+		d->bs.value[d->bs.nbuttons] = BSDDIALOG_HELP;
+		d->bs.nbuttons += 1;
 	}
 
-	for (i = 0; i < (int)bs->nbuttons; i++) {
-		mbtowc(&first, bs->label[i], MB_CUR_MAX);
-		bs->first[i] = first;
+	if (d->conf->button.right1_label != NULL) {
+		d->bs.label[d->bs.nbuttons] = d->conf->button.right1_label;
+		d->bs.value[d->bs.nbuttons] = BSDDIALOG_RIGHT1;
+		d->bs.nbuttons += 1;
 	}
 
-	if (conf->button.default_label != NULL) {
-		for (i = 0; i < (int)bs->nbuttons; i++) {
-			if (strcmp(conf->button.default_label,
-			    bs->label[i]) == 0)
-				bs->curr = i;
-		}
+	if (d->conf->button.right2_label != NULL) {
+		d->bs.label[d->bs.nbuttons] = d->conf->button.right2_label;
+		d->bs.value[d->bs.nbuttons] = BSDDIALOG_RIGHT2;
+		d->bs.nbuttons += 1;
 	}
 
-	bs->sizebutton = MAX(SIZEBUTTON - 2, strcols(bs->label[0]));
-	for (i = 1; i < (int)bs->nbuttons; i++)
-		bs->sizebutton = MAX(bs->sizebutton, strcols(bs->label[i]));
-	bs->sizebutton += 2;
-}
+	if (d->conf->button.right3_label != NULL) {
+		d->bs.label[d->bs.nbuttons] = d->conf->button.right3_label;
+		d->bs.value[d->bs.nbuttons] = BSDDIALOG_RIGHT3;
+		d->bs.nbuttons += 1;
+	}
 
-int buttons_min_width(struct buttons bs)
-{
-	unsigned int width;
+	if (d->bs.nbuttons == 0) {
+		d->bs.label[0] = DEFAULT_BUTTON_LABEL;
+		d->bs.value[0] = DEFAULT_BUTTON_VALUE;
+		d->bs.nbuttons = 1;
+	}
 
-	width = bs.nbuttons * bs.sizebutton;
-	if (bs.nbuttons > 0)
-		width += (bs.nbuttons - 1) * t.button.minmargin;
+	for (i = 0; i < (int)d->bs.nbuttons; i++) {
+		mbtowc(&first, d->bs.label[i], MB_CUR_MAX);
+		d->bs.first[i] = first;
+	}
 
-	return (width);
+	if (d->conf->button.default_label != NULL) {
+		for (i = 0; i < (int)d->bs.nbuttons; i++) {
+			if (strcmp(d->conf->button.default_label,
+			    d->bs.label[i]) == 0)
+				d->bs.curr = i;
+		}
+	}
+
+	d->bs.sizebutton = MAX(SIZEBUTTON - 2, strcols(d->bs.label[0]));
+	for (i = 1; i < (int)d->bs.nbuttons; i++)
+		d->bs.sizebutton = MAX(d->bs.sizebutton, strcols(d->bs.label[i]));
+	d->bs.sizebutton += 2;
 }
 
 bool shortcut_buttons(wint_t key, struct buttons *bs)
@@ -391,182 +441,71 @@ bool shortcut_buttons(wint_t key, struct buttons *bs)
 	return (match);
 }
 
-/* Text */
-static bool is_wtext_attr(const wchar_t *wtext)
-{
-	if (wcsnlen(wtext, 3) < 3)
-		return (false);
-
-	if (wtext[0] != L'\\' || wtext[1] != L'Z')
-		return (false);
-
-	return (wcschr(L"nbBrRuU01234567", wtext[2]) == NULL ? false : true);
-}
-
-static bool check_set_wtext_attr(WINDOW *win, wchar_t *wtext)
+/*
+ * -4- (Auto) Sizing and (Auto) Position
+ */
+static int widget_max_height(struct bsddialog_conf *conf)
 {
-	enum bsddialog_color bg;
+	int maxheight;
 
-	if (is_wtext_attr(wtext) == false)
-		return (false);
+	maxheight = conf->shadow ? SCREENLINES - (int)t.shadow.y : SCREENLINES;
+	if (maxheight <= 0)
+		RETURN_ERROR("Terminal too small, screen lines - shadow <= 0");
 
-	if ((wtext[2] - L'0') >= 0 && (wtext[2] - L'0') < 8) {
-		bsddialog_color_attrs(t.dialog.color, NULL, &bg, NULL);
-		wattron(win, bsddialog_color(wtext[2] - L'0', bg, 0));
-		return (true);
+	if (conf->y != BSDDIALOG_CENTER && conf->auto_topmargin > 0)
+		RETURN_ERROR("conf.y > 0 and conf->auto_topmargin > 0");
+	else if (conf->y == BSDDIALOG_CENTER) {
+		maxheight -= conf->auto_topmargin;
+		if (maxheight <= 0)
+			RETURN_ERROR("Terminal too small, screen lines - top "
+			    "margins <= 0");
+	} else if (conf->y > 0) {
+		maxheight -= conf->y;
+		if (maxheight <= 0)
+			RETURN_ERROR("Terminal too small, screen lines - "
+			    "shadow - y <= 0");
 	}
 
-	switch (wtext[2]) {
-	case L'n':
-		wattron(win, t.dialog.color);
-		wattrset(win, A_NORMAL);
-		break;
-	case L'b':
-		wattron(win, A_BOLD);
-		break;
-	case L'B':
-		wattroff(win, A_BOLD);
-		break;
-	case L'r':
-		wattron(win, A_REVERSE);
-		break;
-	case L'R':
-		wattroff(win, A_REVERSE);
-		break;
-	case L'u':
-		wattron(win, A_UNDERLINE);
-		break;
-	case L'U':
-		wattroff(win, A_UNDERLINE);
-		break;
-	}
+	maxheight -= conf->auto_downmargin;
+	if (maxheight <= 0)
+		RETURN_ERROR("Terminal too small, screen lines - Down margins "
+		    "<= 0");
 
-	return (true);
+	return (maxheight);
 }
 
-/* Word Wrapping */
-static void
-print_string(WINDOW *win, int *rows, int cols, int *y, int *x, wchar_t *str,
-    bool color)
+static int widget_max_width(struct bsddialog_conf *conf)
 {
-	int i, j, len, reallen, wc;
-	wchar_t ws[2];
-
-	ws[1] = L'\0';
+	int maxwidth;
 
-	len = wcslen(str);
-	if (color) {
-		reallen = 0;
-		i=0;
-		while (i < len) {
-			if (is_wtext_attr(str+i) == false)
-				reallen += wcwidth(str[i]);
-			i++;
-		}
-	} else
-		reallen = wcswidth(str, len);
+	maxwidth = conf->shadow ? SCREENCOLS - (int)t.shadow.x : SCREENCOLS;
+	if (maxwidth <= 0)
+		RETURN_ERROR("Terminal too small, screen cols - shadow <= 0");
 
-	i = 0;
-	while (i < len) {
-		if (*x + reallen > cols) {
-			*y = (*x != 0 ? *y+1 : *y);
-			if (*y >= *rows) {
-				*rows = *y + 1;
-				wresize(win, *rows, cols);
-			}
-			*x = 0;
-		}
-		j = *x;
-		while (j < cols && i < len) {
-			if (color && check_set_wtext_attr(win, str+i)) {
-				i += 3;
-			} else if (j + wcwidth(str[i]) > cols) {
-				break;
-			} else {
-				/* inline mvwaddwch() for efficiency */
-				ws[0] = str[i];
-				mvwaddwstr(win, *y, j, ws);
-				wc = wcwidth(str[i]);;
-				reallen -= wc;
-				j += wc;
-				i++;
-				*x = j;
-			}
-		}
+	if (conf->x > 0) {
+		maxwidth -= conf->x;
+		if (maxwidth <= 0)
+			RETURN_ERROR("Terminal too small, screen cols - shadow "
+			    "- x <= 0");
 	}
+
+	return (maxwidth);
 }
 
-static int
-print_textpad(struct bsddialog_conf *conf, WINDOW *pad, const char *text)
+static bool is_wtext_attr(const wchar_t *wtext)
 {
-	bool loop;
-	int i, j, z, rows, cols, x, y, tablen;
-	wchar_t *wtext, *string;
-
-	if ((wtext = alloc_mbstows(text)) == NULL)
-		RETURN_ERROR("Cannot allocate/print text in wchar_t*");
-
-	if ((string = calloc(wcslen(wtext) + 1, sizeof(wchar_t))) == NULL)
-		RETURN_ERROR("Cannot build (analyze) text");
-
-	getmaxyx(pad, rows, cols);
-	tablen = (conf->text.tablen == 0) ? TABSIZE : (int)conf->text.tablen;
-
-	i = j = x = y = 0;
-	loop = true;
-	while (loop) {
-		string[j] = wtext[i];
-
-		if (wcschr(L"\n\t  ", string[j]) != NULL || string[j] == L'\0') {
-			string[j] = L'\0';
-			print_string(pad, &rows, cols, &y, &x, string,
-			    conf->text.highlight);
-		}
-
-		switch (wtext[i]) {
-		case L'\0':
-			loop = false;
-			break;
-		case L'\n':
-			x = 0;
-			y++;
-			j = -1;
-			break;
-		case L'\t':
-			for (z = 0; z < tablen; z++) {
-				if (x >= cols) {
-					x = 0;
-					y++;
-				}
-				x++;
-			}
-			j = -1;
-			break;
-		case L' ':
-			x++;
-			if (x >= cols) {
-				x = 0;
-				y++;
-			}
-			j = -1;
-		}
+	bool att;
 
-		if (y >= rows) {
-			rows = y + 1;
-			wresize(pad, rows, cols);
-		}
-
-		j++;
-		i++;
-	}
+	if (wcsnlen(wtext, 3) < 3)
+		return (false);
+	if (wtext[0] != L'\\' || wtext[1] != L'Z')
+		return (false);
 
-	free(wtext);
-	free(string);
+	att = wcschr(L"nbBdDkKrRsSuU01234567", wtext[2]) == NULL ? false : true;
 
-	return (0);
+	return (att);
 }
 
-/* Text Autosize */
 #define NL  -1
 #define WS  -2
 #define TB  -3
@@ -607,7 +546,7 @@ text_properties(struct bsddialog_conf *conf, const char *text,
 	wordcols = 0;
 	l = 0;
 	for (i = 0; i < wtextlen; i++) {
-		if (conf->text.highlight && is_wtext_attr(wtext + i)) {
+		if (conf->text.escape && is_wtext_attr(wtext + i)) {
 			i += 2; /* +1 for update statement */
 			continue;
 		}
@@ -675,20 +614,19 @@ text_properties(struct bsddialog_conf *conf, const char *text,
 	return (0);
 }
 
-
 static int
 text_autosize(struct bsddialog_conf *conf, struct textproperties *tp,
     int maxrows, int mincols, bool increasecols, int *h, int *w)
 {
 	int i, j, x, y, z, l, line, maxwidth, tablen;
 
-	maxwidth = widget_max_width(conf) - HBORDERS - TEXTHMARGINS;
+	maxwidth = widget_max_width(conf) - BORDERS - TEXTHMARGINS;
 	tablen = (conf->text.tablen == 0) ? TABSIZE : (int)conf->text.tablen;
 
 	if (increasecols) {
 		mincols = MAX(mincols, tp->maxwordcols);
 		mincols = MAX(mincols,
-		    (int)conf->auto_minwidth - HBORDERS - TEXTHMARGINS);
+		    (int)conf->auto_minwidth - BORDERS - TEXTHMARGINS);
 		mincols = MIN(mincols, maxwidth);
 	}
 
@@ -761,7 +699,7 @@ text_autosize(struct bsddialog_conf *conf, struct textproperties *tp,
 	return (0);
 }
 
-int
+static int
 text_size(struct bsddialog_conf *conf, int rows, int cols, const char *text,
     struct buttons *bs, int rowsnotext, int startwtext, int *htext, int *wtext)
 {
@@ -770,16 +708,16 @@ text_size(struct bsddialog_conf *conf, int rows, int cols, const char *text,
 	struct textproperties tp;
 
 	wbuttons = 0;
-	if (bs != NULL)
-		wbuttons = buttons_min_width(*bs);
+	if (bs->nbuttons > 0)
+		wbuttons = buttons_min_width(bs);
 
 	/* Rows */
 	if (rows == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_FULLSCREEN) {
-		maxhtext = widget_max_height(conf) - VBORDERS - rowsnotext;
+		maxhtext = widget_max_height(conf) - BORDERS - rowsnotext;
 	} else { /* fixed */
-		maxhtext = rows - VBORDERS - rowsnotext;
+		maxhtext = rows - BORDERS - rowsnotext;
 	}
-	if (bs != NULL)
+	if (bs->nbuttons > 0)
 		maxhtext -= 2;
 	if (maxhtext <= 0)
 		maxhtext = 1; /* text_autosize() computes always htext */
@@ -789,21 +727,23 @@ text_size(struct bsddialog_conf *conf, int rows, int cols, const char *text,
 		startwtext = MAX(startwtext, wbuttons - TEXTHMARGINS);
 		changewtext = true;
 	} else if (cols == BSDDIALOG_FULLSCREEN) {
-		startwtext = widget_max_width(conf) - VBORDERS - TEXTHMARGINS;
+		startwtext = widget_max_width(conf) - BORDERS - TEXTHMARGINS;
 		changewtext = false;
 	} else { /* fixed */
-		startwtext = cols - VBORDERS - TEXTHMARGINS;
+		startwtext = cols - BORDERS - TEXTHMARGINS;
 		changewtext = false;
 	}
 
 	if (startwtext <= 0 && changewtext)
 		startwtext = 1;
-	if (startwtext <= 0)
-		RETURN_ERROR("Fullscreen or fixed cols to print text <=0");
 
 	/* Sizing calculation */
 	if (text_properties(conf, text, &tp) != 0)
 		return (BSDDIALOG_ERROR);
+	if (tp.nword > 0 && startwtext <= 0)
+		RETURN_FMTERROR("(fixed cols or fullscreen) "
+		    "needed at least %d cols to draw text",
+		    BORDERS + TEXTHMARGINS + 1);
 	if (text_autosize(conf, &tp, maxhtext, startwtext, changewtext, htext,
 	    wtext) != 0)
 		return (BSDDIALOG_ERROR);
@@ -814,84 +754,32 @@ text_size(struct bsddialog_conf *conf, int rows, int cols, const char *text,
 	return (0);
 }
 
-/* Widget size and position */
-int widget_max_height(struct bsddialog_conf *conf)
-{
-	int maxheight;
-
-	maxheight = conf->shadow ? SCREENLINES - (int)t.shadow.y : SCREENLINES;
-	if (maxheight <= 0)
-		RETURN_ERROR("Terminal too small, screen lines - shadow <= 0");
-
-	if (conf->y != BSDDIALOG_CENTER && conf->auto_topmargin > 0)
-		RETURN_ERROR("conf.y > 0 and conf->auto_topmargin > 0");
-	else if (conf->y == BSDDIALOG_CENTER) {
-		maxheight -= conf->auto_topmargin;
-		if (maxheight <= 0)
-			RETURN_ERROR("Terminal too small, screen lines - top "
-			    "margins <= 0");
-	} else if (conf->y > 0) {
-		maxheight -= conf->y;
-		if (maxheight <= 0)
-			RETURN_ERROR("Terminal too small, screen lines - "
-			    "shadow - y <= 0");
-	}
-
-	maxheight -= conf->auto_downmargin;
-	if (maxheight <= 0)
-		RETURN_ERROR("Terminal too small, screen lines - Down margins "
-		    "<= 0");
-
-	return (maxheight);
-}
-
-int widget_max_width(struct bsddialog_conf *conf)
-{
-	int maxwidth;
-
-	maxwidth = conf->shadow ? SCREENCOLS - (int)t.shadow.x : SCREENCOLS;
-	if (maxwidth <= 0)
-		RETURN_ERROR("Terminal too small, screen cols - shadow <= 0");
-
-	if (conf->x > 0) {
-		maxwidth -= conf->x;
-		if (maxwidth <= 0)
-			RETURN_ERROR("Terminal too small, screen cols - shadow "
-			    "- x <= 0");
-	}
-
-	return (maxwidth);
-}
-
-int
-widget_min_height(struct bsddialog_conf *conf, int htext, int minwidget,
+static int
+widget_min_height(struct bsddialog_conf *conf, int htext, int hnotext,
     bool withbuttons)
 {
 	int min;
 
-	min = 0;
-
-	/* buttons */
-	if (withbuttons)
-		min += 2; /* buttons and border */
+	/* dialog borders */
+	min = BORDERS;
 
 	/* text */
 	min += htext;
 
-	/* specific widget min height */
-	min += minwidget;
+	/* specific widget lines without text */
+	min += hnotext;
+
+	/* buttons */
+	if (withbuttons)
+		min += HBUTTONS; /* buttons and their up-border */
 
-	/* dialog borders */
-	min += HBORDERS;
 	/* conf.auto_minheight */
 	min = MAX(min, (int)conf->auto_minheight);
-	/* avoid terminal overflow */
-	min = MIN(min, widget_max_height(conf));
 
 	return (min);
 }
 
-int
+static int
 widget_min_width(struct bsddialog_conf *conf, int wtext, int minwidget,
     struct buttons *bs)
 
@@ -901,8 +789,8 @@ widget_min_width(struct bsddialog_conf *conf, int wtext, int minwidget,
 	min = 0;
 
 	/* buttons */
-	if (bs != NULL)
-		min += buttons_min_width(*bs);
+	if (bs->nbuttons > 0)
+		min += buttons_min_width(bs);
 
 	/* text */
 	if (wtext > 0)
@@ -925,11 +813,9 @@ widget_min_width(struct bsddialog_conf *conf, int wtext, int minwidget,
 	}
 
 	/* dialog borders */
-	min += VBORDERS;
+	min += BORDERS;
 	/* conf.auto_minwidth */
 	min = MAX(min, (int)conf->auto_minwidth);
-	/* avoid terminal overflow */
-	min = MIN(min, widget_max_width(conf));
 
 	return (min);
 }
@@ -964,6 +850,93 @@ set_widget_size(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w)
 	return (0);
 }
 
+int
+set_widget_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
+    int *w, const char *text, int *rowstext, struct buttons *bs, int hnotext,
+    int minw)
+{
+	int htext, wtext;
+
+	if (rows == BSDDIALOG_AUTOSIZE || cols == BSDDIALOG_AUTOSIZE ||
+	    rowstext != NULL) {
+		if (text_size(conf, rows, cols, text, bs, hnotext, minw,
+		    &htext, &wtext) != 0)
+			return (BSDDIALOG_ERROR);
+		if (rowstext != NULL)
+			*rowstext = htext;
+	}
+
+	if (rows == BSDDIALOG_AUTOSIZE) {
+		*h = widget_min_height(conf, htext, hnotext, bs->nbuttons > 0);
+		*h = MIN(*h, widget_max_height(conf));
+	}
+
+	if (cols == BSDDIALOG_AUTOSIZE) {
+		*w = widget_min_width(conf, wtext, minw, bs);
+		*w = MIN(*w, widget_max_width(conf));
+	}
+
+	return (0);
+}
+
+int widget_maxsize(struct bsddialog_conf *conf, int rows, int cols, int *maxh,
+    int *maxw, const char *text, struct buttons *bs)
+{
+	int htext, wtext, h, w;
+	int minheight, minwidth;
+
+	if (rows == BSDDIALOG_AUTOSIZE)
+		rows = BSDDIALOG_FULLSCREEN;
+	if (cols == BSDDIALOG_AUTOSIZE)
+		cols = BSDDIALOG_FULLSCREEN;
+
+	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
+		return (BSDDIALOG_ERROR);
+	if (text_size(conf, rows, cols, text, bs, 0, 0, &htext, &wtext) != 0)
+		return (BSDDIALOG_ERROR);
+
+	/*
+	 * XXX: Should possibly clear conf->auto_min{height,width}
+	 * temporarily.
+	 */
+	minheight = widget_min_height(conf, htext, 0, bs->nbuttons > 0);
+	if (h < minheight)
+		RETURN_FMTERROR("Current rows: %d, needed at least: %d",
+		    h, minheight);
+	*maxh = h - minheight;
+
+	minwidth = widget_min_width(conf, wtext, 0, bs);
+	if (w < minwidth)
+		RETURN_FMTERROR("Current cols: %d, needed at least %d",
+		    w, minwidth);
+	*maxw = w - minwidth;
+
+	return (0);
+}
+
+int widget_checksize(int h, int w, struct buttons *bs, int hnotext, int minw)
+{
+	int minheight, minwidth;
+
+	minheight = BORDERS + hnotext;
+	if (bs->nbuttons > 0)
+		minheight += HBUTTONS;
+	if (h < minheight)
+		RETURN_FMTERROR("Current rows: %d, needed at least: %d",
+		    h, minheight);
+
+	minwidth = 0;
+	if (bs->nbuttons > 0)
+		minwidth = buttons_min_width(bs);
+	minwidth = MAX(minwidth, minw);
+	minwidth += BORDERS;
+	if (w < minwidth)
+		RETURN_FMTERROR("Current cols: %d, nedeed at least %d",
+		    w, minwidth);
+
+	return (0);
+}
+
 int
 set_widget_position(struct bsddialog_conf *conf, int *y, int *x, int h, int w)
 {
@@ -1005,11 +978,77 @@ set_widget_position(struct bsddialog_conf *conf, int *y, int *x, int h, int w)
 	return (0);
 }
 
-/* Widgets build, update, destroy */
-void
-draw_borders(struct bsddialog_conf *conf, WINDOW *win, int rows, int cols,
-    enum elevation elev)
+int dialog_maxsize(struct dialog *d, int *maxh, int *maxw)
+{
+
+	return  (widget_maxsize(d->conf, d->rows, d->cols, maxh, maxw, d->text,
+	    &d->bs));
+}
+
+int dialog_size_position(struct dialog *d, int hnotext, int minw, int *htext)
+{
+	if (set_widget_size(d->conf, d->rows, d->cols, &d->h, &d->w) != 0)
+		return (BSDDIALOG_ERROR);
+	if (set_widget_autosize(d->conf, d->rows, d->cols, &d->h, &d->w,
+	    d->text, htext, &d->bs, hnotext, minw) != 0)
+		return (BSDDIALOG_ERROR);
+	if (widget_checksize(d->h, d->w, &d->bs, hnotext, minw) != 0)
+		return (BSDDIALOG_ERROR);
+	if (set_widget_position(d->conf, &d->y, &d->x, d->h, d->w) != 0)
+		return (BSDDIALOG_ERROR);
+
+	return (0);
+}
+
+/*
+ * -5- Widget components and utilities
+ */
+int hide_dialog(struct dialog *d)
 {
+	WINDOW *clear;
+
+	if ((clear = newwin(d->h, d->w, d->y, d->x)) == NULL)
+		RETURN_ERROR("Cannot hide the widget");
+	wbkgd(clear, t.screen.color);
+	wrefresh(clear);
+
+	if (d->conf->shadow) {
+		mvwin(clear, d->y + t.shadow.y, d->x + t.shadow.x);
+		wrefresh(clear);
+	}
+
+	delwin(clear);
+
+	return (0);
+}
+
+int f1help_dialog(struct bsddialog_conf *conf)
+{
+	int output;
+	struct bsddialog_conf hconf;
+
+	bsddialog_initconf(&hconf);
+	hconf.title           = "HELP";
+	hconf.button.ok_label = "EXIT";
+	hconf.clear           = true;
+	hconf.ascii_lines     = conf->ascii_lines;
+	hconf.no_lines        = conf->no_lines;
+	hconf.shadow          = conf->shadow;
+	hconf.text.escape     = conf->text.escape;
+
+	output = BSDDIALOG_OK;
+	if (conf->key.f1_message != NULL)
+		output = bsddialog_msgbox(&hconf, conf->key.f1_message, 0, 0);
+
+	if (output != BSDDIALOG_ERROR && conf->key.f1_file != NULL)
+		output = bsddialog_textbox(&hconf, conf->key.f1_file, 0, 0);
+
+	return (output == BSDDIALOG_ERROR ? BSDDIALOG_ERROR : 0);
+}
+
+void draw_borders(struct bsddialog_conf *conf, WINDOW *win, enum elevation elev)
+{
+	int h, w;
 	int leftcolor, rightcolor;
 	int ls, rs, ts, bs, tl, tr, bl, br, ltee, rtee;
 
@@ -1031,199 +1070,353 @@ draw_borders(struct bsddialog_conf *conf, WINDOW *win, int rows, int cols,
 		rtee = ACS_RTEE;
 	}
 
+	getmaxyx(win, h, w);
 	leftcolor = elev == RAISED ?
 	    t.dialog.lineraisecolor : t.dialog.linelowercolor;
 	rightcolor = elev == RAISED ?
 	    t.dialog.linelowercolor : t.dialog.lineraisecolor;
+
 	wattron(win, leftcolor);
 	wborder(win, ls, rs, ts, bs, tl, tr, bl, br);
 	wattroff(win, leftcolor);
 
 	wattron(win, rightcolor);
-	mvwaddch(win, 0, cols-1, tr);
-	mvwvline(win, 1, cols-1, rs, rows-2);
-	mvwaddch(win, rows-1, cols-1, br);
-	mvwhline(win, rows-1, 1, bs, cols-2);
+	mvwaddch(win, 0, w-1, tr);
+	mvwvline(win, 1, w-1, rs, h-2);
+	mvwaddch(win, h-1, w-1, br);
+	mvwhline(win, h-1, 1, bs, w-2);
 	wattroff(win, rightcolor);
 }
 
-WINDOW *
-new_boxed_window(struct bsddialog_conf *conf, int y, int x, int rows, int cols,
+void
+update_box(struct bsddialog_conf *conf, WINDOW *win, int y, int x, int h, int w,
     enum elevation elev)
 {
-	WINDOW *win;
+	wclear(win);
+	wresize(win, h, w);
+	mvwin(win, y, x);
+	draw_borders(conf, win, elev);
+}
 
-	if ((win = newwin(rows, cols, y, x)) == NULL) {
-		set_error_string("Cannot build boxed window");
-		return (NULL);
-	}
+void
+rtextpad(struct dialog *d, int ytext, int xtext, int upnotext, int downnotext)
+{
+	pnoutrefresh(d->textpad, ytext, xtext,
+	    d->y + BORDER + upnotext,
+	    d->x + BORDER + TEXTHMARGIN,
+	    d->y + d->h - 1 - downnotext - BORDER,
+	    d->x + d->w - TEXTHMARGIN - BORDER);
+}
 
-	wbkgd(win, t.dialog.color);
+/*
+ * -6- Dialog init/build, update/draw, destroy
+ */
+void end_dialog(struct dialog *d)
+{
+	if (d->conf->sleep > 0)
+		sleep(d->conf->sleep);
+
+	delwin(d->textpad);
+	delwin(d->widget);
+	if (d->conf->shadow)
+		delwin(d->shadow);
 
-	draw_borders(conf, win, rows, cols, elev);
+	if (d->conf->clear)
+		hide_dialog(d);
 
-	return (win);
+	if (d->conf->get_height != NULL)
+		*d->conf->get_height = d->h;
+	if (d->conf->get_width != NULL)
+		*d->conf->get_width = d->w;
 }
 
-static int
-draw_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget,
-    WINDOW *textpad, const char *text, struct buttons *bs, bool shortcutbuttons)
+static bool check_set_wtext_attr(WINDOW *win, wchar_t *wtext)
 {
-	int h, w, wtitle, wbottomtitle, ts, ltee, rtee;
+	enum bsddialog_color bg;
+
+	if (is_wtext_attr(wtext) == false)
+		return (false);
+
+	if ((wtext[2] >= L'0') && (wtext[2] <= L'7')) {
+		bsddialog_color_attrs(t.dialog.color, NULL, &bg, NULL);
+		wattron(win, bsddialog_color(wtext[2] - L'0', bg, 0));
+		return (true);
+	}
+
+	switch (wtext[2]) {
+	case L'n':
+		wattron(win, t.dialog.color);
+		wattrset(win, A_NORMAL);
+		break;
+	case L'b':
+		wattron(win, A_BOLD);
+		break;
+	case L'B':
+		wattroff(win, A_BOLD);
+		break;
+	case L'd':
+		wattron(win, A_DIM);
+		break;
+	case L'D':
+		wattroff(win, A_DIM);
+		break;
+	case L'k':
+		wattron(win, A_BLINK);
+		break;
+	case L'K':
+		wattroff(win, A_BLINK);
+		break;
+	case L'r':
+		wattron(win, A_REVERSE);
+		break;
+	case L'R':
+		wattroff(win, A_REVERSE);
+		break;
+	case L's':
+		wattron(win, A_STANDOUT);
+		break;
+	case L'S':
+		wattroff(win, A_STANDOUT);
+		break;
+	case L'u':
+		wattron(win, A_UNDERLINE);
+		break;
+	case L'U':
+		wattroff(win, A_UNDERLINE);
+		break;
+	}
 
-	ts = conf->ascii_lines ? '-' : ACS_HLINE;
-	ltee = conf->ascii_lines ? '+' : ACS_LTEE;
-	rtee = conf->ascii_lines ? '+' : ACS_RTEE;
+	return (true);
+}
 
-	getmaxyx(widget, h, w);
+static void
+print_string(WINDOW *win, int *rows, int cols, int *y, int *x, wchar_t *str,
+    bool color)
+{
+	int i, j, len, reallen, wc;
+	wchar_t ws[2];
 
-	if (conf->shadow)
-		wnoutrefresh(shadow);
+	ws[1] = L'\0';
 
-	draw_borders(conf, widget, h, w, RAISED);
+	len = wcslen(str);
+	if (color) {
+		reallen = 0;
+		i=0;
+		while (i < len) {
+			if (is_wtext_attr(str+i) == false) {
+				reallen += wcwidth(str[i]);
+				i++;
+			} else {
+				i +=3 ;
+			}
+		}
+	} else
+		reallen = wcswidth(str, len);
 
-	if (conf->title != NULL) {
-		if ((wtitle = strcols(conf->title)) < 0)
-			return (BSDDIALOG_ERROR);
-		if (t.dialog.delimtitle && conf->no_lines == false) {
-			wattron(widget, t.dialog.lineraisecolor);
-			mvwaddch(widget, 0, w/2 - wtitle/2 -1, rtee);
-			wattroff(widget, t.dialog.lineraisecolor);
+	i = 0;
+	while (i < len) {
+		if (*x + reallen > cols) {
+			*y = (*x != 0 ? *y+1 : *y);
+			if (*y >= *rows) {
+				*rows = *y + 1;
+				wresize(win, *rows, cols);
+			}
+			*x = 0;
 		}
-		wattron(widget, t.dialog.titlecolor);
-		mvwaddstr(widget, 0, w/2 - wtitle/2, conf->title);
-		wattroff(widget, t.dialog.titlecolor);
-		if (t.dialog.delimtitle && conf->no_lines == false) {
-			wattron(widget, t.dialog.lineraisecolor);
-			waddch(widget, ltee);
-			wattroff(widget, t.dialog.lineraisecolor);
+		j = *x;
+		while (j < cols && i < len) {
+			if (color && check_set_wtext_attr(win, str+i)) {
+				i += 3;
+			} else if (j + wcwidth(str[i]) > cols) {
+				break;
+			} else {
+				/* inline mvwaddwch() for efficiency */
+				ws[0] = str[i];
+				mvwaddwstr(win, *y, j, ws);
+				wc = wcwidth(str[i]);;
+				reallen -= wc;
+				j += wc;
+				i++;
+				*x = j;
+			}
 		}
 	}
+}
 
-	if (bs != NULL) {
-		if (conf->no_lines == false) {
-			wattron(widget, t.dialog.lineraisecolor);
-			mvwaddch(widget, h-3, 0, ltee);
-			mvwhline(widget, h-3, 1, ts, w-2);
-			wattroff(widget, t.dialog.lineraisecolor);
-
-			wattron(widget, t.dialog.linelowercolor);
-			mvwaddch(widget, h-3, w-1, rtee);
-			wattroff(widget, t.dialog.linelowercolor);
-		}
-		draw_buttons(widget, *bs, shortcutbuttons);
-	}
+static int
+print_textpad(struct bsddialog_conf *conf, WINDOW *pad, const char *text)
+{
+	bool loop;
+	int i, j, z, rows, cols, x, y, tablen;
+	wchar_t *wtext, *string;
 
-	if (conf->bottomtitle != NULL) {
-		if ((wbottomtitle = strcols(conf->bottomtitle)) < 0)
-			return (BSDDIALOG_ERROR);
-		wattron(widget, t.dialog.bottomtitlecolor);
-		wmove(widget, h - 1, w/2 - wbottomtitle/2 - 1);
-		waddch(widget, ' ');
-		waddstr(widget, conf->bottomtitle);
-		waddch(widget, ' ');
-		wattroff(widget, t.dialog.bottomtitlecolor);
-	}
+	if ((wtext = alloc_mbstows(text)) == NULL)
+		RETURN_ERROR("Cannot allocate/print text in wchar_t*");
 
-	wnoutrefresh(widget);
+	if ((string = calloc(wcslen(wtext) + 1, sizeof(wchar_t))) == NULL)
+		RETURN_ERROR("Cannot build (analyze) text");
 
-	if (textpad != NULL && text != NULL) /* textbox */
-		if (print_textpad(conf, textpad, text) !=0)
-			return (BSDDIALOG_ERROR);
+	getmaxyx(pad, rows, cols);
+	tablen = (conf->text.tablen == 0) ? TABSIZE : (int)conf->text.tablen;
 
-	return (0);
-}
+	i = j = x = y = 0;
+	loop = true;
+	while (loop) {
+		string[j] = wtext[i];
 
-int
-update_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget,
-    int y, int x, int h, int w, WINDOW *textpad, const char *text,
-    struct buttons *bs, bool shortcutbuttons)
-{
-	int error;
+		if (wcschr(L"\n\t  ", string[j]) != NULL || string[j] == L'\0') {
+			string[j] = L'\0';
+			print_string(pad, &rows, cols, &y, &x, string,
+			    conf->text.escape);
+		}
 
-	if (conf->shadow) {
-		wclear(shadow);
-		mvwin(shadow, y + t.shadow.y, x + t.shadow.x);
-		wresize(shadow, h, w);
-	}
+		switch (wtext[i]) {
+		case L'\0':
+			loop = false;
+			break;
+		case L'\n':
+			x = 0;
+			y++;
+			j = -1;
+			break;
+		case L'\t':
+			for (z = 0; z < tablen; z++) {
+				if (x >= cols) {
+					x = 0;
+					y++;
+				}
+				x++;
+			}
+			j = -1;
+			break;
+		case L' ':
+			x++;
+			if (x >= cols) {
+				x = 0;
+				y++;
+			}
+			j = -1;
+		}
 
-	wclear(widget);
-	mvwin(widget, y, x);
-	wresize(widget, h, w);
+		if (y >= rows) {
+			rows = y + 1;
+			wresize(pad, rows, cols);
+		}
 
-	if (textpad != NULL) {
-		wclear(textpad);
-		wresize(textpad, 1, w - HBORDERS - TEXTHMARGINS);
+		j++;
+		i++;
 	}
 
-	error = draw_dialog(conf, shadow, widget, textpad, text, bs,
-	    shortcutbuttons);
+	free(wtext);
+	free(string);
 
-	return (error);
+	return (0);
 }
 
-int
-new_dialog(struct bsddialog_conf *conf, WINDOW **shadow, WINDOW **widget, int y,
-    int x, int h, int w, WINDOW **textpad, const char *text, struct buttons *bs,
-    bool shortcutbuttons)
+int draw_dialog(struct dialog *d)
 {
-	int error;
+	int wtitle, wbottomtitle, ts, ltee, rtee;
+
+	ts   = d->conf->ascii_lines ? '-' : ACS_HLINE;
+	ltee = d->conf->ascii_lines ? '+' : ACS_LTEE;
+	rtee = d->conf->ascii_lines ? '+' : ACS_RTEE;
 
-	if (conf->shadow) {
-		*shadow = newwin(h, w, y + t.shadow.y, x + t.shadow.x);
-		if (*shadow == NULL)
-			RETURN_ERROR("Cannot build shadow");
-		wbkgd(*shadow, t.shadow.color);
+	if (d->conf->shadow) {
+		wclear(d->shadow);
+		wresize(d->shadow, d->h, d->w);
+		mvwin(d->shadow, d->y + t.shadow.y, d->x + t.shadow.x);
+		wnoutrefresh(d->shadow);
 	}
 
-	if ((*widget = new_boxed_window(conf, y, x, h, w, RAISED)) == NULL) {
-		if (conf->shadow)
-			delwin(*shadow);
-		return (BSDDIALOG_ERROR);
+	wclear(d->widget);
+	wresize(d->widget, d->h, d->w);
+	mvwin(d->widget, d->y, d->x);
+	draw_borders(d->conf, d->widget, RAISED);
+
+	if (d->conf->title != NULL) {
+		if ((wtitle = strcols(d->conf->title)) < 0)
+			return (BSDDIALOG_ERROR);
+		if (t.dialog.delimtitle && d->conf->no_lines == false) {
+			wattron(d->widget, t.dialog.lineraisecolor);
+			mvwaddch(d->widget, 0, d->w/2 - wtitle/2 -1, rtee);
+			wattroff(d->widget, t.dialog.lineraisecolor);
+		}
+		wattron(d->widget, t.dialog.titlecolor);
+		mvwaddstr(d->widget, 0, d->w/2 - wtitle/2, d->conf->title);
+		wattroff(d->widget, t.dialog.titlecolor);
+		if (t.dialog.delimtitle && d->conf->no_lines == false) {
+			wattron(d->widget, t.dialog.lineraisecolor);
+			waddch(d->widget, ltee);
+			wattroff(d->widget, t.dialog.lineraisecolor);
+		}
 	}
 
-	if (textpad != NULL && text != NULL) { /* textbox */
-		*textpad = newpad(1, w - HBORDERS - TEXTHMARGINS);
-		if (*textpad == NULL) {
-			delwin(*widget);
-			if (conf->shadow)
-				delwin(*shadow);
-			RETURN_ERROR("Cannot build the pad window for text");
+	if (d->bs.nbuttons > 0) {
+		if (d->conf->no_lines == false) {
+			wattron(d->widget, t.dialog.lineraisecolor);
+			mvwaddch(d->widget, d->h-3, 0, ltee);
+			mvwhline(d->widget, d->h-3, 1, ts, d->w-2);
+			wattroff(d->widget, t.dialog.lineraisecolor);
+
+			wattron(d->widget, t.dialog.linelowercolor);
+			mvwaddch(d->widget, d->h-3, d->w-1, rtee);
+			wattroff(d->widget, t.dialog.linelowercolor);
 		}
-		wbkgd(*textpad, t.dialog.color);
+		draw_buttons(d);
 	}
 
-	error = draw_dialog(conf, *shadow, *widget,
-	    textpad == NULL ? NULL : *textpad, text, bs, shortcutbuttons);
+	if (d->conf->bottomtitle != NULL) {
+		if ((wbottomtitle = strcols(d->conf->bottomtitle)) < 0)
+			return (BSDDIALOG_ERROR);
+		wattron(d->widget, t.dialog.bottomtitlecolor);
+		wmove(d->widget, d->h - 1, d->w/2 - wbottomtitle/2 - 1);
+		waddch(d->widget, ' ');
+		waddstr(d->widget, d->conf->bottomtitle);
+		waddch(d->widget, ' ');
+		wattroff(d->widget, t.dialog.bottomtitlecolor);
+	}
 
-	return (error);
-}
+	wnoutrefresh(d->widget);
 
-void
-end_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget,
-    WINDOW *textpad)
-{
-	int y, x, h, w;
+	wclear(d->textpad);
+	/* `infobox "" 0 2` fails but text is empty and textpad remains 1 1 */
+	wresize(d->textpad, 1, d->w - BORDERS - TEXTHMARGINS);
 
-	getbegyx(widget, y, x);
-	getmaxyx(widget, h, w);
+	if (print_textpad(d->conf, d->textpad, d->text) != 0)
+		return (BSDDIALOG_ERROR);
 
-	if (conf->sleep > 0)
-		sleep(conf->sleep);
+	d->built = true;
 
-	if (textpad != NULL)
-		delwin(textpad);
+	return (0);
+}
 
-	delwin(widget);
+int
+prepare_dialog(struct bsddialog_conf *conf, const char *text, int rows,
+    int cols, struct dialog *d)
+{
+	CHECK_PTR(conf);
+
+	d->built = false;
+	d->conf = conf;
+	d->rows = rows;
+	d->cols = cols;
+	d->text = CHECK_STR(text);
+	d->bs.nbuttons = 0;
+
+	if (d->conf->shadow) {
+		if ((d->shadow = newwin(1, 1, 1, 1)) == NULL)
+			RETURN_ERROR("Cannot build WINDOW shadow");
+		wbkgd(d->shadow, t.shadow.color);
+	}
 
-	if (conf->shadow)
-		delwin(shadow);
+	if ((d->widget = newwin(1, 1, 1, 1)) == NULL)
+		RETURN_ERROR("Cannot build WINDOW widget");
+	wbkgd(d->widget, t.dialog.color);
 
-	if (conf->clear)
-		hide_widget(y, x, h, w, conf->shadow);
+	/* fake for textpad */
+	if ((d->textpad = newpad(1, 1)) == NULL)
+		RETURN_ERROR("Cannot build the pad WINDOW for text");
+	wbkgd(d->textpad, t.dialog.color);
 
-	if (conf->get_height != NULL)
-		*conf->get_height = h;
-	if (conf->get_width != NULL)
-		*conf->get_width = w;
+	return (0);
 }
diff --git a/contrib/bsddialog/lib/lib_util.h b/contrib/bsddialog/lib/lib_util.h
index bd8cc9b3b0e4..8f66b2327e88 100644
--- a/contrib/bsddialog/lib/lib_util.h
+++ b/contrib/bsddialog/lib/lib_util.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,118 +28,142 @@
 #ifndef _LIBBSDDIALOG_UTIL_H_
 #define _LIBBSDDIALOG_UTIL_H_
 
-#define HBORDERS	2
-#define VBORDERS	2
+#define BORDER          1
+#define BORDERS         (BORDER + BORDER)
 #define TEXTHMARGIN     1
 #define TEXTHMARGINS    (TEXTHMARGIN + TEXTHMARGIN)
+#define HBUTTONS        2
+#define OK_LABEL        "OK"
+#define CANCEL_LABEL    "Cancel"
 
-/* theme utils */
+/* theme util */
 extern struct bsddialog_theme t;
 extern bool hastermcolors;
 
+#define	MIN(a,b) (((a)<(b))?(a):(b))
+#define	MAX(a,b) (((a)>(b))?(a):(b))
 /* debug */
-#define BSDDIALOG_DEBUG(y,x,fmt, ...) do {	\
-	mvprintw(y, x, fmt, __VA_ARGS__);	\
-	refresh();				\
+#define BSDDIALOG_DEBUG(y,x,fmt, ...) do {                                     \
+	mvprintw(y, x, fmt, __VA_ARGS__);                                      \
+	refresh();                                                             \
 } while (0)
-
-/* date */
-#define ISLEAP(year) ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)
-
-/* unicode */
-unsigned int strcols(const char *mbstring);
-char *strcolseek(const char *mbstring, unsigned int ncol);
-int str_props(const char *mbstring, unsigned int *cols, bool *has_multi_col);
-void mvwaddwch(WINDOW *w, int y, int x, wchar_t wch);
-wchar_t* alloc_mbstows(const char *mbstring);
-
-/* error buffer */
-const char *get_error_string(void);
-void set_error_string(const char *string);
-
-#define RETURN_ERROR(str) do {			\
-	set_error_string(str);			\
-	return (BSDDIALOG_ERROR);		\
+/* error and diagnostic */
+#define RETURN_ERROR(str) do {                                                 \
+	set_error_string(str);                                                 \
+	return (BSDDIALOG_ERROR);                                              \
+} while (0)
+#define RETURN_FMTERROR(fmt, ...) do {                                         \
+	set_fmt_error_string(fmt, __VA_ARGS__);                                \
+	return (BSDDIALOG_ERROR);                                              \
+} while (0)
+/* check ptr */
+#define CHECK_PTR(p) do {                                                      \
+	if (p == NULL)                                                         \
+		RETURN_ERROR("*" #p " is NULL");                               \
+} while (0)
+#define CHECK_ARRAY(nitem, a) do {                                             \
+	if(nitem > 0 && a == NULL)                                             \
+		RETURN_FMTERROR(#nitem " is %d but *" #a " is NULL", nitem);   \
+} while (0)
+/* widget utils */
+#define TEXTPAD(d, downnotext) rtextpad(d, 0, 0, 0, downnotext)
+#define SCREENLINES (getmaxy(stdscr))
+#define SCREENCOLS  (getmaxx(stdscr))
+#define CHECK_STR(s) (s == NULL ? "" : s)
+#define DRAW_BUTTONS(d) do {                                                   \
+	draw_buttons(&d);                                                      \
+	wnoutrefresh(d.widget);                                                \
 } while (0)
 
-/* buttons */
+/* internal types */
+enum elevation { RAISED, LOWERED };
+
 struct buttons {
 	unsigned int nbuttons;
-#define MAXBUTTONS 6 /* ok + extra + cancel + help + 2 generics */
+#define MAXBUTTONS 10 /* 3left + ok + extra + cancel + help + 3 right */
 	const char *label[MAXBUTTONS];
+	bool shortcut;
 	wchar_t first[MAXBUTTONS];
 	int value[MAXBUTTONS];
 	int curr;
+#define BUTTONVALUE(bs) bs.value[bs.curr]
 	unsigned int sizebutton; /* including left and right delimiters */
 };
 
-#define BUTTON_OK_LABEL      "OK"
-#define BUTTON_CANCEL_LABEL  "Cancel"
-void
-get_buttons(struct bsddialog_conf *conf, struct buttons *bs,
-    const char *yesoklabel, const char *nocancellabel);
+struct dialog {
+	bool built;         /* true after the first draw_dialog() */
+	struct bsddialog_conf *conf;  /* Checked API conf */
+	WINDOW *widget;     /* Size and position refer to widget */
+	int y, x;           /* Current position, API conf.[y|x]: -1, >=0 */
+	int rows, cols;     /* API rows and cols: -1, 0, >0 */
+	int h, w;           /* Current height and width */
+	const char *text;   /* Checked API text, at least "" */
+	WINDOW *textpad;    /* Fake for textbox */
+	struct buttons bs;  /* bs.nbuttons = 0 for no buttons */
+	WINDOW *shadow;
+};
 
-void
-draw_buttons(WINDOW *window, struct buttons bs, bool shortcut);
+/* error and diagnostic */
+const char *get_error_string(void);
+void set_error_string(const char *string);
+void set_fmt_error_string(const char *fmt, ...);
 
-int buttons_min_width(struct buttons bs);
-bool shortcut_buttons(wint_t key, struct buttons *bs);
+/* multicolumn character string */
+unsigned int strcols(const char *mbstring);
+char *strcolseek(const char *mbstring, unsigned int ncol);
+int str_props(const char *mbstring, unsigned int *cols, bool *has_multi_col);
+void mvwaddwch(WINDOW *w, int y, int x, wchar_t wch);
+wchar_t* alloc_mbstows(const char *mbstring);
 
-/* help window with F1 key */
-int f1help(struct bsddialog_conf *conf);
+/* buttons */
+void
+set_buttons(struct dialog *d, bool shortcut, const char *oklabel,
+    const char *canclabel);
+void draw_buttons(struct dialog *d);
+bool shortcut_buttons(wint_t key, struct buttons *bs);
 
-/* cleaner */
-int hide_widget(int y, int x, int h, int w, bool withshadow);
+/* widget utils */
+int hide_dialog(struct dialog *d);
+int f1help_dialog(struct bsddialog_conf *conf);
 
-/* (auto) size and (auto) position */
-#define SCREENLINES (getmaxy(stdscr))
-#define SCREENCOLS  (getmaxx(stdscr))
+void
+draw_borders(struct bsddialog_conf *conf, WINDOW *win, enum elevation elev);
 
-int
-text_size(struct bsddialog_conf *conf, int rows, int cols, const char *text,
-    struct buttons *bs, int rowsnotext, int startwtext, int *htext, int *wtext);
+void
+update_box(struct bsddialog_conf *conf, WINDOW *win, int y, int x, int h, int w,
+    enum elevation elev);
 
-int widget_max_height(struct bsddialog_conf *conf);
-int widget_max_width(struct bsddialog_conf *conf);
+void
+rtextpad(struct dialog *d, int ytext, int xtext, int upnotext, int downnotext);
 
+/* (auto) sizing and (auto) position */
 int
-widget_min_height(struct bsddialog_conf *conf, int htext, int minwidget,
-    bool withbuttons);
+set_widget_size(struct bsddialog_conf *conf, int rows, int cols, int *h,
+    int *w);
 
 int
-widget_min_width(struct bsddialog_conf *conf, int wtext, int minwidget,
-    struct buttons *bs);
+set_widget_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
+    int *w, const char *text, int *rowstext, struct buttons *bs, int hnotext,
+    int minw);
 
-int
-set_widget_size(struct bsddialog_conf *conf, int rows, int cols, int *h,
-    int *w);
+int widget_maxsize(struct bsddialog_conf *conf, int rows, int cols, int *maxh,
+    int *maxw, const char *text, struct buttons *bs);
+
+int widget_checksize(int h, int w, struct buttons *bs, int hnotext, int minw);
 
 int
 set_widget_position(struct bsddialog_conf *conf, int *y, int *x, int h, int w);
 
-/* widget builders */
-enum elevation { RAISED, LOWERED };
+int dialog_maxsize(struct dialog *d, int *maxh, int *maxw);
 
-void
-draw_borders(struct bsddialog_conf *conf, WINDOW *win, int rows, int cols,
-    enum elevation elev);
-
-WINDOW *
-new_boxed_window(struct bsddialog_conf *conf, int y, int x, int rows, int cols,
-    enum elevation elev);
+int dialog_size_position(struct dialog *d, int hnotext, int minw, int *htext);
 
-int
-new_dialog(struct bsddialog_conf *conf, WINDOW **shadow, WINDOW **widget, int y,
-    int x, int h, int w, WINDOW **textpad, const char *text, struct buttons *bs,
-    bool shortcutbuttons);
+/* dialog */
+void end_dialog(struct dialog *d);
+int draw_dialog(struct dialog *d);
 
 int
-update_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget,
-    int y, int x, int h, int w, WINDOW *textpad, const char *text,
-    struct buttons *bs, bool shortcutbuttons);
-
-void
-end_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget,
-    WINDOW *textpad);
+prepare_dialog(struct bsddialog_conf *conf, const char *text, int rows,
+    int cols, struct dialog *d);
 
 #endif
diff --git a/contrib/bsddialog/lib/libbsddialog.c b/contrib/bsddialog/lib/libbsddialog.c
index 73c1f5c2dd57..755a469b126c 100644
--- a/contrib/bsddialog/lib/libbsddialog.c
+++ b/contrib/bsddialog/lib/libbsddialog.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,15 +26,15 @@
  */
 
 #include <curses.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
-#define COLSPERROW  10   /* Default conf.text.columns_per_row */
+#define DEFAULT_COLS_PER_ROW  10   /* Default conf.text.columns_per_row */
+
+static bool in_bsddialog_mode = false;
 
 int bsddialog_init_notheme(void)
 {
@@ -55,6 +55,7 @@ int bsddialog_init_notheme(void)
 		bsddialog_end();
 		RETURN_ERROR("Cannot init curses (keypad and cursor)");
 	}
+	in_bsddialog_mode = true;
 
 	c = 1;
 	error += start_color();
@@ -83,6 +84,7 @@ int bsddialog_init(void)
 
 	if (bsddialog_set_default_theme(theme) != 0) {
 		bsddialog_end();
+		in_bsddialog_mode = false;
 		return (BSDDIALOG_ERROR);
 	}
 
@@ -93,15 +95,18 @@ int bsddialog_end(void)
 {
 	if (endwin() != OK)
 		RETURN_ERROR("Cannot end curses (endwin)");
+	in_bsddialog_mode = false;
 
 	return (BSDDIALOG_OK);
 }
 
 int bsddialog_backtitle(struct bsddialog_conf *conf, const char *backtitle)
 {
+	CHECK_PTR(conf);
+
 	move(0, 1);
 	clrtoeol();
-	addstr(backtitle);
+	addstr(CHECK_STR(backtitle));
 	if (conf->no_lines != true)
 		mvhline(1, 1, conf->ascii_lines ? '-' : ACS_HLINE,
 		    SCREENCOLS - 2);
@@ -111,6 +116,11 @@ int bsddialog_backtitle(struct bsddialog_conf *conf, const char *backtitle)
 	return (BSDDIALOG_OK);
 }
 
+bool bsddialog_inmode(void)
+{
+	return (in_bsddialog_mode);
+}
+
 const char *bsddialog_geterror(void)
 {
 	return (get_error_string());
@@ -118,25 +128,25 @@ const char *bsddialog_geterror(void)
 
 int bsddialog_initconf(struct bsddialog_conf *conf)
 {
-	if (conf == NULL)
-		RETURN_ERROR("conf is NULL");
-	if (sizeof(*conf) != sizeof(struct bsddialog_conf))
-		RETURN_ERROR("Bad conf size");
+	CHECK_PTR(conf);
 
 	memset(conf, 0, sizeof(struct bsddialog_conf));
 	conf->y = BSDDIALOG_CENTER;
 	conf->x = BSDDIALOG_CENTER;
 	conf->shadow = true;
-	conf->text.cols_per_row = COLSPERROW;
+	conf->text.cols_per_row = DEFAULT_COLS_PER_ROW;
 
 	return (BSDDIALOG_OK);
 }
 
-int bsddialog_clearterminal(void)
+void bsddialog_refresh(void)
 {
-	if (clear() != OK)
-		RETURN_ERROR("Cannot clear the terminal");
 	refresh();
+}
 
-	return (BSDDIALOG_OK);
+void bsddialog_clear(unsigned int y)
+{
+	move(y, 0);
+	clrtobot();
+	refresh();
 }
\ No newline at end of file
diff --git a/contrib/bsddialog/lib/menubox.c b/contrib/bsddialog/lib/menubox.c
index bd06a9e37df2..b6213aa8f997 100644
--- a/contrib/bsddialog/lib/menubox.c
+++ b/contrib/bsddialog/lib/menubox.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,19 +25,13 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
-
-#include <ctype.h>
 #include <curses.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
-#define MIN_HEIGHT  VBORDERS + 6 /* 2 buttons 1 text 3 menu */
-
 enum menumode {
 	CHECKLISTMODE,
 	MENUMODE,
@@ -46,47 +40,155 @@ enum menumode {
 	SEPARATORMODE
 };
 
-struct lineposition {
-	unsigned int maxsepstr;
-	unsigned int maxprefix;
-	unsigned int xselector;
-	unsigned int selectorlen;
-	unsigned int maxdepth;
-	unsigned int xname;
-	unsigned int maxname;
-	unsigned int xdesc;
-	unsigned int maxdesc;
-	unsigned int line;
-};
-
 struct privateitem {
-	bool on;
-	int group;
-	int index;
+	const char *prefix;
+	bool on;               /* menu changes, not API on */
+	unsigned int depth;
+	const char *name;
+	const char *desc;
+	const char *bottomdesc;
+	int group;             /* index menu in menugroup */
+	int index;             /* real item index inside its menu */
 	enum menumode type;
-	struct bsddialog_menuitem *item;
+	wchar_t shortcut;
 };
 
-static void
-set_on_output(struct bsddialog_conf *conf, int output, int ngroups,
-    struct bsddialog_menugroup *groups, struct privateitem *pritems)
+struct privatemenu {
+	WINDOW *box;              /* only for borders */
+	WINDOW *pad;              /* pad for the private items */
+	int ypad;                 /* start pad line */
+	int ys, ye, xs, xe;       /* pad pos */
+	unsigned int xselector;   /* [] */
+	unsigned int xname;       /* real x: xname + item.depth */
+	unsigned int xdesc;       /* real x: xdesc + item.depth */
+	unsigned int line;        /* wpad: prefix [] depth name desc */
+	unsigned int apimenurows;
+	unsigned int menurows;    /* real menurows after menu_size_position() */
+	int nitems;               /* total nitems (all groups * all items) */
+	struct privateitem *pritems;
+	int sel;                  /* current focus item, can be -1 */
+	bool hasbottomdesc;
+};
+
+static enum menumode
+getmode(enum menumode mode, struct bsddialog_menugroup group)
 {
+	if (mode == MIXEDLISTMODE) {
+		if (group.type == BSDDIALOG_SEPARATOR)
+			mode = SEPARATORMODE;
+		else if (group.type == BSDDIALOG_RADIOLIST)
+			mode = RADIOLISTMODE;
+		else if (group.type == BSDDIALOG_CHECKLIST)
+			mode = CHECKLISTMODE;
+	}
+
+	return (mode);
+}
+
+static int
+build_privatemenu(struct bsddialog_conf *conf, struct privatemenu *m,
+    enum menumode mode, unsigned int ngroups,
+    struct bsddialog_menugroup *groups)
+{
+	bool onetrue;
 	int i, j, abs;
+	unsigned int maxsepstr, maxprefix, selectorlen, maxdepth;
+	unsigned int maxname, maxdesc;
+	struct bsddialog_menuitem *item;
+	struct privateitem *pritem;
 
-	if (output != BSDDIALOG_OK && !conf->menu.on_without_ok)
-		return;
+	/* nitems and fault checks */
+	CHECK_ARRAY(ngroups, groups);
+	m->nitems = 0;
+	for (i = 0; i < (int)ngroups; i++) {
+		CHECK_ARRAY(groups[i].nitems, groups[i].items);
+		m->nitems += (int)groups[i].nitems;
+	}
 
-	for(i = abs = 0; i < ngroups; i++) {
-		if (groups[i].type == BSDDIALOG_SEPARATOR) {
-			abs += groups[i].nitems;
-			continue;
-		}
+	/* alloc and set private items */
+	m->pritems = calloc(m->nitems, sizeof (struct privateitem));
+	if (m->pritems == NULL)
+		RETURN_ERROR("Cannot allocate memory for internal menu items");
+	m->hasbottomdesc = false;
+	abs = 0;
+	for (i = 0; i < (int)ngroups; i++) {
+		onetrue = false;
+		for (j = 0; j < (int)groups[i].nitems; j++) {
+			item = &groups[i].items[j];
+			pritem = &m->pritems[abs];
+
+			if (getmode(mode, groups[i]) == MENUMODE) {
+				m->pritems[abs].on = false;
+			} else if (getmode(mode, groups[i]) == RADIOLISTMODE) {
+				m->pritems[abs].on = onetrue ? false : item->on;
+				if (m->pritems[abs].on)
+					onetrue = true;
+			} else { /* CHECKLISTMODE */
+				m->pritems[abs].on = item->on;
+			}
+			pritem->group = i;
+			pritem->index = j;
+			pritem->type = getmode(mode, groups[i]);
+
+			pritem->prefix = CHECK_STR(item->prefix);
+			pritem->depth = item->depth;
+			pritem->name = CHECK_STR(item->name);
+			pritem->desc = CHECK_STR(item->desc);
+			pritem->bottomdesc = CHECK_STR(item->bottomdesc);
+			if (item->bottomdesc != NULL)
+				m->hasbottomdesc = true;
+
+			mbtowc(&pritem->shortcut, conf->menu.no_name ?
+			    pritem->desc : pritem->name, MB_CUR_MAX);
 
-		for(j = 0; j < (int)groups[i].nitems; j++) {
-			groups[i].items[j].on = pritems[abs].on;
 			abs++;
 		}
 	}
+
+	/* positions */
+	m->xselector = m->xname = m->xdesc = m->line = 0;
+	maxsepstr = maxprefix = selectorlen = maxdepth = maxname = maxdesc = 0;
+	for (i = 0; i < m->nitems; i++) {
+		if (m->pritems[i].type == RADIOLISTMODE ||
+		    m->pritems[i].type == CHECKLISTMODE)
+			selectorlen = 4;
+
+		if (m->pritems[i].type == SEPARATORMODE) {
+			maxsepstr = MAX(maxsepstr,
+			    strcols(m->pritems[i].name) +
+			    strcols(m->pritems[i].desc));
+			continue;
+		}
+
+		maxprefix = MAX(maxprefix, strcols(m->pritems[i].prefix));
+		maxdepth  = MAX(maxdepth, m->pritems[i].depth);
+		maxname   = MAX(maxname, strcols(m->pritems[i].name));
+		maxdesc   = MAX(maxdesc, strcols(m->pritems[i].desc));
+	}
+	maxname = conf->menu.no_name ? 0 : maxname;
+	maxdesc = conf->menu.no_desc ? 0 : maxdesc;
+
+	m->xselector = maxprefix + (maxprefix != 0 ? 1 : 0);
+	m->xname = m->xselector + selectorlen;
+	m->xdesc = maxdepth + m->xname + maxname;
+	m->xdesc += (maxname != 0 ? 1 : 0);
+	m->line = MAX(maxsepstr + 3, m->xdesc + maxdesc);
+
+	return (0);
+}
+
+static void
+set_return_on(struct privatemenu *m, struct bsddialog_menugroup *groups)
+{
+	int i;
+	struct privateitem *pritem;
+
+	for(i = 0; i < m->nitems; i++) {
+		if (m->pritems[i].type == SEPARATORMODE)
+			continue;
+		pritem = &m->pritems[i];
+		groups[pritem->group].items[pritem->index].on = pritem->on;
+	}
 }
 
 static int getprev(struct privateitem *pritems, int abs)
@@ -175,26 +277,17 @@ getfastprev(int menurows, struct privateitem *pritems, int abs)
 }
 
 static int
-getnextshortcut(struct bsddialog_conf *conf, int npritems,
-    struct privateitem *pritems, int abs, wint_t key)
+getnextshortcut(int npritems, struct privateitem *pritems, int abs, wint_t key)
 {
 	int i, next;
-	wchar_t wch;
 
 	next = -1;
 	for (i = 0; i < npritems; i++) {
 		if (pritems[i].type == SEPARATORMODE)
 			continue;
-
-		if (conf->menu.no_name)
-			mbtowc(&wch, pritems[i].item->desc, MB_CUR_MAX);
-		else
-			mbtowc(&wch, pritems[i].item->name, MB_CUR_MAX);
-
-		if (wch == (wchar_t)key) {
+		if (pritems[i].shortcut == (wchar_t)key) {
 			if (i > abs)
 				return (i);
-
 			if (i < abs && next == -1)
 				next = i;
 		}
@@ -203,81 +296,64 @@ getnextshortcut(struct bsddialog_conf *conf, int npritems,
 	return (next != -1 ? next : abs);
 }
 
-static enum menumode
-getmode(enum menumode mode, struct bsddialog_menugroup group)
+static void drawseparators(struct bsddialog_conf *conf, struct privatemenu *m)
 {
-	if (mode == MIXEDLISTMODE) {
-		if (group.type == BSDDIALOG_SEPARATOR)
-			mode = SEPARATORMODE;
-		else if (group.type == BSDDIALOG_RADIOLIST)
-			mode = RADIOLISTMODE;
-		else if (group.type == BSDDIALOG_CHECKLIST)
-			mode = CHECKLISTMODE;
-	}
-
-	return (mode);
-}
-
-static void
-drawseparators(struct bsddialog_conf *conf, WINDOW *pad, int linelen,
-    int nitems, struct privateitem *pritems)
-{
-	int i, linech, labellen;
+	int i, linech, realw, labellen;
 	const char *desc, *name;
 
-	for (i = 0; i < nitems; i++) {
-		if (pritems[i].type != SEPARATORMODE)
+	for (i = 0; i < m->nitems; i++) {
+		if (m->pritems[i].type != SEPARATORMODE)
 			continue;
 		if (conf->no_lines == false) {
-			wattron(pad, t.menu.desccolor);
+			wattron(m->pad, t.menu.desccolor);
 			linech = conf->ascii_lines ? '-' : ACS_HLINE;
-			mvwhline(pad, i, 0, linech, linelen);
-			wattroff(pad, t.menu.desccolor);
+			mvwhline(m->pad, i, 0, linech, m->line);
+			wattroff(m->pad, t.menu.desccolor);
 		}
-		name = pritems[i].item->name;
-		desc = pritems[i].item->desc;
+		name = m->pritems[i].name;
+		desc = m->pritems[i].desc;
+		realw = m->xe - m->xs;
 		labellen = strcols(name) + strcols(desc) + 1;
-		wmove(pad, i, labellen < linelen ? linelen/2 - labellen/2 : 0);
-		wattron(pad, t.menu.namesepcolor);
-		waddstr(pad, name);
-		wattroff(pad, t.menu.namesepcolor);
+		wmove(m->pad, i, (labellen < realw) ? realw/2 - labellen/2 : 0);
+		wattron(m->pad, t.menu.sepnamecolor);
+		waddstr(m->pad, name);
+		wattroff(m->pad, t.menu.sepnamecolor);
 		if (strcols(name) > 0 && strcols(desc) > 0)
-			waddch(pad, ' ');
-		wattron(pad, t.menu.descsepcolor);
-		waddstr(pad, desc);
-		wattroff(pad, t.menu.descsepcolor);
+			waddch(m->pad, ' ');
+		wattron(m->pad, t.menu.sepdesccolor);
+		waddstr(m->pad, desc);
+		wattroff(m->pad, t.menu.sepdesccolor);
 	}
 }
 
 static void
-drawitem(struct bsddialog_conf *conf, WINDOW *pad, int y,
-    struct lineposition pos, struct privateitem *pritem, bool focus)
+drawitem(struct bsddialog_conf *conf, struct privatemenu *m, int y, bool focus)
 {
 	int colordesc, colorname, colorshortcut;
-	wchar_t shortcut;
-	struct bsddialog_menuitem *item;
+	struct privateitem *pritem;
 
-	item = pritem->item;
+	pritem = &m->pritems[y];
 
 	/* prefix */
-	if (item->prefix != NULL && item->prefix[0] != '\0')
-		mvwaddstr(pad, y, 0, item->prefix);
+	wattron(m->pad, focus ? t.menu.f_prefixcolor : t.menu.prefixcolor);
+	mvwaddstr(m->pad, y, 0, pritem->prefix);
+	wattroff(m->pad, focus ? t.menu.f_prefixcolor : t.menu.prefixcolor);
 
 	/* selector */
-	wmove(pad, y, pos.xselector);
-	wattron(pad, focus ? t.menu.f_selectorcolor : t.menu.selectorcolor);
+	wmove(m->pad, y, m->xselector);
+	wattron(m->pad, focus ? t.menu.f_selectorcolor : t.menu.selectorcolor);
 	if (pritem->type == CHECKLISTMODE)
-		wprintw(pad, "[%c]", pritem->on ? 'X' : ' ');
+		wprintw(m->pad, "[%c]", pritem->on ? 'X' : ' ');
 	if (pritem->type == RADIOLISTMODE)
-		wprintw(pad, "(%c)", pritem->on ? '*' : ' ');
-	wattroff(pad, focus ? t.menu.f_selectorcolor : t.menu.selectorcolor);
+		wprintw(m->pad, "(%c)", pritem->on ? '*' : ' ');
+	wattroff(m->pad, focus ? t.menu.f_selectorcolor : t.menu.selectorcolor);
 
 	/* name */
 	colorname = focus ? t.menu.f_namecolor : t.menu.namecolor;
 	if (conf->menu.no_name == false) {
-		wattron(pad, colorname);
-		mvwaddstr(pad, y, pos.xname + item->depth, item->name);
-		wattroff(pad, colorname);
+		wattron(m->pad, colorname);
+		mvwaddstr(m->pad, y, m->xname + pritem->depth, pritem->name);
+		wattroff(m->pad, colorname);
 	}
 
 	/* description */
@@ -287,142 +363,137 @@ drawitem(struct bsddialog_conf *conf, WINDOW *pad, int y,
 		colordesc = focus ? t.menu.f_desccolor : t.menu.desccolor;
 
 	if (conf->menu.no_desc == false) {
-		wattron(pad, colordesc);
+		wattron(m->pad, colordesc);
 		if (conf->menu.no_name)
-			mvwaddstr(pad, y, pos.xname + item->depth, item->desc);
+			mvwaddstr(m->pad, y, m->xname + pritem->depth,
+			    pritem->desc);
 		else
-			mvwaddstr(pad, y, pos.xdesc, item->desc);
-		wattroff(pad, colordesc);
+			mvwaddstr(m->pad, y, m->xdesc, pritem->desc);
+		wattroff(m->pad, colordesc);
 	}
 
 	/* shortcut */
 	if (conf->menu.shortcut_buttons == false) {
 		colorshortcut = focus ?
 		    t.menu.f_shortcutcolor : t.menu.shortcutcolor;
-		wattron(pad, colorshortcut);
-
-		if (conf->menu.no_name)
-			mbtowc(&shortcut, item->desc, MB_CUR_MAX);
-		else
-			mbtowc(&shortcut, item->name, MB_CUR_MAX);
-		mvwaddwch(pad, y, pos.xname + item->depth, shortcut);
-		wattroff(pad, colorshortcut);
+		wattron(m->pad, colorshortcut);
+		mvwaddwch(m->pad, y, m->xname + pritem->depth, pritem->shortcut);
+		wattroff(m->pad, colorshortcut);
 	}
 
 	/* bottom description */
-	move(SCREENLINES - 1, 2);
-	clrtoeol();
-	if (item->bottomdesc != NULL && focus) {
-		attron(t.menu.bottomdesccolor);
-		addstr(item->bottomdesc);
-		attroff(t.menu.bottomdesccolor);
-		refresh();
+	if (m->hasbottomdesc) {
+		move(SCREENLINES - 1, 2);
+		clrtoeol();
+		if (focus) {
+			attron(t.menu.bottomdesccolor);
+			addstr(pritem->bottomdesc);
+			attroff(t.menu.bottomdesccolor);
+			refresh();
+		}
 	}
 }
 
-/* the caller has to call prefresh(menupad, ymenupad, 0, ys, xs, ye, xe); */
-static void
-update_menuwin(struct bsddialog_conf *conf, WINDOW *menuwin, int h, int w,
-    int totnitems, unsigned int menurows, int ymenupad)
+static void update_menubox(struct bsddialog_conf *conf, struct privatemenu *m)
 {
-	draw_borders(conf, menuwin, h, w, LOWERED);
+	int h, w;
+
+	draw_borders(conf, m->box, LOWERED);
+	getmaxyx(m->box, h, w);
 
-	if (totnitems > (int)menurows) {
-		wattron(menuwin, t.dialog.arrowcolor);
-		if (ymenupad > 0)
-			mvwhline(menuwin, 0, 2,
+	if (m->nitems > (int)m->menurows) {
+		wattron(m->box, t.dialog.arrowcolor);
+		if (m->ypad > 0)
+			mvwhline(m->box, 0, 2,
 			    conf->ascii_lines ? '^' : ACS_UARROW, 3);
 
-		if ((ymenupad + (int)menurows) < totnitems)
-			mvwhline(menuwin, h-1, 2,
+		if ((m->ypad + (int)m->menurows) < m->nitems)
+			mvwhline(m->box, h-1, 2,
 			    conf->ascii_lines ? 'v' : ACS_DARROW, 3);
 
-		mvwprintw(menuwin, h-1, w-6, "%3d%%",
-		    100 * (ymenupad + menurows) / totnitems);
-		wattroff(menuwin, t.dialog.arrowcolor);
+		mvwprintw(m->box, h-1, w-6, "%3d%%",
+		    100 * (m->ypad + m->menurows) / m->nitems);
+		wattroff(m->box, t.dialog.arrowcolor);
 	}
 }
 
-static int
-menu_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w,
-    const char *text, int linelen, unsigned int *menurows, int nitems,
-    struct buttons bs)
+static int menu_size_position(struct dialog *d, struct privatemenu *m)
 {
-	int htext, wtext, menusize, notext;
-
-	notext = 2;
-	if (*menurows == BSDDIALOG_AUTOSIZE) {
-		/* algo 1): grows vertically */
-		/* notext = 1; */
-		/* algo 2): grows horizontally, better with little screens */
-		notext += nitems;
-		notext = MIN(notext, widget_max_height(conf) - HBORDERS - 3);
-	} else
-		notext += *menurows;
-
-	if (text_size(conf, rows, cols, text, &bs, notext, linelen + 4, &htext,
-	    &wtext) != 0)
-		return (BSDDIALOG_ERROR);
+	int htext, hmenu;
 
-	if (cols == BSDDIALOG_AUTOSIZE)
-		*w = widget_min_width(conf, wtext, linelen + 4, &bs);
-
-	if (rows == BSDDIALOG_AUTOSIZE) {
-		if (*menurows == BSDDIALOG_AUTOSIZE) {
-			menusize = widget_max_height(conf) - HBORDERS -
-			     2 /*buttons*/ - htext;
-			menusize = MIN(menusize, nitems + 2);
-			*menurows = menusize - 2 < 0 ? 0 : menusize - 2;
-		} else /* h autosize with fixed menurows */
-			menusize = *menurows + 2;
-
-		*h = widget_min_height(conf, htext, menusize, true);
-	} else { /* fixed rows */
-		if (*menurows == BSDDIALOG_AUTOSIZE) {
-			if (*h - 6 - htext <= 0)
-				*menurows = 0; /* menu_checksize() will check */
-			else
-				*menurows = MIN(*h-6-htext, nitems);
-		}
-	}
+	if (set_widget_size(d->conf, d->rows, d->cols, &d->h, &d->w) != 0)
+		return (BSDDIALOG_ERROR);
 
-	/* avoid menurows overflow and menurows becomes at most menurows */
-	if (*h - 6 - htext <= 0)
-		*menurows = 0; /* menu_checksize() will check */
+	hmenu = (int)(m->menurows == BSDDIALOG_AUTOSIZE) ?
+	    (int)m->nitems : (int)m->menurows;
+	hmenu += 2; /* menu borders */
+	/*
+	 * algo 1: notext = 1 (grows vertically).
+	 * algo 2: notext = hmenu (grows horizontally, better for little term).
+	 */
+	if (set_widget_autosize(d->conf, d->rows, d->cols, &d->h, &d->w,
+	    d->text, &htext, &d->bs, hmenu, m->line + 4) != 0)
+		return (BSDDIALOG_ERROR);
+	/* avoid menurows overflow and menurows becomes "at most menurows" */
+	if (d->h - BORDERS - htext - HBUTTONS <= 2 /* menuborders */)
+		m->menurows = (m->nitems > 0) ? 1 : 0; /* widget_checksize() */
 	else
-		*menurows = MIN(*h - 6 - htext, (int)*menurows);
-
-	return (0);
-}
+		m->menurows = MIN(d->h - BORDERS - htext - HBUTTONS, hmenu) - 2;
 
-static int
-menu_checksize(int rows, int cols, const char *text, int menurows, int nitems,
-    struct buttons bs)
-{
-	int mincols, textrow, menusize;
-
-	mincols = VBORDERS;
-	/* buttons */
-	mincols += buttons_min_width(bs);
 	/*
-	 * linelen check, comment to allow some hidden col otherwise portconfig
-	 * could not show big menus like www/apache24
+	 * no minw=linelen to avoid big menu fault, then some col can be
+	 * hidden (example portconfig www/apache24).
 	 */
-	/* mincols = MAX(mincols, linelen); */
-
-	if (cols < mincols)
-		RETURN_ERROR("Few cols, width < size buttons or "
-		    "name + descripion of the items");
+	if (widget_checksize(d->h, d->w, &d->bs,
+	    2 /* border box */ + MIN(m->menurows, 1), 0) != 0)
+		return (BSDDIALOG_ERROR);
 
-	textrow = text != NULL && text[0] != '\0' ? 1 : 0;
+	if (set_widget_position(d->conf, &d->y, &d->x, d->h, d->w) != 0)
+		return (BSDDIALOG_ERROR);
 
-	if (nitems > 0 && menurows == 0)
-		RETURN_ERROR("items > 0 but menurows == 0, if menurows = 0 "
-		    "terminal too small");
+	return (0);
+}
 
-	menusize = nitems > 0 ? 3 : 0;
-	if (rows < 2  + 2 + menusize + textrow)
-		RETURN_ERROR("Few lines for this menus");
+static int mixedlist_redraw(struct dialog *d, struct privatemenu *m)
+{
+	if (d->built) {
+		hide_dialog(d);
+		refresh(); /* Important for decreasing screen */
+	}
+	m->menurows = m->apimenurows;
+	if (menu_size_position(d, m) != 0)
+		return (BSDDIALOG_ERROR);
+	if (draw_dialog(d) != 0)
+		return (BSDDIALOG_ERROR);
+	if (d->built)
+		refresh(); /* Important to fix grey lines expanding screen */
+	TEXTPAD(d, 2/*bmenu*/ + m->menurows + HBUTTONS);
+
+	/* selected item in view*/
+	if (m->ypad > m->sel && m->ypad > 0)
+		m->ypad = m->sel;
+	if ((int)(m->ypad + m->menurows) <= m->sel)
+		m->ypad = m->sel - m->menurows + 1;
+	/* lower pad after a terminal expansion */
+	if (m->ypad > 0 && (m->nitems - m->ypad) < (int)m->menurows)
+		m->ypad = m->nitems - m->menurows;
+
+	update_box(d->conf, m->box, d->y + d->h - 5 - m->menurows, d->x + 2,
+	    m->menurows+2, d->w-4, LOWERED);
+	update_menubox(d->conf, m);
+	wnoutrefresh(m->box);
+
+	m->ys = d->y + d->h - 5 - m->menurows + 1;
+	m->ye = d->y + d->h - 5 ;
+	if (d->conf->menu.align_left || (int)m->line > d->w - 6) {
+		m->xs = d->x + 3;
+		m->xe = m->xs + d->w - 7;
+	} else { /* center */
+		m->xs = d->x + 3 + (d->w-6)/2 - m->line/2;
+		m->xe = m->xs + d->w - 5;
+	}
+	drawseparators(d->conf, m); /* uses xe - xs */
+	pnoutrefresh(m->pad, m->ypad, 0, m->ys, m->xs, m->ye, m->xe);
 
 	return (0);
 }
@@ -432,332 +503,185 @@ do_mixedlist(struct bsddialog_conf *conf, const char *text, int rows, int cols,
     unsigned int menurows, enum menumode mode, unsigned int ngroups,
     struct bsddialog_menugroup *groups, int *focuslist, int *focusitem)
 {
-	bool loop, onetrue, movefocus, automenurows, shortcut_butts;
-	int i, j, y, x, h, w, retval;
-	int ymenupad, ys, ye, xs, xe, abs, next, totnitems;
+	bool loop, changeitem;
+	int i, next, retval;
 	wint_t input;
-	WINDOW  *shadow, *widget, *textpad, *menuwin, *menupad;
-	struct buttons bs;
-	struct lineposition pos = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-	struct bsddialog_menuitem *item;
-	struct privateitem *pritems;
-
-	shortcut_butts = conf->menu.shortcut_buttons;
-
-	automenurows = (menurows == BSDDIALOG_AUTOSIZE) ? true : false;
-
-	totnitems = 0;
-	for (i = 0; i < (int)ngroups; i++) {
-		if (getmode(mode, groups[i]) == RADIOLISTMODE ||
-		    getmode(mode, groups[i]) == CHECKLISTMODE)
-			pos.selectorlen = 3;
-
-		for (j = 0; j < (int)groups[i].nitems; j++) {
-			totnitems++;
-			item = &groups[i].items[j];
+	struct privatemenu m;
+	struct dialog d;
 
-			if (groups[i].type == BSDDIALOG_SEPARATOR) {
-				pos.maxsepstr = MAX(pos.maxsepstr,
-				    strcols(item->name) + strcols(item->desc));
-				continue;
-			}
-
-			pos.maxprefix = MAX(pos.maxprefix,strcols(item->prefix));
-			pos.maxdepth  = MAX(pos.maxdepth, item->depth);
-			pos.maxname   = MAX(pos.maxname, strcols(item->name));
-			pos.maxdesc   = MAX(pos.maxdesc, strcols(item->desc));
-		}
-	}
-	pos.maxname = conf->menu.no_name ? 0 : pos.maxname;
-	pos.maxdesc = conf->menu.no_desc ? 0 : pos.maxdesc;
-
-	pos.xselector = pos.maxprefix + (pos.maxprefix != 0 ? 1 : 0);
-	pos.xname = pos.xselector + pos.selectorlen +
-	    (pos.selectorlen > 0 ? 1 : 0);
-	pos.xdesc = pos.maxdepth + pos.xname + pos.maxname;
-	pos.xdesc += (pos.maxname != 0 ? 1 : 0);
-	pos.line = MAX(pos.maxsepstr + 3, pos.xdesc + pos.maxdesc);
-
-	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
-
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-		return (BSDDIALOG_ERROR);
-	if (menu_autosize(conf, rows, cols, &h, &w, text, pos.line, &menurows,
-	    totnitems, bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (menu_checksize(h, w, text, menurows, totnitems, bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
+	if (prepare_dialog(conf, text, rows, cols, &d) != 0)
 		return (BSDDIALOG_ERROR);
+	set_buttons(&d, conf->menu.shortcut_buttons, OK_LABEL, CANCEL_LABEL);
+	if (d.conf->menu.no_name && d.conf->menu.no_desc)
+		RETURN_ERROR("Both conf.menu.no_name and conf.menu.no_desc");
 
-	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
-	     shortcut_butts) != 0)
+	if (build_privatemenu(conf, &m, mode, ngroups, groups) != 0)
 		return (BSDDIALOG_ERROR);
 
-	doupdate();
-
-	prefresh(textpad, 0, 0, y + 1, x + 1 + TEXTHMARGIN, y + h - menurows,
-	    x + 1 + w - TEXTHMARGIN);
+	if ((m.box = newwin(1, 1, 1, 1)) == NULL)
+		RETURN_ERROR("Cannot build WINDOW box menu");
+	wbkgd(m.box, t.dialog.color);
+	m.pad = newpad(m.nitems, m.line);
+	wbkgd(m.pad, t.dialog.color);
 
-	menuwin = new_boxed_window(conf, y + h - 5 - menurows, x + 2,
-	    menurows + 2, w - 4, LOWERED);
-
-	menupad = newpad(totnitems, pos.line);
-	wbkgd(menupad, t.dialog.color);
-
-	if ((pritems = calloc(totnitems, sizeof (struct privateitem))) == NULL)
-		RETURN_ERROR("Cannot allocate memory for internal menu items");
-
-	abs = 0;
-	for (i = 0; i < (int)ngroups; i++) {
-		onetrue = false;
-		for (j = 0; j < (int)groups[i].nitems; j++) {
-			item = &groups[i].items[j];
-
-			if (getmode(mode, groups[i]) == MENUMODE) {
-				pritems[abs].on = false;
-			} else if (getmode(mode, groups[i]) == RADIOLISTMODE) {
-				pritems[abs].on = onetrue ? false : item->on;
-				if (pritems[abs].on)
-					onetrue = true;
-			} else {
-				pritems[abs].on = item->on;
-			}
-			pritems[abs].group = i;
-			pritems[abs].index = j;
-			pritems[abs].type = getmode(mode, groups[i]);
-			pritems[abs].item = item;
-
-			drawitem(conf, menupad, abs, pos, &pritems[abs], false);
-			abs++;
-		}
-	}
-	drawseparators(conf, menupad, MIN((int)pos.line, w-6), totnitems,
-	    pritems);
-	abs = getfirst_with_default(totnitems, pritems, ngroups, groups,
+	for (i = 0; i < m.nitems; i++)
+		drawitem(conf, &m, i, false);
+	m.sel = getfirst_with_default(m.nitems, m.pritems, ngroups, groups,
 	    focuslist, focusitem);
-	if (abs >= 0)
-		drawitem(conf, menupad, abs, pos, &pritems[abs], true);
-
-	ys = y + h - 5 - menurows + 1;
-	ye = y + h - 5 ;
-	if (conf->menu.align_left || (int)pos.line > w - 6) {
-		xs = x + 3;
-		xe = xs + w - 7;
-	} else { /* center */
-		xs = x + 3 + (w-6)/2 - pos.line/2;
-		xe = xs + w - 5;
-	}
-
-	ymenupad = 0;
-	if ((int)(ymenupad + menurows) - 1 < abs)
-		ymenupad = abs - menurows + 1;
-	update_menuwin(conf, menuwin, menurows+2, w-4, totnitems, menurows,
-	    ymenupad);
-	wrefresh(menuwin);
-	prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
+	if (m.sel >= 0)
+		drawitem(d.conf, &m, m.sel, true);
+	m.ypad = 0;
+	m.apimenurows = menurows;
+	if (mixedlist_redraw(&d, &m) != 0)
+		return (BSDDIALOG_ERROR);
 
-	movefocus = false;
+	changeitem = false;
 	loop = true;
 	while (loop) {
+		doupdate();
 		if (get_wch(&input) == ERR)
 			continue;
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
-			retval = bs.value[bs.curr];
-			if (abs >= 0 && pritems[abs].type == MENUMODE)
-				pritems[abs].on = true;
-			set_on_output(conf, retval, ngroups, groups, pritems);
+			retval = BUTTONVALUE(d.bs);
+			if (m.sel >= 0 && m.pritems[m.sel].type == MENUMODE)
+				m.pritems[m.sel].on = true;
 			loop = false;
 			break;
 		case 27: /* Esc */
 			if (conf->key.enable_esc) {
 				retval = BSDDIALOG_ESC;
-				if (abs >= 0 && pritems[abs].type == MENUMODE)
-					pritems[abs].on = true;
-				set_on_output(conf, retval, ngroups, groups,
-				    pritems);
+				if (m.sel >= 0 &&
+				   m.pritems[m.sel].type == MENUMODE)
+					m.pritems[m.sel].on = true;
 				loop = false;
 			}
 			break;
 		case '\t': /* TAB */
-			bs.curr = (bs.curr + 1) % bs.nbuttons;
-			draw_buttons(widget, bs, shortcut_butts);
-			wrefresh(widget);
+		case KEY_RIGHT:
+			d.bs.curr = (d.bs.curr + 1) % d.bs.nbuttons;
+			DRAW_BUTTONS(d);
 			break;
 		case KEY_LEFT:
-			if (bs.curr > 0) {
-				bs.curr--;
-				draw_buttons(widget, bs, shortcut_butts);
-				wrefresh(widget);
-			}
-			break;
-		case KEY_RIGHT:
-			if (bs.curr < (int) bs.nbuttons - 1) {
-				bs.curr++;
-				draw_buttons(widget, bs, shortcut_butts);
-				wrefresh(widget);
-			}
+			d.bs.curr--;
+			if (d.bs.curr < 0)
+				 d.bs.curr = d.bs.nbuttons - 1;
+			DRAW_BUTTONS(d);
 			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
-			if (f1help(conf) != 0)
+			if (f1help_dialog(conf) != 0)
 				return (BSDDIALOG_ERROR);
-			/* No break, screen size can change */
-		case KEY_RESIZE:
-			/* Important for decreasing screen */
-			hide_widget(y, x, h, w, conf->shadow);
-			refresh();
-
-			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-				return (BSDDIALOG_ERROR);
-			menurows = automenurows ? 0 : menurows;
-			if (menu_autosize(conf, rows, cols, &h, &w, text,
-			    pos.line, &menurows, totnitems, bs) != 0)
-				return (BSDDIALOG_ERROR);
-			if (menu_checksize(h, w, text, menurows, totnitems,
-			    bs) != 0)
+			if (mixedlist_redraw(&d, &m) != 0)
 				return (BSDDIALOG_ERROR);
-			if (set_widget_position(conf, &y, &x, h, w) != 0)
-				return (BSDDIALOG_ERROR);
-
-			if (update_dialog(conf, shadow, widget, y, x, h, w,
-			    textpad, text, &bs, shortcut_butts) != 0)
+			break;
+		case KEY_RESIZE:
+			if (mixedlist_redraw(&d, &m) != 0)
 				return (BSDDIALOG_ERROR);
-
-			doupdate();
-
-			prefresh(textpad, 0, 0, y + 1, x + 1 + TEXTHMARGIN,
-			    y + h - menurows, x + 1 + w - TEXTHMARGIN);
-
-			wclear(menuwin);
-			mvwin(menuwin, y + h - 5 - menurows, x + 2);
-			wresize(menuwin,menurows+2, w-4);
-			update_menuwin(conf, menuwin, menurows+2, w-4,
-			    totnitems, menurows, ymenupad);
-			wrefresh(menuwin);
-
-			ys = y + h - 5 - menurows + 1;
-			ye = y + h - 5 ;
-			if (conf->menu.align_left || (int)pos.line > w - 6) {
-				xs = x + 3;
-				xe = xs + w - 7;
-			} else { /* center */
-				xs = x + 3 + (w-6)/2 - pos.line/2;
-				xe = xs + w - 5;
-			}
-
-			drawseparators(conf, menupad, MIN((int)pos.line, w-6),
-			    totnitems, pritems);
-
-			if ((int)(ymenupad + menurows) - 1 < abs)
-				ymenupad = abs - menurows + 1;
-			prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
-
-			refresh();
-
 			break;
 		}
 
-		if (abs < 0)
+		if (m.sel < 0)
 			continue;
 		switch(input) {
 		case KEY_HOME:
-			next = getnext(totnitems, pritems, -1);
-			movefocus = next != abs;
+			next = getnext(m.nitems, m.pritems, -1);
+			changeitem = next != m.sel;
 			break;
 		case KEY_UP:
-			next = getprev(pritems, abs);
-			movefocus = next != abs;
+			next = getprev(m.pritems, m.sel);
+			changeitem = next != m.sel;
 			break;
 		case KEY_PPAGE:
-			next = getfastprev(menurows, pritems, abs);
-			movefocus = next != abs;
+			next = getfastprev(m.menurows, m.pritems, m.sel);
+			changeitem = next != m.sel;
 			break;
 		case KEY_END:
-			next = getprev(pritems, totnitems);
-			movefocus = next != abs;
+			next = getprev(m.pritems, m.nitems);
+			changeitem = next != m.sel;
 			break;
 		case KEY_DOWN:
-			next = getnext(totnitems, pritems, abs);
-			movefocus = next != abs;
+			next = getnext(m.nitems, m.pritems, m.sel);
+			changeitem = next != m.sel;
 			break;
 		case KEY_NPAGE:
-			next = getfastnext(menurows, totnitems, pritems, abs);
-			movefocus = next != abs;
+			next = getfastnext(m.menurows, m.nitems, m.pritems, m.sel);
+			changeitem = next != m.sel;
 			break;
 		case ' ': /* Space */
-			if (pritems[abs].type == MENUMODE) {
-				retval = bs.value[bs.curr];
-				pritems[abs].on = true;
-				set_on_output(conf, retval, ngroups, groups,
-				    pritems);
+			if (m.pritems[m.sel].type == MENUMODE) {
+				retval = BUTTONVALUE(d.bs);
+				m.pritems[m.sel].on = true;
 				loop = false;
-			} else if (pritems[abs].type == CHECKLISTMODE) {
-				pritems[abs].on = !pritems[abs].on;
+			} else if (m.pritems[m.sel].type == CHECKLISTMODE) {
+				m.pritems[m.sel].on = !m.pritems[m.sel].on;
 			} else { /* RADIOLISTMODE */
-				for (i = abs - pritems[abs].index;
-				    i < totnitems &&
-				    pritems[i].group == pritems[abs].group;
+				for (i = m.sel - m.pritems[m.sel].index;
+				    i < m.nitems &&
+				    m.pritems[i].group == m.pritems[m.sel].group;
 				    i++) {
-					if (i != abs && pritems[i].on) {
-						pritems[i].on = false;
-						drawitem(conf, menupad, i, pos,
-						    &pritems[i], false);
+					if (i != m.sel && m.pritems[i].on) {
+						m.pritems[i].on = false;
+						drawitem(conf, &m, i, false);
 					}
 				}
-				pritems[abs].on = !pritems[abs].on;
+				m.pritems[m.sel].on = !m.pritems[m.sel].on;
 			}
-			drawitem(conf, menupad, abs, pos, &pritems[abs], true);
-			prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
+			drawitem(conf, &m, m.sel, true);
+			pnoutrefresh(m.pad, m.ypad, 0, m.ys, m.xs, m.ye, m.xe);
 			break;
 		default:
-			if (shortcut_butts) {
-				if (shortcut_buttons(input, &bs)) {
-					retval = bs.value[bs.curr];
-					if (pritems[abs].type == MENUMODE)
-						pritems[abs].on = true;
-					set_on_output(conf, retval, ngroups,
-					    groups, pritems);
+			if (conf->menu.shortcut_buttons) {
+				if (shortcut_buttons(input, &d.bs)) {
+					DRAW_BUTTONS(d);
+					doupdate();
+					retval = BUTTONVALUE(d.bs);
+					if (m.pritems[m.sel].type == MENUMODE)
+						m.pritems[m.sel].on = true;
 					loop = false;
 				}
 				break;
 			}
 
 			/* shourtcut items */
-			next = getnextshortcut(conf, totnitems, pritems, abs,
+			next = getnextshortcut(m.nitems, m.pritems, m.sel,
 			    input);
-			movefocus = next != abs;
-		} /* end switch handler */
-
-		if (movefocus) {
-			drawitem(conf, menupad, abs, pos, &pritems[abs], false);
-			abs = next;
-			drawitem(conf, menupad, abs, pos, &pritems[abs], true);
-			if (ymenupad > abs && ymenupad > 0)
-				ymenupad = abs;
-			if ((int)(ymenupad + menurows) <= abs)
-				ymenupad = abs - menurows + 1;
-			update_menuwin(conf, menuwin, menurows+2, w-4,
-			    totnitems, menurows, ymenupad);
-			wrefresh(menuwin);
-			prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
-			movefocus = false;
+			changeitem = next != m.sel;
+		} /* end switch get_wch() */
+
+		if (changeitem) {
+			drawitem(conf, &m, m.sel, false);
+			m.sel = next;
+			drawitem(conf, &m, m.sel, true);
+			if (m.ypad > m.sel && m.ypad > 0)
+				m.ypad = m.sel;
+			if ((int)(m.ypad + m.menurows) <= m.sel)
+				m.ypad = m.sel - m.menurows + 1;
+			update_menubox(conf, &m);
+			wnoutrefresh(m.box);
+			pnoutrefresh(m.pad, m.ypad, 0, m.ys, m.xs, m.ye, m.xe);
+			changeitem = false;
 		}
-	} /* end while handler */
+	} /* end while(loop) */
+
+	set_return_on(&m, groups);
 
 	if (focuslist != NULL)
-		*focuslist = abs < 0 ? -1 : pritems[abs].group;
+		*focuslist = m.sel < 0 ? -1 : m.pritems[m.sel].group;
 	if (focusitem !=NULL)
-		*focusitem = abs < 0 ? -1 : pritems[abs].index;
+		*focusitem = m.sel < 0 ? -1 : m.pritems[m.sel].index;
 
-	delwin(menupad);
-	delwin(menuwin);
-	end_dialog(conf, shadow, widget, textpad);
-	free(pritems);
+	if (m.hasbottomdesc && conf->clear) {
+		move(SCREENLINES - 1, 2);
+		clrtoeol();
+	}
+	delwin(m.pad);
+	delwin(m.box);
+	end_dialog(&d);
+	free(m.pritems);
 
 	return (retval);
 }
@@ -783,8 +707,9 @@ bsddialog_checklist(struct bsddialog_conf *conf, const char *text, int rows,
 {
 	int retval, focuslist = 0;
 	struct bsddialog_menugroup group = {
-	    BSDDIALOG_CHECKLIST /* unused */, nitems, items};
+	    BSDDIALOG_CHECKLIST /* unused */, nitems, items, 0};
 
+	CHECK_ARRAY(nitems, items); /* efficiency, avoid do_mixedlist() */
 	retval = do_mixedlist(conf, text, rows, cols, menurows, CHECKLISTMODE,
 	    1, &group, &focuslist, focusitem);
 
@@ -798,8 +723,9 @@ bsddialog_menu(struct bsddialog_conf *conf, const char *text, int rows,
 {
 	int retval, focuslist = 0;
 	struct bsddialog_menugroup group = {
-	    BSDDIALOG_CHECKLIST /* unused */, nitems, items};
+	    BSDDIALOG_CHECKLIST /* unused */, nitems, items, 0};
 
+	CHECK_ARRAY(nitems, items); /* efficiency, avoid do_mixedlist() */
 	retval = do_mixedlist(conf, text, rows, cols, menurows, MENUMODE, 1,
 	    &group, &focuslist, focusitem);
 
@@ -813,8 +739,9 @@ bsddialog_radiolist(struct bsddialog_conf *conf, const char *text, int rows,
 {
 	int retval, focuslist = 0;
 	struct bsddialog_menugroup group = {
-	    BSDDIALOG_RADIOLIST /* unused */, nitems, items};
+	    BSDDIALOG_RADIOLIST /* unused */, nitems, items, 0};
 
+	CHECK_ARRAY(nitems, items); /* efficiency, avoid do_mixedlist() */
 	retval = do_mixedlist(conf, text, rows, cols, menurows, RADIOLISTMODE,
 	    1, &group, &focuslist, focusitem);
 
diff --git a/contrib/bsddialog/lib/messagebox.c b/contrib/bsddialog/lib/messagebox.c
index 7063ea9d273e..fc18ff8a61d2 100644
--- a/contrib/bsddialog/lib/messagebox.c
+++ b/contrib/bsddialog/lib/messagebox.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,209 +25,165 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
-
 #include <curses.h>
-#include <string.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
-static int
-message_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
-    int *w, const char *text, bool *hastext, struct buttons bs)
-{
-	int htext, wtext;
+struct scroll {
+	int ypad;      /* y scrollable pad */
+	int htext;     /* real h text to draw, to use with htextpad */
+	int htextpad;  /* h textpad, draw_dialog() set at least 1 */
+	int printrows; /* h - BORDER - HBUTTONS - BORDER */
+};
 
-	if (cols == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_AUTOSIZE ||
-	    hastext != NULL) {
-		if (text_size(conf, rows, cols, text, &bs, 0, 1, &htext,
-		    &wtext) != 0)
-			return (BSDDIALOG_ERROR);
-		if (hastext != NULL)
-			*hastext = htext > 0 ? true : false;
+static void textupdate(struct dialog *d, struct scroll *s)
+{
+	if (s->htext > 0 && s->htextpad > s->printrows) {
+		wattron(d->widget, t.dialog.arrowcolor);
+		mvwprintw(d->widget, d->h - HBUTTONS - BORDER,
+		    d->w - 4 - TEXTHMARGIN - BORDER,
+		    "%3d%%", 100 * (s->ypad + s->printrows) / s->htextpad);
+		wattroff(d->widget, t.dialog.arrowcolor);
+		wnoutrefresh(d->widget);
 	}
-
-	if (cols == BSDDIALOG_AUTOSIZE)
-		*w = widget_min_width(conf, wtext, 0, &bs);
-
-	if (rows == BSDDIALOG_AUTOSIZE)
-		*h = widget_min_height(conf, htext, 0, true);
-
-	return (0);
+	rtextpad(d, s->ypad, 0, 0, HBUTTONS);
 }
 
-static int
-message_checksize(int rows, int cols, bool hastext, struct buttons bs)
+static int message_size_position(struct dialog *d, int *htext)
 {
-	int mincols;
-
-	mincols = VBORDERS;
-	mincols += buttons_min_width(bs);
-
-	if (cols < mincols)
-		RETURN_ERROR("Few cols, Msgbox and Yesno need at least width "
-		    "for borders, buttons and spaces between buttons");
+	int minw;
 
-	if (rows < HBORDERS + 2 /* buttons */)
-		RETURN_ERROR("Msgbox and Yesno need at least 4 rows");
-	if (hastext && rows < HBORDERS + 2 /*buttons*/ + 1 /* text row */)
-		RETURN_ERROR("Msgbox and Yesno with text need at least 5 rows");
+	if (set_widget_size(d->conf, d->rows, d->cols, &d->h, &d->w) != 0)
+		return (BSDDIALOG_ERROR);
+	if (set_widget_autosize(d->conf, d->rows, d->cols, &d->h, &d->w,
+	    d->text, (*htext < 0) ? htext : NULL, &d->bs, 0, 0) != 0)
+		return (BSDDIALOG_ERROR);
+	minw = (*htext > 0) ? 1 + TEXTHMARGINS : 0 ;
+	if (widget_checksize(d->h, d->w, &d->bs, MIN(*htext, 1), minw) != 0)
+		return (BSDDIALOG_ERROR);
+	if (set_widget_position(d->conf, &d->y, &d->x, d->h, d->w) != 0)
+		return (BSDDIALOG_ERROR);
 
 	return (0);
 }
 
-static void
-textupdate(WINDOW *widget, WINDOW *textpad, int htextpad, int ytextpad,
-    bool hastext)
+static int message_draw(struct dialog *d, struct scroll *s)
 {
-	int y, x, h, w;
-
-	getbegyx(widget, y, x);
-	getmaxyx(widget, h, w);
+	int unused;
 
-	if (hastext && htextpad > h - 4) {
-		wattron(widget, t.dialog.arrowcolor);
-		mvwprintw(widget, h-3, w-6, "%3d%%",
-		    100 * (ytextpad+h-4)/ htextpad);
-		wattroff(widget, t.dialog.arrowcolor);
-		wnoutrefresh(widget);
+	if (d->built) {
+		hide_dialog(d);
+		refresh(); /* Important for decreasing screen */
 	}
+	if (message_size_position(d, &s->htext) != 0)
+		return (BSDDIALOG_ERROR);
+	if (draw_dialog(d) != 0)
+		return (BSDDIALOG_ERROR);
+	if (d->built)
+		refresh(); /* Important to fix grey lines expanding screen */
 
-	pnoutrefresh(textpad, ytextpad, 0, y+1, x+2, y+h-4, x+w-2);
+	s->printrows = d->h - BORDER - HBUTTONS - BORDER;
+	s->ypad = 0;
+	getmaxyx(d->textpad, s->htextpad, unused);
+	unused++; /* fix unused error */
+
+	return (0);
 }
 
 static int
 do_message(struct bsddialog_conf *conf, const char *text, int rows, int cols,
-    struct buttons bs)
+    const char *oklabel, const char *cancellabel)
 {
-	bool hastext, loop;
-	int y, x, h, w, retval, ytextpad, htextpad, printrows, unused;
-	WINDOW *widget, *textpad, *shadow;
+	bool loop;
+	int retval;
 	wint_t input;
+	struct scroll s;
+	struct dialog d;
 
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
+	if (prepare_dialog(conf, text, rows, cols, &d) != 0)
 		return (BSDDIALOG_ERROR);
-	if (message_autosize(conf, rows, cols, &h, &w, text, &hastext, bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (message_checksize(h, w, hastext, bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
-		return (BSDDIALOG_ERROR);
-
-	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
-	    true) != 0)
+	set_buttons(&d, true, oklabel, cancellabel);
+	s.htext = -1;
+	if(message_draw(&d, &s) != 0)
 		return (BSDDIALOG_ERROR);
 
-	printrows = h - 4;
-	ytextpad = 0;
-	getmaxyx(textpad, htextpad, unused);
-	unused++; /* fix unused error */
 	loop = true;
 	while (loop) {
-		textupdate(widget, textpad, htextpad, ytextpad, hastext);
+		textupdate(&d, &s);
 		doupdate();
 		if (get_wch(&input) == ERR)
 			continue;
 		switch (input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
-			retval = bs.value[bs.curr];
+			retval = BUTTONVALUE(d.bs);
 			loop = false;
 			break;
 		case 27: /* Esc */
-			if (conf->key.enable_esc) {
+			if (d.conf->key.enable_esc) {
 				retval = BSDDIALOG_ESC;
 				loop = false;
 			}
 			break;
 		case '\t': /* TAB */
-			bs.curr = (bs.curr + 1) % bs.nbuttons;
-			draw_buttons(widget, bs, true);
-			wnoutrefresh(widget);
+		case KEY_RIGHT:
+			d.bs.curr = (d.bs.curr + 1) % d.bs.nbuttons;
+			DRAW_BUTTONS(d);
 			break;
 		case KEY_LEFT:
-			if (bs.curr > 0) {
-				bs.curr--;
-				draw_buttons(widget, bs, true);
-				wnoutrefresh(widget);
-			}
-			break;
-		case KEY_RIGHT:
-			if (bs.curr < (int)bs.nbuttons - 1) {
-				bs.curr++;
-				draw_buttons(widget, bs, true);
-				wnoutrefresh(widget);
-			}
+			d.bs.curr--;
+			if (d.bs.curr < 0)
+				 d.bs.curr = d.bs.nbuttons - 1;
+			DRAW_BUTTONS(d);
 			break;
 		case KEY_UP:
-			if (ytextpad > 0)
-				ytextpad--;
+			if (s.ypad > 0)
+				s.ypad--;
 			break;
 		case KEY_DOWN:
-			if (ytextpad + printrows < htextpad)
-				ytextpad++;
+			if (s.ypad + s.printrows < s.htextpad)
+				s.ypad++;
 			break;
 		case KEY_HOME:
-			ytextpad = 0;
+			s.ypad = 0;
 			break;
 		case KEY_END:
-			ytextpad = htextpad - printrows;
-			ytextpad = ytextpad < 0 ? 0 : ytextpad;
+			s.ypad = MAX(s.htextpad - s.printrows, 0);
 			break;
 		case KEY_PPAGE:
-			ytextpad -= printrows;
-			ytextpad = ytextpad < 0 ? 0 : ytextpad;
+			s.ypad = MAX(s.ypad - s.printrows, 0);
 			break;
 		case KEY_NPAGE:
-			ytextpad += printrows;
-			if (ytextpad + printrows > htextpad)
-				ytextpad = htextpad - printrows;
+			s.ypad += s.printrows;
+			if (s.ypad + s.printrows > s.htextpad)
+				s.ypad = s.htextpad - s.printrows;
 			break;
 		case KEY_F(1):
-			if (conf->key.f1_file == NULL &&
-			    conf->key.f1_message == NULL)
+			if (d.conf->key.f1_file == NULL &&
+			    d.conf->key.f1_message == NULL)
 				break;
-			if (f1help(conf) != 0)
-				return (BSDDIALOG_ERROR);
-			/* No break, screen size can change */
-		case KEY_RESIZE:
-			/* Important for decreasing screen */
-			hide_widget(y, x, h, w, conf->shadow);
-			refresh();
-
-			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
+			if (f1help_dialog(d.conf) != 0)
 				return (BSDDIALOG_ERROR);
-			if (message_autosize(conf, rows, cols, &h, &w, text,
-			    NULL, bs) != 0)
+			if(message_draw(&d, &s) != 0)
 				return (BSDDIALOG_ERROR);
-			if (message_checksize(h, w, hastext, bs) != 0)
-				return (BSDDIALOG_ERROR);
-			if (set_widget_position(conf, &y, &x, h, w) != 0)
-				return (BSDDIALOG_ERROR);
-
-			if (update_dialog(conf, shadow, widget, y, x, h, w,
-			    textpad, text, &bs, true) != 0)
+			break;
+		case KEY_RESIZE:
+			if(message_draw(&d, &s) != 0)
 				return (BSDDIALOG_ERROR);
-
-			printrows = h - 4;
-			getmaxyx(textpad, htextpad, unused);
-			ytextpad = 0;
-			textupdate(widget, textpad, htextpad, ytextpad, hastext);
-
-			/* Important to fix grey lines expanding screen */
-			refresh();
 			break;
 		default:
-			if (shortcut_buttons(input, &bs)) {
-				retval = bs.value[bs.curr];
+			if (shortcut_buttons(input, &d.bs)) {
+				DRAW_BUTTONS(d);
+				doupdate();
+				retval = BUTTONVALUE(d.bs);
 				loop = false;
 			}
 		}
 	}
 
-	end_dialog(conf, shadow, widget, textpad);
+	end_dialog(&d);
 
 	return (retval);
 }
@@ -237,20 +193,34 @@ int
 bsddialog_msgbox(struct bsddialog_conf *conf, const char *text, int rows,
     int cols)
 {
-	struct buttons bs;
-
-	get_buttons(conf, &bs, BUTTON_OK_LABEL, NULL);
-
-	return (do_message(conf, text, rows, cols, bs));
+	return (do_message(conf, text, rows, cols, OK_LABEL, NULL));
 }
 
 int
 bsddialog_yesno(struct bsddialog_conf *conf, const char *text, int rows,
     int cols)
 {
-	struct buttons bs;
+	return (do_message(conf, text, rows, cols, "Yes", "No"));
+}
 
-	get_buttons(conf, &bs, "Yes", "No");
+int
+bsddialog_infobox(struct bsddialog_conf *conf, const char *text, int rows,
+    int cols)
+{
+	int htext;
+	struct dialog d;
 
-	return (do_message(conf, text, rows, cols, bs));
-}
\ No newline at end of file
+	if (prepare_dialog(conf, text, rows, cols, &d) != 0)
+		return (BSDDIALOG_ERROR);
+	htext = -1;
+	if (message_size_position(&d, &htext) != 0)
+		return (BSDDIALOG_ERROR);
+	if (draw_dialog(&d) != 0)
+		return (BSDDIALOG_ERROR);
+	TEXTPAD(&d, 0);
+	doupdate();
+
+	end_dialog(&d);
+
+	return (BSDDIALOG_OK);
+}
diff --git a/contrib/bsddialog/lib/textbox.c b/contrib/bsddialog/lib/textbox.c
index 0c6d53a8cad0..edd58d0a820e 100644
--- a/contrib/bsddialog/lib/textbox.c
+++ b/contrib/bsddialog/lib/textbox.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,166 +25,177 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
-
 #include <curses.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
-static void
-updateborders(struct bsddialog_conf *conf, WINDOW *widget, int padmargin,
-    int hpad, int wpad, int ypad, int xpad)
+struct scrolltext {
+	WINDOW *pad;
+	int ypad;
+	int xpad;
+	int ys;
+	int ye;
+	int xs;
+	int xe;
+	int hpad;
+	int wpad;
+	int margin;    /* 2 with multicolumn char, 0 otherwise */
+	int printrows; /* d.h - BORDERS - HBUTTONS */
+};
+
+static void updateborders(struct dialog *d, struct scrolltext *st)
 {
-	int h, w;
 	chtype arrowch, borderch;
 
-	getmaxyx(widget, h, w);
-
-	if (conf->no_lines)
+	if (d->conf->no_lines)
 		borderch = ' ';
-	else if (conf->ascii_lines)
+	else if (d->conf->ascii_lines)
 		borderch = '|';
 	else
 		borderch = ACS_VLINE;
 
-	if (xpad > 0) {
-		arrowch = conf->ascii_lines ? '<' : ACS_LARROW;
-		arrowch |= A_ATTRIBUTES & t.dialog.arrowcolor;
+	if (st->xpad > 0) {
+		arrowch = d->conf->ascii_lines ? '<' : ACS_LARROW;
+		arrowch |= t.dialog.arrowcolor;
 	} else {
 		arrowch = borderch;
-		arrowch |= A_ATTRIBUTES & t.dialog.lineraisecolor;
+		arrowch |= t.dialog.lineraisecolor;
 	}
-	mvwvline(widget, (h / 2) - 2, 0, arrowch, 4);
+	mvwvline(d->widget, (d->h / 2) - 2, 0, arrowch, 4);
 
-	if (xpad + w-2-padmargin < wpad) {
-		arrowch = conf->ascii_lines ? '>' : ACS_RARROW;
-		arrowch |= A_ATTRIBUTES & t.dialog.arrowcolor;
+	if (st->xpad + d->w - 2 - st->margin < st->wpad) {
+		arrowch = d->conf->ascii_lines ? '>' : ACS_RARROW;
+		arrowch |= t.dialog.arrowcolor;
 	} else {
 		arrowch = borderch;
-		arrowch |= A_ATTRIBUTES & t.dialog.linelowercolor;
+		arrowch |= t.dialog.linelowercolor;
 	}
-	mvwvline(widget, (h / 2) - 2, w - 1, arrowch, 4);
+	mvwvline(d->widget, (d->h / 2) - 2, d->w - 1, arrowch, 4);
 
-	if (hpad > h - 4) {
-		wattron(widget, t.dialog.arrowcolor);
-		mvwprintw(widget, h-3, w-6, "%3d%%", 100 * (ypad+h-4)/ hpad);
-		wattroff(widget, t.dialog.arrowcolor);
+	if (st->hpad > d->h - 4) {
+		wattron(d->widget, t.dialog.arrowcolor);
+		mvwprintw(d->widget, d->h - 3, d->w - 6,
+		    "%3d%%", 100 * (st->ypad + d->h - 4) / st->hpad);
+		wattroff(d->widget, t.dialog.arrowcolor);
 	}
 }
 
-static void
-textbox_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
-    int *w, int hpad, int wpad, int padmargin, struct buttons bs)
+static int textbox_size_position(struct dialog *d, struct scrolltext *st)
 {
-	if (cols == BSDDIALOG_AUTOSIZE)
-		*w = widget_min_width(conf, 0, wpad + padmargin, &bs);
+	int minw;
 
-	if (rows == BSDDIALOG_AUTOSIZE)
-		*h = widget_min_height(conf, 0, hpad, true);
+	if (set_widget_size(d->conf, d->rows, d->cols, &d->h, &d->w) != 0)
+		return (BSDDIALOG_ERROR);
+	if (set_widget_autosize(d->conf, d->rows, d->cols, &d->h, &d->w,
+	    d->text, NULL, &d->bs, st->hpad, st->wpad + st->margin) != 0)
+		return (BSDDIALOG_ERROR);
+	minw = (st->wpad > 0) ? 2 /*multicolumn char*/ + st->margin : 0 ;
+	if (widget_checksize(d->h, d->w, &d->bs, MIN(st->hpad, 1), minw) != 0)
+		return (BSDDIALOG_ERROR);
+	if (set_widget_position(d->conf, &d->y, &d->x, d->h, d->w) != 0)
+		return (BSDDIALOG_ERROR);
+
+	return (0);
 }
 
-static int
-textbox_checksize(int rows, int cols, int hpad, struct buttons bs)
+static int textbox_draw(struct dialog *d, struct scrolltext *st)
 {
-	int mincols;
-
-	mincols = VBORDERS;
-	mincols += buttons_min_width(bs);
-
-	if (cols < mincols)
-		RETURN_ERROR("Few cols for the textbox");
+	if (d->built) {
+		hide_dialog(d);
+		refresh(); /* Important for decreasing screen */
+	}
+	if (textbox_size_position(d, st) != 0)
+		return (BSDDIALOG_ERROR);
+	if (draw_dialog(d) != 0)
+		return (BSDDIALOG_ERROR);
+	if (d->built)
+		refresh(); /* Important to fix grey lines expanding screen */
 
-	if (rows < 4 /* HBORDERS + button*/ + (hpad > 0 ? 1 : 0))
-		RETURN_ERROR("Few rows for the textbox");
+	st->ys = d->y + 1;
+	st->xs = (st->margin == 0) ? d->x + 1 : d->x + 2;
+	st->ye = st->ys + d->h - 5;
+	st->xe = st->xs + d->w - 3 - st->margin;
+	st->ypad = st->xpad = 0;
+	st->printrows = d->h-4;
 
 	return (0);
 }
 
 /* API */
 int
-bsddialog_textbox(struct bsddialog_conf *conf, const char* file, int rows,
+bsddialog_textbox(struct bsddialog_conf *conf, const char *file, int rows,
     int cols)
 {
-	bool loop, has_multi_col;
-	int i, retval, y, x, h, w;
-	int hpad, wpad, ypad, xpad, ys, ye, xs, xe, padmargin, printrows;
+	bool loop, has_multicol_ch;
+	int i, retval;
 	unsigned int defaulttablen, linecols;
 	wint_t input;
 	char buf[BUFSIZ];
 	FILE *fp;
-	struct buttons bs;
-	WINDOW *shadow, *widget, *pad;
+	struct scrolltext st;
+	struct dialog d;
 
+	if (file == NULL)
+		RETURN_ERROR("*file is NULL");
 	if ((fp = fopen(file, "r")) == NULL)
-		RETURN_ERROR("Cannot open file");
+		RETURN_FMTERROR("Cannot open file \"%s\"", file);
+
+	if (prepare_dialog(conf, "" /* fake */, rows, cols, &d) != 0)
+		return (BSDDIALOG_ERROR);
+	set_buttons(&d, true, "EXIT", NULL);
 
 	defaulttablen = TABSIZE;
-	set_tabsize((conf->text.tablen == 0) ? TABSIZE : (int)conf->text.tablen);
-	hpad = 1;
-	wpad = 1;
-	pad = newpad(hpad, wpad);
-	wbkgd(pad, t.dialog.color);
-	padmargin = 0;
+	if (conf->text.tablen > 0)
+		set_tabsize(conf->text.tablen);
+	st.hpad = 1;
+	st.wpad = 1;
+	st.pad = newpad(st.hpad, st.wpad);
+	wbkgd(st.pad, t.dialog.color);
+	st.margin = 0;
 	i = 0;
 	while (fgets(buf, BUFSIZ, fp) != NULL) {
-		if (str_props(buf, &linecols, &has_multi_col) != 0)
+		if (str_props(buf, &linecols, &has_multicol_ch) != 0)
 			continue;
-		if ((int)linecols > wpad) {
-			wpad = linecols;
-			wresize(pad, hpad, wpad);
+		if ((int)linecols > st.wpad) {
+			st.wpad = linecols;
+			wresize(st.pad, st.hpad, st.wpad);
 		}
-		if (i > hpad-1) {
-			hpad++;
-			wresize(pad, hpad, wpad);
+		if (i > st.hpad-1) {
+			st.hpad++;
+			wresize(st.pad, st.hpad, st.wpad);
 		}
-		mvwaddstr(pad, i, 0, buf);
+		mvwaddstr(st.pad, i, 0, buf);
 		i++;
-		if (has_multi_col)
-			padmargin = 2;
+		if (has_multicol_ch)
+			st.margin = 2;
 	}
 	fclose(fp);
-	set_tabsize(defaulttablen);
+	set_tabsize(defaulttablen); /* reset because it is curses global */
 
-	get_buttons(conf, &bs, "EXIT", NULL);
-	bs.curr = 0;
-	bs.nbuttons = 1;
-
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-		return (BSDDIALOG_ERROR);
-	textbox_autosize(conf, rows, cols, &h, &w, hpad, wpad, padmargin, bs);
-	if (textbox_checksize(h, w, hpad, bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
-		return (BSDDIALOG_ERROR);
-
-	if (new_dialog(conf, &shadow, &widget, y, x, h, w, NULL, NULL, &bs,
-	    true) != 0)
+	if (textbox_draw(&d, &st) != 0)
 		return (BSDDIALOG_ERROR);
 
-	ys = y + 1;
-	xs = (padmargin == 0) ? x + 1 : x + 2;
-	ye = ys + h - 5;
-	xe = xs + w - 3 - padmargin;
-	ypad = xpad = 0;
-	printrows = h-4;
 	loop = true;
 	while (loop) {
-		updateborders(conf, widget, padmargin, hpad, wpad, ypad, xpad);
+		updateborders(&d, &st);
 		/*
 		 * Overflow multicolumn charchter right border:
 		 * wnoutrefresh(widget);
 		 * pnoutrefresh(pad, ypad, xpad, ys, xs, ye, xe);
 		 * doupdate();
 		 */
-		wrefresh(widget);
-		prefresh(pad, ypad, xpad, ys, xs, ye, xe);
+		wrefresh(d.widget);
+		prefresh(st.pad, st.ypad, st.xpad, st.ys, st.xs, st.ye, st.xe);
 		if (get_wch(&input) == ERR)
 			continue;
+		if (shortcut_buttons(input, &d.bs)) {
+			DRAW_BUTTONS(d);
+			doupdate();
+			retval = BUTTONVALUE(d.bs);
+			break; /* loop */
+		}
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
@@ -197,84 +208,63 @@ bsddialog_textbox(struct bsddialog_conf *conf, const char* file, int rows,
 				loop = false;
 			}
 			break;
+		case '\t': /* TAB */
+			d.bs.curr = (d.bs.curr + 1) % d.bs.nbuttons;
+			DRAW_BUTTONS(d);
+			break;
 		case KEY_HOME:
-			ypad = 0;
+			st.ypad = 0;
 			break;
 		case KEY_END:
-			ypad = hpad - printrows;
-			ypad = ypad < 0 ? 0 : ypad;
+			st.ypad = MAX(st.hpad - st.printrows, 0);
 			break;
 		case KEY_PPAGE:
-			ypad -= printrows;
-			ypad = ypad < 0 ? 0 : ypad;
+			st.ypad = MAX(st.ypad - st.printrows, 0);
 			break;
 		case KEY_NPAGE:
-			ypad += printrows;
-			if (ypad + printrows > hpad)
-				ypad = hpad - printrows;
+			st.ypad += st.printrows;
+			if (st.ypad + st.printrows > st.hpad)
+				st.ypad = st.hpad - st.printrows;
 			break;
 		case '0':
-			xpad = 0;
+			st.xpad = 0;
+			break;
 		case KEY_LEFT:
 		case 'h':
-			xpad = xpad > 0 ? xpad - 1 : 0;
+			st.xpad = MAX(st.xpad - 1, 0);
 			break;
 		case KEY_RIGHT:
 		case 'l':
-			xpad = (xpad + w-2-padmargin) < wpad ? xpad + 1 : xpad;
+			if (st.xpad + d.w - 2 - st.margin < st.wpad)
+				st.xpad++;
 			break;
 		case KEY_UP:
 		case 'k':
-			ypad = ypad > 0 ? ypad - 1 : 0;
+			st.ypad = MAX(st.ypad - 1, 0);
 			break;
 		case KEY_DOWN:
 		case'j':
-			ypad = ypad + printrows <= hpad -1 ? ypad + 1 : ypad;
+			if (st.ypad + st.printrows <= st.hpad -1)
+				st.ypad++;
 			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
-			if (f1help(conf) != 0)
-				return (BSDDIALOG_ERROR);
-			/* No break, screen size can change */
-		case KEY_RESIZE:
-			/* Important for decreasing screen */
-			hide_widget(y, x, h, w, conf->shadow);
-			refresh();
-
-			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
+			if (f1help_dialog(conf) != 0)
 				return (BSDDIALOG_ERROR);
-			textbox_autosize(conf, rows, cols, &h, &w, hpad, wpad,
-			    padmargin, bs);
-			if (textbox_checksize(h, w, hpad, bs) != 0)
+			if (textbox_draw(&d, &st) != 0)
 				return (BSDDIALOG_ERROR);
-			if (set_widget_position(conf, &y, &x, h, w) != 0)
-				return (BSDDIALOG_ERROR);
-
-			ys = y + 1;
-			xs = (padmargin == 0) ? x + 1 : x + 2;
-			ye = ys + h - 5;
-			xe = xs + w - 3 - padmargin;
-			ypad = xpad = 0;
-			printrows = h - 4;
-
-			if (update_dialog(conf, shadow, widget, y, x, h, w,
-			    NULL, NULL, &bs, true) != 0)
+			break;
+		case KEY_RESIZE:
+			if (textbox_draw(&d, &st) != 0)
 				return (BSDDIALOG_ERROR);
-
-			/* Important to fix grey lines expanding screen */
-			refresh();
 			break;
-		default:
-			if (shortcut_buttons(input, &bs)) {
-				retval = bs.value[bs.curr];
-				loop = false;
-			}
 		}
 	}
 
-	end_dialog(conf, shadow, widget, pad);
+	delwin(st.pad);
+	end_dialog(&d);
 
 	return (retval);
 }
diff --git a/contrib/bsddialog/lib/theme.c b/contrib/bsddialog/lib/theme.c
index 6e53eb356825..04f85b2455fa 100644
--- a/contrib/bsddialog/lib/theme.c
+++ b/contrib/bsddialog/lib/theme.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,132 +32,104 @@
 #include "lib_util.h"
 
 #define GET_COLOR(bg, fg) (COLOR_PAIR(bg * 8 + fg +1))
+#define WHITE GET_COLOR(COLOR_WHITE, COLOR_BLACK)
+#define BLACK GET_COLOR(COLOR_WHITE, COLOR_BLACK) | A_REVERSE
+#define NFLAGS 6
 
 struct bsddialog_theme t;
 bool hastermcolors;
 
-static struct bsddialog_theme bsddialogtheme = {
-	.screen.color = GET_COLOR(COLOR_BLACK, COLOR_CYAN),
-
-	.shadow.color   = GET_COLOR(COLOR_BLACK, COLOR_BLACK),
-	.shadow.y       = 1,
-	.shadow.x       = 2,
-
-	.dialog.delimtitle       = true,
-	.dialog.titlecolor       = GET_COLOR(COLOR_YELLOW, COLOR_WHITE),
-	.dialog.lineraisecolor   = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
-	.dialog.linelowercolor   = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
-	.dialog.color            = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
-	.dialog.bottomtitlecolor = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
-	.dialog.arrowcolor       = GET_COLOR(COLOR_YELLOW, COLOR_WHITE),
-
-	.menu.f_selectorcolor = GET_COLOR(COLOR_BLACK,  COLOR_YELLOW),
-	.menu.selectorcolor   = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
-	.menu.f_desccolor     = GET_COLOR(COLOR_WHITE,  COLOR_YELLOW),
-	.menu.desccolor       = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
-	.menu.f_namecolor     = GET_COLOR(COLOR_BLACK,  COLOR_YELLOW),
-	.menu.namecolor       = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
-	.menu.namesepcolor    = GET_COLOR(COLOR_YELLOW, COLOR_WHITE),
-	.menu.descsepcolor    = GET_COLOR(COLOR_YELLOW, COLOR_WHITE),
-	.menu.f_shortcutcolor = GET_COLOR(COLOR_RED,    COLOR_YELLOW),
-	.menu.shortcutcolor   = GET_COLOR(COLOR_RED,    COLOR_WHITE),
-	.menu.bottomdesccolor = GET_COLOR(COLOR_WHITE,  COLOR_CYAN),
-
-	.form.f_fieldcolor    = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
-	.form.fieldcolor      = GET_COLOR(COLOR_WHITE, COLOR_CYAN),
-	.form.readonlycolor   = GET_COLOR(COLOR_CYAN,  COLOR_WHITE),
-	.form.bottomdesccolor = GET_COLOR(COLOR_WHITE, COLOR_CYAN),
-
-	.bar.f_color = GET_COLOR(COLOR_BLACK, COLOR_YELLOW),
-	.bar.color   = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
+struct flag_converter {
+	unsigned int public;
+	unsigned int private;
+};
 
-	.button.minmargin       = 1,
-	.button.maxmargin       = 5,
-	.button.leftdelim       = '[',
-	.button.rightdelim      = ']',
-	.button.f_delimcolor    = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
-	.button.delimcolor      = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
-	.button.f_color         = GET_COLOR(COLOR_BLACK, COLOR_YELLOW),
-	.button.color           = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
-	.button.f_shortcutcolor = GET_COLOR(COLOR_RED,   COLOR_YELLOW),
-	.button.shortcutcolor   = GET_COLOR(COLOR_RED,   COLOR_WHITE)
+static struct flag_converter flagconv[NFLAGS] = {
+	{BSDDIALOG_BLINK,      A_BLINK},
+	{BSDDIALOG_BOLD,       A_BOLD},
+	{BSDDIALOG_HALFBRIGHT, A_DIM},
+	{BSDDIALOG_HIGHLIGHT,  A_STANDOUT},
+	{BSDDIALOG_REVERSE,    A_REVERSE},
+	{BSDDIALOG_UNDERLINE,  A_UNDERLINE}
 };
 
 static struct bsddialog_theme blackwhite = {
-#define fg  COLOR_WHITE
-#define bk  COLOR_BLACK
-	.screen.color = GET_COLOR(fg, bk),
+	.screen.color = WHITE,
 
-	.shadow.color   = GET_COLOR(COLOR_BLACK, COLOR_BLACK),
-	.shadow.y       = 1,
-	.shadow.x       = 2,
+	.shadow.color = GET_COLOR(COLOR_BLACK, COLOR_BLACK),
+	.shadow.y     = 1,
+	.shadow.x     = 2,
 
 	.dialog.delimtitle       = true,
-	.dialog.titlecolor       = GET_COLOR(fg, bk),
-	.dialog.lineraisecolor   = GET_COLOR(fg, bk),
-	.dialog.linelowercolor   = GET_COLOR(fg, bk),
-	.dialog.color            = GET_COLOR(fg, bk),
-	.dialog.bottomtitlecolor = GET_COLOR(fg, bk),
-	.dialog.arrowcolor       = GET_COLOR(fg, bk),
-
-	.menu.f_selectorcolor = GET_COLOR(fg, bk) | A_REVERSE,
-	.menu.selectorcolor   = GET_COLOR(fg, bk),
-	.menu.f_desccolor     = GET_COLOR(fg, bk) | A_REVERSE,
-	.menu.desccolor       = GET_COLOR(fg, bk),
-	.menu.f_namecolor     = GET_COLOR(fg, bk) | A_REVERSE,
-	.menu.namecolor       = GET_COLOR(fg, bk),
-	.menu.namesepcolor    = GET_COLOR(fg, bk),
-	.menu.descsepcolor    = GET_COLOR(fg, bk),
-	.menu.f_shortcutcolor = GET_COLOR(fg, bk) | A_UNDERLINE | A_REVERSE,
-	.menu.shortcutcolor   = GET_COLOR(fg, bk) | A_UNDERLINE,
-	.menu.bottomdesccolor = GET_COLOR(fg, bk),
-
-	.form.f_fieldcolor    = GET_COLOR(fg, bk) | A_REVERSE,
-	.form.fieldcolor      = GET_COLOR(fg, bk),
-	.form.readonlycolor   = GET_COLOR(fg, bk),
-	.form.bottomdesccolor = GET_COLOR(fg, bk),
-
-	.bar.f_color = GET_COLOR(fg, bk) | A_REVERSE,
-	.bar.color   = GET_COLOR(fg, bk),
+	.dialog.titlecolor       = WHITE,
+	.dialog.lineraisecolor   = WHITE,
+	.dialog.linelowercolor   = WHITE,
+	.dialog.color            = WHITE,
+	.dialog.bottomtitlecolor = WHITE,
+	.dialog.arrowcolor       = WHITE,
+
+	.menu.f_prefixcolor   = WHITE,
+	.menu.prefixcolor     = WHITE,
+	.menu.f_selectorcolor = BLACK,
+	.menu.selectorcolor   = WHITE,
+	.menu.f_desccolor     = BLACK,
+	.menu.desccolor       = WHITE,
+	.menu.f_namecolor     = BLACK,
+	.menu.namecolor       = WHITE,
+	.menu.f_shortcutcolor = BLACK | A_UNDERLINE,
+	.menu.shortcutcolor   = WHITE | A_UNDERLINE,
+	.menu.bottomdesccolor = WHITE,
+	.menu.sepnamecolor    = WHITE,
+	.menu.sepdesccolor    = WHITE,
+
+	.form.f_fieldcolor    = BLACK,
+	.form.fieldcolor      = WHITE,
+	.form.readonlycolor   = WHITE,
+	.form.bottomdesccolor = WHITE,
+
+	.bar.f_color = BLACK,
+	.bar.color   = WHITE,
 
 	.button.minmargin       = 1,
 	.button.maxmargin       = 5,
 	.button.leftdelim       = '[',
 	.button.rightdelim      = ']',
-	.button.f_delimcolor    = GET_COLOR(fg, bk),
-	.button.delimcolor      = GET_COLOR(fg, bk),
-	.button.f_color         = GET_COLOR(fg, bk) | A_UNDERLINE | A_REVERSE,
-	.button.color           = GET_COLOR(fg, bk) | A_UNDERLINE,
-	.button.f_shortcutcolor = GET_COLOR(fg, bk) | A_UNDERLINE | A_REVERSE,
-	.button.shortcutcolor   = GET_COLOR(fg, bk) | A_UNDERLINE
+	.button.f_delimcolor    = WHITE,
+	.button.delimcolor      = WHITE,
+	.button.f_color         = BLACK,
+	.button.color           = WHITE,
+	.button.f_shortcutcolor = BLACK | A_UNDERLINE | A_BOLD,
+	.button.shortcutcolor   = WHITE | A_UNDERLINE | A_BOLD
 };
 
-static struct bsddialog_theme dialogtheme = {
+static struct bsddialog_theme flat = {
 	.screen.color = GET_COLOR(COLOR_CYAN, COLOR_BLUE) | A_BOLD,
 
-	.shadow.color   = GET_COLOR(COLOR_BLACK, COLOR_BLACK),
-	.shadow.y       = 1,
-	.shadow.x       = 2,
+	.shadow.color = GET_COLOR(COLOR_BLACK, COLOR_BLACK),
+	.shadow.y     = 1,
+	.shadow.x     = 2,
 
-	.dialog.delimtitle       = false,
+	.dialog.delimtitle       = true,
 	.dialog.titlecolor       = GET_COLOR(COLOR_BLUE,  COLOR_WHITE) | A_BOLD,
-	.dialog.lineraisecolor   = GET_COLOR(COLOR_WHITE, COLOR_WHITE) | A_BOLD,
-	.dialog.linelowercolor   = GET_COLOR(COLOR_BLACK, COLOR_WHITE) | A_BOLD,
+	.dialog.lineraisecolor   = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
+	.dialog.linelowercolor   = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.dialog.color            = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.dialog.bottomtitlecolor = GET_COLOR(COLOR_BLACK, COLOR_WHITE) | A_BOLD,
 	.dialog.arrowcolor       = GET_COLOR(COLOR_BLUE,  COLOR_WHITE),
 
+	.menu.f_prefixcolor   = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
+	.menu.prefixcolor     = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.menu.f_selectorcolor = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
 	.menu.selectorcolor   = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.menu.f_desccolor     = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
 	.menu.desccolor       = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.menu.f_namecolor     = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
 	.menu.namecolor       = GET_COLOR(COLOR_BLUE,  COLOR_WHITE),
-	.menu.namesepcolor    = GET_COLOR(COLOR_RED,   COLOR_WHITE),
-	.menu.descsepcolor    = GET_COLOR(COLOR_RED,   COLOR_WHITE),
 	.menu.f_shortcutcolor = GET_COLOR(COLOR_RED,   COLOR_BLUE),
 	.menu.shortcutcolor   = GET_COLOR(COLOR_RED,   COLOR_WHITE),
 	.menu.bottomdesccolor = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
+	.menu.sepnamecolor    = GET_COLOR(COLOR_RED,   COLOR_WHITE),
+	.menu.sepdesccolor    = GET_COLOR(COLOR_RED,   COLOR_WHITE),
 
 	.form.f_fieldcolor    = GET_COLOR(COLOR_WHITE, COLOR_BLUE) | A_BOLD,
 	.form.fieldcolor      = GET_COLOR(COLOR_WHITE, COLOR_CYAN) | A_BOLD,
@@ -169,8 +141,8 @@ static struct bsddialog_theme dialogtheme = {
 
 	.button.minmargin       = 1,
 	.button.maxmargin       = 5,
-	.button.leftdelim       = '<',
-	.button.rightdelim      = '>',
+	.button.leftdelim       = '[',
+	.button.rightdelim      = ']',
 	.button.f_delimcolor    = GET_COLOR(COLOR_WHITE,  COLOR_BLUE)  | A_BOLD,
 	.button.delimcolor      = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.button.f_color         = GET_COLOR(COLOR_YELLOW, COLOR_BLUE)  | A_BOLD,
@@ -196,17 +168,19 @@ set_theme(struct bsddialog_theme *dst, struct bsddialog_theme *src)
 	dst->dialog.bottomtitlecolor = src->dialog.bottomtitlecolor;
 	dst->dialog.arrowcolor       = src->dialog.arrowcolor;
 
+	dst->menu.f_prefixcolor   = src->menu.f_prefixcolor;
+	dst->menu.prefixcolor     = src->menu.prefixcolor;
 	dst->menu.f_selectorcolor = src->menu.f_selectorcolor;
 	dst->menu.selectorcolor   = src->menu.selectorcolor;
 	dst->menu.f_desccolor     = src->menu.f_desccolor;
 	dst->menu.desccolor       = src->menu.desccolor;
 	dst->menu.f_namecolor     = src->menu.f_namecolor;
 	dst->menu.namecolor       = src->menu.namecolor;
-	dst->menu.namesepcolor    = src->menu.namesepcolor;
-	dst->menu.descsepcolor    = src->menu.descsepcolor;
 	dst->menu.f_shortcutcolor = src->menu.f_shortcutcolor;
 	dst->menu.shortcutcolor   = src->menu.shortcutcolor;
 	dst->menu.bottomdesccolor = src->menu.bottomdesccolor;
+	dst->menu.sepnamecolor    = src->menu.sepnamecolor;
+	dst->menu.sepdesccolor    = src->menu.sepdesccolor;
 
 	dst->form.f_fieldcolor    = src->form.f_fieldcolor;
 	dst->form.fieldcolor      = src->form.fieldcolor;
@@ -228,17 +202,12 @@ set_theme(struct bsddialog_theme *dst, struct bsddialog_theme *src)
 	dst->button.shortcutcolor   = src->button.shortcutcolor;
 
 	bkgd(dst->screen.color);
-	refresh();
 }
 
 /* API */
 int bsddialog_get_theme(struct bsddialog_theme *theme)
 {
-	if (theme == NULL)
-		RETURN_ERROR("theme is NULL");
-	if (sizeof(*theme) != sizeof(struct bsddialog_theme))
-		RETURN_ERROR("Bad suze struct bsddialog_theme");
-
+	CHECK_PTR(theme);
 	set_theme(theme, &t);
 
 	return (BSDDIALOG_OK);
@@ -246,34 +215,31 @@ int bsddialog_get_theme(struct bsddialog_theme *theme)
 
 int bsddialog_set_theme(struct bsddialog_theme *theme)
 {
-	if (theme == NULL)
-		RETURN_ERROR("theme is NULL");
-	if (sizeof(*theme) != sizeof(struct bsddialog_theme))
-		RETURN_ERROR("Bad size struct bsddialog_theme");
-
+	CHECK_PTR(theme);
 	set_theme(&t, theme);
+	refresh();
 
 	return (BSDDIALOG_OK);
 }
 
 int bsddialog_set_default_theme(enum bsddialog_default_theme newtheme)
 {
-	if (newtheme == BSDDIALOG_THEME_FLAT) {
-		bsddialog_set_theme(&dialogtheme);
-		t.dialog.lineraisecolor = t.dialog.linelowercolor;
-		t.dialog.delimtitle     = true;
-		t.button.leftdelim      = '[';
-		t.button.rightdelim     = ']';
-		t.dialog.bottomtitlecolor = GET_COLOR(COLOR_BLACK, COLOR_WHITE);
+	if (newtheme == BSDDIALOG_THEME_3D) {
+		set_theme(&t, &flat);
+		t.dialog.lineraisecolor   =
+		    GET_COLOR(COLOR_WHITE, COLOR_WHITE) | A_BOLD;
+		t.dialog.delimtitle       = false;
+		t.dialog.bottomtitlecolor = t.dialog.bottomtitlecolor | A_BOLD;
+	} else if (newtheme == BSDDIALOG_THEME_BLACKWHITE) {
+		set_theme(&t, &blackwhite);
+	} else if (newtheme == BSDDIALOG_THEME_FLAT) {
+		set_theme(&t, &flat);
+	} else {
+		RETURN_FMTERROR("Unknown default theme (%d), "
+		    "to use enum bsddialog_default_theme",
+		    newtheme);
 	}
-	else if (newtheme == BSDDIALOG_THEME_BSDDIALOG)
-		bsddialog_set_theme(&bsddialogtheme);
-	else if (newtheme == BSDDIALOG_THEME_BLACKWHITE)
-		bsddialog_set_theme(&blackwhite);
-	else if (newtheme == BSDDIALOG_THEME_DIALOG)
-		bsddialog_set_theme(&dialogtheme);
-	else
-		RETURN_ERROR("Unknow default theme");
+	refresh();
 
 	return (BSDDIALOG_OK);
 }
@@ -282,43 +248,41 @@ int
 bsddialog_color(enum bsddialog_color foreground,
     enum bsddialog_color background, unsigned int flags)
 {
-	unsigned int cursesflags = 0;
+	unsigned int i, f;
 
-	if (flags & BSDDIALOG_BOLD)
-		cursesflags |= A_BOLD;
-	if (flags & BSDDIALOG_REVERSE)
-		cursesflags |= A_REVERSE;
-	if (flags & BSDDIALOG_UNDERLINE)
-		cursesflags |= A_UNDERLINE;
+	f = 0;
+	for (i=0; i < NFLAGS; i++)
+		if (flags & flagconv[i].public)
+			f |= flagconv[i].private;
 
-	return (GET_COLOR(foreground, background) | cursesflags);
+	return (GET_COLOR(foreground, background) | f);
 }
 
 int
 bsddialog_color_attrs(int color, enum bsddialog_color *foreground,
     enum bsddialog_color *background, unsigned int *flags)
 {
-	unsigned int flag;
-	short f, b;
-
-	flag = 0U;
-	flag |= (color & A_BOLD) ? BSDDIALOG_BOLD : 0U;
-	flag |= (color & A_REVERSE) ? BSDDIALOG_REVERSE : 0U;
-	flag |= (color & A_UNDERLINE) ? BSDDIALOG_UNDERLINE : 0U;
-	if (flags != NULL)
-		*flags = flag;
-
-	if (pair_content(PAIR_NUMBER(color), &f, &b) != OK)
+	short fg, bg;
+	unsigned int i, f;
+
+	if (flags != NULL) {
+		f = 0;
+		for (i=0; i < NFLAGS; i++)
+			if (color & flagconv[i].private)
+				f |= flagconv[i].public;
+		*flags = f;
+	}
+	if (pair_content(PAIR_NUMBER(color), &fg, &bg) != OK)
 		RETURN_ERROR("Cannot get color attributes");
 	if (foreground != NULL)
-		*foreground = f;
+		*foreground = fg;
 	if (background != NULL)
-		*background = b;
+		*background = bg;
 
 	return (BSDDIALOG_OK);
 }
 
 bool bsddialog_hascolors(void)
 {
-	return hastermcolors;
-}
\ No newline at end of file
+	return (hastermcolors);
+}
diff --git a/contrib/bsddialog/lib/timebox.c b/contrib/bsddialog/lib/timebox.c
index 53989bb97157..d683f9552b50 100644
--- a/contrib/bsddialog/lib/timebox.c
+++ b/contrib/bsddialog/lib/timebox.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,158 +25,114 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
-
-#include <ctype.h>
 #include <curses.h>
-#include <string.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
-#define MINWDATE   23 /* 3 windows and their borders */
 #define MINWTIME   14 /* 3 windows and their borders */
+#define HBOX        3
+#define WBOX        4
+
+struct clock {
+	unsigned int max;
+	unsigned int value;
+	WINDOW *win;
+};
 
 static void
-drawsquare(struct bsddialog_conf *conf, WINDOW *win, const char *fmt,
-    const void *value, bool focus)
+drawsquare(struct bsddialog_conf *conf, WINDOW *win, unsigned int value,
+    bool focus)
 {
-	int h, l, w;
-
-	getmaxyx(win, h, w);
-	draw_borders(conf, win, h, w, LOWERED);
+	draw_borders(conf, win, LOWERED);
 	if (focus) {
-		l = 2 + w%2;
 		wattron(win, t.dialog.arrowcolor);
-		mvwhline(win, 0, w/2 - l/2,
-		    conf->ascii_lines ? '^' : ACS_UARROW, l);
-		mvwhline(win, h-1, w/2 - l/2,
-		    conf->ascii_lines ? 'v' : ACS_DARROW, l);
+		mvwhline(win, 0, 1, conf->ascii_lines ? '^' : ACS_UARROW, 2);
+		mvwhline(win, 2, 1, conf->ascii_lines ? 'v' : ACS_DARROW, 2);
 		wattroff(win, t.dialog.arrowcolor);
 	}
 
 	if (focus)
 		wattron(win, t.menu.f_namecolor);
-	if (strchr(fmt, 's') != NULL)
-		mvwprintw(win, 1, 1, fmt, (const char*)value);
-	else
-		mvwprintw(win, 1, 1, fmt, *((const int*)value));
+	mvwprintw(win, 1, 1, "%02u", value);
 	if (focus)
 		wattroff(win, t.menu.f_namecolor);
 
-	wrefresh(win);
+	wnoutrefresh(win);
 }
 
-static int
-datetime_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
-    int *w, int minw, const char *text, struct buttons bs)
+static int timebox_redraw(struct dialog *d, struct clock *c)
 {
-	int htext, wtext;
+	int y, x;
 
-	if (cols == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_AUTOSIZE) {
-		if (text_size(conf, rows, cols, text, &bs, 3, minw, &htext,
-		    &wtext) != 0)
-			return (BSDDIALOG_ERROR);
+	if (d->built) {
+		hide_dialog(d);
+		refresh(); /* Important for decreasing screen */
 	}
-
-	if (cols == BSDDIALOG_AUTOSIZE)
-		*w = widget_min_width(conf, wtext, minw, &bs);
-
-	if (rows == BSDDIALOG_AUTOSIZE)
-		*h = widget_min_height(conf, htext, 3 /* windows */, true);
-
-	return (0);
-}
-
-static int
-datetime_checksize(int rows, int cols, int minw, struct buttons bs)
-{
-	int mincols;
-
-	mincols = VBORDERS;
-	mincols += buttons_min_width(bs);
-	mincols = MAX(minw, mincols);
-
-	if (cols < mincols)
-		RETURN_ERROR("Few cols for this timebox/datebox");
-
-	if (rows < 7) /* 2 button + 2 borders + 3 windows */
-		RETURN_ERROR("Few rows for this timebox/datebox, at least 7");
+	if (dialog_size_position(d, HBOX, MINWTIME, NULL) != 0)
+		return (BSDDIALOG_ERROR);
+	if (draw_dialog(d) != 0)
+		return (BSDDIALOG_ERROR);
+	if (d->built)
+		refresh(); /* Important to fix grey lines expanding screen */
+	TEXTPAD(d, HBOX + HBUTTONS);
+
+	y = d->y + d->h - BORDER - HBUTTONS - HBOX;
+	x = d->x + d->w/2 - 7;
+	update_box(d->conf, c[0].win, y, x, HBOX, WBOX, LOWERED);
+	mvwaddch(d->widget, d->h - 5, d->w/2 - 3, ':');
+	update_box(d->conf, c[1].win, y, x += 5, HBOX, WBOX, LOWERED);
+	mvwaddch(d->widget, d->h - 5, d->w/2 + 2, ':');
+	update_box(d->conf, c[2].win, y, x + 5, HBOX, WBOX, LOWERED);
+	wnoutrefresh(d->widget); /* for mvwaddch(':') */
 
 	return (0);
 }
 
+/* API */
 int
 bsddialog_timebox(struct bsddialog_conf *conf, const char* text, int rows,
     int cols, unsigned int *hh, unsigned int *mm, unsigned int *ss)
 {
 	bool loop, focusbuttons;
-	int i, retval, y, x, h, w, sel;
+	int i, retval, sel;
 	wint_t input;
-	WINDOW *widget, *textpad, *shadow;
-	struct buttons bs;
-	struct myclockstruct {
-		unsigned int max;
-		unsigned int value;
-		WINDOW *win;
-	};
-
-	if (hh == NULL || mm == NULL || ss == NULL)
-		RETURN_ERROR("hh / mm / ss cannot be NULL");
-
-	struct myclockstruct c[3] = {
+	struct dialog d;
+	struct clock c[3] = {
 		{23, *hh, NULL},
 		{59, *mm, NULL},
 		{59, *ss, NULL}
 	};
 
-	for (i = 0 ; i < 3; i++) {
-		if (c[i].value > c[i].max)
-			c[i].value = c[i].max;
-	}
-
-	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
-
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-		return (BSDDIALOG_ERROR);
-	if (datetime_autosize(conf, rows, cols, &h, &w, MINWTIME, text,
-	    bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (datetime_checksize(h, w, MINWTIME, bs) != 0)
+	CHECK_PTR(hh);
+	CHECK_PTR(mm);
+	CHECK_PTR(ss);
+	if (prepare_dialog(conf, text, rows, cols, &d) != 0)
 		return (BSDDIALOG_ERROR);
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
-		return (BSDDIALOG_ERROR);
-
-	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
-	    true) != 0)
+	set_buttons(&d, true, OK_LABEL, CANCEL_LABEL);
+	for (i=0; i<3; i++) {
+		if ((c[i].win = newwin(1, 1, 1, 1)) == NULL)
+			RETURN_FMTERROR("Cannot build WINDOW for time[%d]", i);
+		wbkgd(c[i].win, t.dialog.color);
+		c[i].value = MIN(c[i].value, c[i].max);
+	}
+	if (timebox_redraw(&d, c) != 0)
 		return (BSDDIALOG_ERROR);
 
-	pnoutrefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
-	doupdate();
-
-	c[0].win = new_boxed_window(conf, y+h-6, x + w/2 - 7, 3, 4, LOWERED);
-	mvwaddch(widget, h - 5, w/2 - 3, ':');
-	c[1].win = new_boxed_window(conf, y+h-6, x + w/2 - 2, 3, 4, LOWERED);
-	mvwaddch(widget, h - 5, w/2 + 2, ':');
-	c[2].win = new_boxed_window(conf, y+h-6, x + w/2 + 3, 3, 4, LOWERED);
-
-	wrefresh(widget);
-
 	sel = -1;
 	loop = focusbuttons = true;
 	while (loop) {
 		for (i = 0; i < 3; i++)
-			drawsquare(conf, c[i].win, "%02d", &c[i].value,
-			    sel == i);
-
+			drawsquare(conf, c[i].win, c[i].value, sel == i);
+		doupdate();
 		if (get_wch(&input) == ERR)
 			continue;
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			if (focusbuttons || conf->button.always_active) {
-				retval = bs.value[bs.curr];
+				retval = BUTTONVALUE(d.bs);
 				loop = false;
 			}
 			break;
@@ -189,49 +145,49 @@ bsddialog_timebox(struct bsddialog_conf *conf, const char* text, int rows,
 		case KEY_RIGHT:
 		case '\t': /* TAB */
 			if (focusbuttons) {
-				bs.curr++;
-				focusbuttons = bs.curr < (int)bs.nbuttons ?
+				d.bs.curr++;
+				focusbuttons = d.bs.curr < (int)d.bs.nbuttons ?
 				    true : false;
 				if (focusbuttons == false) {
 					sel = 0;
-					bs.curr = conf->button.always_active ? 0 : -1;
+					d.bs.curr =
+					    conf->button.always_active ? 0 : -1;
 				}
 			} else {
 				sel++;
 				focusbuttons = sel > 2 ? true : false;
 				if (focusbuttons) {
-					bs.curr = 0;
+					d.bs.curr = 0;
 				}
 			}
-			draw_buttons(widget, bs, true);
-			wrefresh(widget);
+			DRAW_BUTTONS(d);
 			break;
 		case KEY_LEFT:
 			if (focusbuttons) {
-				bs.curr--;
-				focusbuttons = bs.curr < 0 ? false : true;
+				d.bs.curr--;
+				focusbuttons = d.bs.curr < 0 ? false : true;
 				if (focusbuttons == false) {
 					sel = 2;
-					bs.curr = conf->button.always_active ? 0 : -1;
+					d.bs.curr =
+					    conf->button.always_active ? 0 : -1;
 				}
 			} else {
 				sel--;
 				focusbuttons = sel < 0 ? true : false;
 				if (focusbuttons)
-					bs.curr = (int)bs.nbuttons - 1;
+					d.bs.curr = (int)d.bs.nbuttons - 1;
 			}
-			draw_buttons(widget, bs, true);
-			wrefresh(widget);
+			DRAW_BUTTONS(d);
 			break;
 		case KEY_UP:
 			if (focusbuttons) {
 				sel = 0;
 				focusbuttons = false;
-				bs.curr = conf->button.always_active ? 0 : -1;
-				draw_buttons(widget, bs, true);
-				wrefresh(widget);
-			} else { c[sel].value = c[sel].value > 0 ?
-			    c[sel].value - 1 : c[sel].max;
+				d.bs.curr = conf->button.always_active ? 0 : -1;
+				DRAW_BUTTONS(d);
+			} else {
+				c[sel].value = c[sel].value > 0 ?
+				    c[sel].value - 1 : c[sel].max;
 			}
 			break;
 		case KEY_DOWN:
@@ -244,297 +200,32 @@ bsddialog_timebox(struct bsddialog_conf *conf, const char* text, int rows,
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
-			if (f1help(conf) != 0)
-				return (BSDDIALOG_ERROR);
-			/* No break, screen size can change */
-		case KEY_RESIZE:
-			/* Important for decreasing screen */
-			hide_widget(y, x, h, w, conf->shadow);
-			refresh();
-
-			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-				return (BSDDIALOG_ERROR);
-			if (datetime_autosize(conf, rows, cols, &h, &w,
-			    MINWTIME, text, bs) != 0)
+			if (f1help_dialog(conf) != 0)
 				return (BSDDIALOG_ERROR);
-			if (datetime_checksize(h, w, MINWTIME, bs) != 0)
+			if (timebox_redraw(&d, c) != 0)
 				return (BSDDIALOG_ERROR);
-			if (set_widget_position(conf, &y, &x, h, w) != 0)
-				return (BSDDIALOG_ERROR);
-
-			if (update_dialog(conf, shadow, widget, y, x, h, w,
-			    textpad, text, &bs, true) != 0)
-				return (BSDDIALOG_ERROR);
-
-			doupdate();
-
-			mvwaddch(widget, h - 5, w/2 - 3, ':');
-			mvwaddch(widget, h - 5, w/2 + 2, ':');
-			wrefresh(widget);
-
-			prefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
-
-			wclear(c[0].win);
-			mvwin(c[0].win, y + h - 6, x + w/2 - 7);
-			wclear(c[1].win);
-			mvwin(c[1].win, y + h - 6, x + w/2 - 2);
-			wclear(c[2].win);
-			mvwin(c[2].win, y + h - 6, x + w/2 + 3);
-
-			/* Important to avoid grey lines expanding screen */
-			refresh();
 			break;
-		default:
-			if (shortcut_buttons(input, &bs)) {
-				retval = bs.value[bs.curr];
-				loop = false;
-			}
-		}
-	}
-
-	if (retval == BSDDIALOG_OK) {
-		*hh = c[0].value;
-		*mm = c[1].value;
-		*ss = c[2].value;
-	}
-
-	for (i = 0; i < 3; i++)
-		delwin(c[i].win);
-	end_dialog(conf, shadow, widget, textpad);
-
-	return (retval);
-}
-
-int
-bsddialog_datebox(struct bsddialog_conf *conf, const char *text, int rows,
-    int cols, unsigned int *yy, unsigned int *mm, unsigned int *dd)
-{
-	bool loop, focusbuttons;
-	int i, retval, y, x, h, w, sel;
-	wint_t input;
-	WINDOW *widget, *textpad, *shadow;
-	struct buttons bs;
-	struct calendar {
-		int max;
-		int value;
-		WINDOW *win;
-		unsigned int x;
-	};
-	struct month {
-		const char *name;
-		unsigned int days;
-	};
-
-	if (yy == NULL || mm == NULL || dd == NULL)
-		RETURN_ERROR("yy / mm / dd cannot be NULL");
-
-	struct calendar c[3] = {
-		{9999, *yy, NULL, 4 },
-		{12,   *mm, NULL, 9 },
-		{31,   *dd, NULL, 2 }
-	};
-
-	struct month m[12] = {
-		{ "January", 31 }, { "February", 28 }, { "March",     31 },
-		{ "April",   30 }, { "May",      31 }, { "June",      30 },
-		{ "July",    31 }, { "August",   31 }, { "September", 30 },
-		{ "October", 31 }, { "November", 30 }, { "December",  31 }
-	};
-
-	for (i = 0 ; i < 3; i++) {
-		if (c[i].value > c[i].max)
-			c[i].value = c[i].max;
-		if (c[i].value < 1)
-			c[i].value = 1;
-	}
-	c[2].max = m[c[1].value -1].days;
-	if (c[1].value == 2 && ISLEAP(c[0].value))
-		c[2].max = 29;
-	if (c[2].value > c[2].max)
-		c[2].value = c[2].max;
-
-	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
-
-	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-		return (BSDDIALOG_ERROR);
-	if (datetime_autosize(conf, rows, cols, &h, &w, MINWDATE, text,
-	    bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (datetime_checksize(h, w, MINWDATE, bs) != 0)
-		return (BSDDIALOG_ERROR);
-	if (set_widget_position(conf, &y, &x, h, w) != 0)
-		return (BSDDIALOG_ERROR);
-
-	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
-	    true) != 0)
-		return (BSDDIALOG_ERROR);
-
-	pnoutrefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
-	doupdate();
-
-	c[0].win = new_boxed_window(conf, y+h-6, x + w/2 - 11, 3, 6, LOWERED);
-	mvwaddch(widget, h - 5, w/2 - 5, '/');
-	c[1].win = new_boxed_window(conf, y+h-6, x + w/2 - 4, 3, 11, LOWERED);
-	mvwaddch(widget, h - 5, w/2 + 7, '/');
-	c[2].win = new_boxed_window(conf, y+h-6, x + w/2 + 8, 3, 4, LOWERED);
-
-	wrefresh(widget);
-
-	sel = -1;
-	loop = focusbuttons = true;
-	while (loop) {
-		drawsquare(conf, c[0].win, "%4d", &c[0].value, sel == 0);
-		drawsquare(conf, c[1].win, "%9s", m[c[1].value-1].name,
-		    sel == 1);
-		drawsquare(conf, c[2].win, "%02d", &c[2].value, sel == 2);
-
-		if (get_wch(&input) == ERR)
-			continue;
-		switch(input) {
-		case KEY_ENTER:
-		case 10: /* Enter */
-			if (focusbuttons || conf->button.always_active) {
-				retval = bs.value[bs.curr];
-				loop = false;
-			}
-			break;
-		case 27: /* Esc */
-			if (conf->key.enable_esc) {
-				retval = BSDDIALOG_ESC;
-				loop = false;
-			}
-			break;
-		case KEY_RIGHT:
-		case '\t': /* TAB */
-			if (focusbuttons) {
-				bs.curr++;
-				focusbuttons = bs.curr < (int)bs.nbuttons ?
-				    true : false;
-				if (focusbuttons == false) {
-					sel = 0;
-					bs.curr = conf->button.always_active ? 0 : -1;
-				}
-			} else {
-				sel++;
-				focusbuttons = sel > 2 ? true : false;
-				if (focusbuttons) {
-					bs.curr = 0;
-				}
-			}
-			draw_buttons(widget, bs, true);
-			wrefresh(widget);
-			break;
-		case KEY_LEFT:
-			if (focusbuttons) {
-				bs.curr--;
-				focusbuttons = bs.curr < 0 ? false : true;
-				if (focusbuttons == false) {
-					sel = 2;
-					bs.curr = conf->button.always_active ? 0 : -1;
-				}
-			} else {
-				sel--;
-				focusbuttons = sel < 0 ? true : false;
-				if (focusbuttons)
-					bs.curr = (int)bs.nbuttons - 1;
-			}
-			draw_buttons(widget, bs, true);
-			wrefresh(widget);
-			break;
-		case KEY_UP:
-			if (focusbuttons) {
-				sel = 0;
-				focusbuttons = false;
-				bs.curr = conf->button.always_active ? 0 : -1;
-				draw_buttons(widget, bs, true);
-				wrefresh(widget);
-			} else {
-				c[sel].value = c[sel].value > 1 ?
-				    c[sel].value - 1 : c[sel].max ;
-				/* if mount change */
-				c[2].max = m[c[1].value -1].days;
-				/* if year change */
-				if (c[1].value == 2 && ISLEAP(c[0].value))
-					c[2].max = 29;
-				/* set new day */
-				if (c[2].value > c[2].max)
-					c[2].value = c[2].max;
-			}
-			break;
-		case KEY_DOWN:
-			if (focusbuttons)
-				break;
-			c[sel].value = c[sel].value < c[sel].max ?
-			    c[sel].value + 1 : 1;
-			/* if mount change */
-			c[2].max = m[c[1].value -1].days;
-			/* if year change */
-			if (c[1].value == 2 && ISLEAP(c[0].value))
-				c[2].max = 29;
-			/* set new day */
-			if (c[2].value > c[2].max)
-				c[2].value = c[2].max;
-			break;
-		case KEY_F(1):
-			if (conf->key.f1_file == NULL &&
-			    conf->key.f1_message == NULL)
-				break;
-			if (f1help(conf) != 0)
-				return (BSDDIALOG_ERROR);
-			/* No break, screen size can change */
 		case KEY_RESIZE:
-			/* Important for decreasing screen */
-			hide_widget(y, x, h, w, conf->shadow);
-			refresh();
-
-			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
-				return (BSDDIALOG_ERROR);
-			if (datetime_autosize(conf, rows, cols, &h, &w,
-			    MINWDATE, text, bs) != 0)
-				return (BSDDIALOG_ERROR);
-			if (datetime_checksize(h, w, MINWDATE, bs) != 0)
+			if (timebox_redraw(&d, c) != 0)
 				return (BSDDIALOG_ERROR);
-			if (set_widget_position(conf, &y, &x, h, w) != 0)
-				return (BSDDIALOG_ERROR);
-
-			if (update_dialog(conf, shadow, widget, y, x, h, w,
-			    textpad, text, &bs, true) != 0)
-				return (BSDDIALOG_ERROR);
-			doupdate();
-
-			mvwaddch(widget, h - 5, w/2 - 5, '/');
-			mvwaddch(widget, h - 5, w/2 + 7, '/');
-			wrefresh(widget);
-
-			prefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
-
-			wclear(c[0].win);
-			mvwin(c[0].win, y + h - 6, x + w/2 - 11);
-			wclear(c[1].win);
-			mvwin(c[1].win, y + h - 6, x + w/2 - 4);
-			wclear(c[2].win);
-			mvwin(c[2].win, y + h - 6, x + w/2 + 8);
-
-			/* Important to avoid grey lines expanding screen */
-			refresh();
 			break;
 		default:
-			if (shortcut_buttons(input, &bs)) {
-				retval = bs.value[bs.curr];
+			if (shortcut_buttons(input, &d.bs)) {
+				DRAW_BUTTONS(d);
+				doupdate();
+				retval = BUTTONVALUE(d.bs);
 				loop = false;
 			}
 		}
 	}
 
-	if (retval == BSDDIALOG_OK) {
-		*yy = c[0].value;
-		*mm = c[1].value;
-		*dd = c[2].value;
-	}
+	*hh = c[0].value;
+	*mm = c[1].value;
+	*ss = c[2].value;
 
 	for (i = 0; i < 3; i++)
 		delwin(c[i].win);
-	end_dialog(conf, shadow, widget, textpad);
+	end_dialog(&d);
 
 	return (retval);
-}
\ No newline at end of file
+}
diff --git a/contrib/bsddialog/util_theme.c b/contrib/bsddialog/util_theme.c
deleted file mode 100644
index caf62852e9f3..000000000000
--- a/contrib/bsddialog/util_theme.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2022 Alfonso Sabato Siciliano
- *
- * 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.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <bsddialog.h>
-#include <bsddialog_theme.h>
-
-#include "util_theme.h"
-
-static struct bsddialog_theme t;
-static char title[1024];
-
-enum typeprop {
-	BOOL,
-	CHAR,
-	INT,
-	UINT,
-	COLOR
-};
-
-struct property {
-	const char* name;
-	enum typeprop type;
-	void *value;
-};
-
-#define NPROPERTY 38
-static struct property p[NPROPERTY] = {
-	{ "theme.screen.color", COLOR, &t.screen.color },
-
-	{ "theme.shadow.color", COLOR, &t.shadow.color },
-	{ "theme.shadow.y", UINT, &t.shadow.y },
-	{ "theme.shadow.x", UINT, &t.shadow.x },
-
-	{ "theme.dialog.color", COLOR, &t.dialog.color },
-	{ "theme.dialog.delimtitle", BOOL, &t.dialog.delimtitle },
-	{ "theme.dialog.titlecolor", COLOR, &t.dialog.titlecolor },
-	{ "theme.dialog.lineraisecolor", COLOR, &t.dialog.lineraisecolor },
-	{ "theme.dialog.linelowercolor", COLOR, &t.dialog.linelowercolor },
-	{ "theme.dialog.bottomtitlecolor", COLOR, &t.dialog.bottomtitlecolor },
-	{ "theme.dialog.arrowcolor", COLOR, &t.dialog.arrowcolor },
-
-	{ "theme.menu.f_selectorcolor", COLOR, &t.menu.f_selectorcolor},
-	{ "theme.menu.selectorcolor", COLOR, &t.menu.selectorcolor},
-	{ "theme.menu.f_namecolor", COLOR, &t.menu.f_namecolor},
-	{ "theme.menu.namecolor", COLOR, &t.menu.namecolor},
-	{ "theme.menu.f_desccolor", COLOR, &t.menu.f_desccolor},
-	{ "theme.menu.desccolor", COLOR, &t.menu.desccolor},
-	{ "theme.menu.namesepcolor", COLOR, &t.menu.namesepcolor},
-	{ "theme.menu.descsepcolor", COLOR, &t.menu.descsepcolor},
-	{ "theme.menu.f_shortcutcolor", COLOR, &t.menu.f_shortcutcolor},
-	{ "theme.menu.shortcutcolor", COLOR, &t.menu.shortcutcolor},
-	{ "theme.menu.bottomdesccolor", COLOR, &t.menu.bottomdesccolor},
-
-	{ "theme.form.f_fieldcolor", COLOR, &t.form.f_fieldcolor},
-	{ "theme.form.fieldcolor", COLOR, &t.form.fieldcolor},
-	{ "theme.form.readonlycolor", COLOR, &t.form.readonlycolor},
-	{ "theme.form.bottomdesccolor", COLOR, &t.form.bottomdesccolor},
-
-	{ "theme.bar.f_color", COLOR, &t.bar.f_color},
-	{ "theme.bar.color", COLOR, &t.bar.color},
-
-	{ "theme.button.minmargin", UINT, &t.button.minmargin},
-	{ "theme.button.maxmargin", UINT, &t.button.maxmargin},
-	{ "theme.button.leftdelim", CHAR, &t.button.leftdelim},
-	{ "theme.button.rightdelim", CHAR, &t.button.rightdelim},
-	{ "theme.button.delimcolor", COLOR, &t.button.delimcolor},
-	{ "theme.button.f_delimcolor", COLOR, &t.button.f_delimcolor},
-	{ "theme.button.color", COLOR, &t.button.color},
-	{ "theme.button.f_color", COLOR, &t.button.f_color},
-	{ "theme.button.shortcutcolor", COLOR, &t.button.shortcutcolor},
-	{ "theme.button.f_shortcutcolor", COLOR, &t.button.f_shortcutcolor}
-};
-
-static const char *color[8] = {
-	"black",
-	"red",
-	"green",
-	"yellow",
-	"blue",
-	"magenta",
-	"cyan",
-	"white"
-};
-
-#define EXIT_FMTERROR(fmt, ...) do {                                           \
-	bsddialog_end();                                                       \
-	printf("Error: ");                                                     \
-	printf(fmt, __VA_ARGS__);                                              \
-	printf(".\n");                                                         \
-	exit (255);                                                            \
-} while (0)
-
-void savetheme(const char *file, const char *version)
-{
-	int i;
-	unsigned int flags;
-	enum bsddialog_color bg, fg;
-	time_t clock;
-	FILE *fp;
-
-	if (bsddialog_get_theme(&t) != BSDDIALOG_OK)
-		EXIT_FMTERROR("cannot save theme: %s", bsddialog_geterror());
-
-	if(time(&clock) < 0)
-		EXIT_FMTERROR("%s", "cannot save profile getting current time");
-
-	if ((fp = fopen(file, "w")) == NULL)
-		EXIT_FMTERROR("cannot open %s to save profile", file);
-
-	fprintf(fp, "### bsddialog theme - %s", ctime(&clock));
-	fputs("# Refer to bsddialog(3) manual for theme.* properties\n", fp);
-	fprintf(fp, "version %s\n", version);
-
-	for (i = 0; i < NPROPERTY; i++) {
-		switch (p[i].type) {
-		case CHAR:
-			fprintf(fp, "%s %c\n", p[i].name, *((char*)p[i].value));
-			break;
-		case INT:
-			fprintf(fp, "%s %d\n", p[i].name, *((int*)p[i].value));
-			break;
-		case UINT:
-			fprintf(fp, "%s %u\n", p[i].name,
-			    *((unsigned int*)p[i].value));
-			break;
-		case BOOL:
-			fprintf(fp, "%s %s\n", p[i].name,
-			    *((bool*)p[i].value) ? "true" : "false");
-			break;
-		case COLOR:
-			bsddialog_color_attrs(*(int*)p[i].value, &fg, &bg,
-			    &flags);
-			fprintf(fp, "%s %s %s%s%s%s\n",
-			    p[i].name, color[fg], color[bg],
-			    flags & BSDDIALOG_BOLD ? " bold" : "",
-			    flags & BSDDIALOG_REVERSE ? " reverse" : "",
-			    flags & BSDDIALOG_UNDERLINE ? " underline" : "");
-			break;
-		}
-	}
-
-	fclose(fp);
-}
-
-void setdeftheme(enum bsddialog_default_theme theme)
-{
-	if (bsddialog_set_default_theme(theme) != BSDDIALOG_OK)
-		EXIT_FMTERROR("%s", bsddialog_geterror());
-}
-
-void loadtheme(const char *file)
-{
-	bool boolvalue;
-	char charvalue, *value;
-	char line[BUFSIZ], name[BUFSIZ], c1[BUFSIZ], c2[BUFSIZ];
-	int i, j, intvalue, flags;
-	unsigned int uintvalue;
-	enum bsddialog_color bg, fg;
-	FILE *fp;
-
-	if (bsddialog_get_theme(&t) != BSDDIALOG_OK)
-		EXIT_FMTERROR("Cannot get current theme: %s",
-		    bsddialog_geterror());
-
-	if((fp = fopen(file, "r")) == NULL)
-		EXIT_FMTERROR("Cannot open theme \"%s\"", file);
-
-#define EXIT_ERROR(name, error) do {                                           \
-	fclose(fp);                                                            \
-	EXIT_FMTERROR("%s for \"%s\"", error, name);                           \
-} while (0)
-
-	while(fgets(line, BUFSIZ, fp) != NULL) {
-		if(line[0] == '#' || line[0] == '\n')
-			continue;  /* superfluous, only for efficiency */
-		sscanf(line, "%s", name);
-		for (i = 0; i < NPROPERTY; i++) {
-			if (strcmp(name, p[i].name) == 0) {
-				value = &line[strlen(name)];
-				break;
-			}
-		}
-		if (i >= NPROPERTY) {
-			if (strcmp(name, "version") == 0)
-				continue;
-			EXIT_ERROR(name, "Unknown theme property name");
-		}
-		switch (p[i].type) {
-		case CHAR:
-			while (value[0] == ' ' || value[0] == '\n' ||
-			    value[0] == '\0')
-				value++;
-			if (sscanf(value, "%c", &charvalue) != 1)
-				EXIT_ERROR(p[i].name, "Cannot get a char");
-			*((int*)p[i].value) = charvalue;
-			break;
-		case INT:
-			if (sscanf(value, "%d", &intvalue) != 1)
-				EXIT_ERROR(p[i].name, "Cannot get a int");
-			*((int*)p[i].value) = intvalue;
-			break;
-		case UINT:
-			if (sscanf(value, "%u", &uintvalue) != 1)
-				EXIT_ERROR(p[i].name, "Cannot get a uint");
-			*((unsigned int*)p[i].value) = uintvalue;
-			break;
-		case BOOL:
-			boolvalue = (strstr(value, "true") != NULL) ?
-			    true :false;
-			*((bool*)p[i].value) = boolvalue;
-			break;
-		case COLOR:
-			if (sscanf(value, "%s %s", c1, c2) != 2)
-				EXIT_ERROR(p[i].name, "Cannot get 2 colors");
-			/* Foreground */
-			for (j = 0; j < 8 ; j++)
-				if ((strstr(c1, color[j])) != NULL)
-					break;
-			if ((fg = j) > 7)
-				EXIT_ERROR(p[i].name, "Bad foreground");
-			/* Background */
-			for (j = 0; j < 8 ; j++)
-				if ((value = strstr(c2, color[j])) != NULL)
-					break;
-			if ((bg = j) > 7)
-				EXIT_ERROR(p[i].name, "Bad background");
-			/* Flags */
-			flags = 0;
-			if (strstr(value, "bold") != NULL)
-				flags |= BSDDIALOG_BOLD;
-			if (strstr(value, "reverse") != NULL)
-				flags |= BSDDIALOG_REVERSE;
-			if (strstr(value, "underline") != NULL)
-				flags |= BSDDIALOG_UNDERLINE;
-			*((int*)p[i].value) = bsddialog_color(fg, bg, flags);
-			break;
-		}
-	}
-
-	fclose(fp);
-
-	bsddialog_set_theme(&t);
-}
-
-void bikeshed(struct bsddialog_conf *conf)
-{
-	int margin, i;
-	int colors[8] = {0, 0, 0, 0 ,0 ,0 , 0, 0};
-	enum bsddialog_color col[6];
-	time_t clock;
-
-	time(&clock);
-	srand(clock);
-
-	/* theme */
-	if (bsddialog_get_theme(&t) != BSDDIALOG_OK)
-		EXIT_FMTERROR("%s", bsddialog_geterror());
-
-	for (i = 0; i < 6; i++) {
-		do {
-			col[i] = rand() % 8;
-		} while (colors[col[i]] == 1);
-		colors[col[i]] = 1;
-	}
-
-	t.screen.color = bsddialog_color(col[4], col[3], 0);
-
-	t.shadow.color   = bsddialog_color(col[0], col[0], 0);
-	t.shadow.y       = 1,
-	t.shadow.x       = 2,
-
-	t.dialog.delimtitle       = (rand() % 2 == 0) ? true : false;
-	t.dialog.titlecolor       = bsddialog_color(col[3], col[5], 0);
-	t.dialog.lineraisecolor   = bsddialog_color(col[0], col[5], 0);
-	t.dialog.linelowercolor   = bsddialog_color(col[0], col[5], 0);
-	t.dialog.color            = bsddialog_color(col[0], col[5], 0);
-	t.dialog.bottomtitlecolor = bsddialog_color(col[0], col[5], 0);
-	t.dialog.arrowcolor       = bsddialog_color(col[3], col[5], 0);
-
-	t.menu.f_selectorcolor = bsddialog_color(col[5], col[3], 0);
-	t.menu.selectorcolor   = bsddialog_color(col[0], col[5], 0);
-	t.menu.f_desccolor     = bsddialog_color(col[5], col[3], 0);
-	t.menu.desccolor       = bsddialog_color(col[0], col[5], 0);
-	t.menu.f_namecolor     = bsddialog_color(col[5], col[3], 0);
-	t.menu.namecolor       = bsddialog_color(col[3], col[5], 0);
-	t.menu.namesepcolor    = bsddialog_color(col[1], col[5], 0);
-	t.menu.descsepcolor    = bsddialog_color(col[1], col[5], 0);
-	t.menu.f_shortcutcolor = bsddialog_color(col[1], col[3], 0);
-	t.menu.shortcutcolor   = bsddialog_color(col[1], col[5], 0);
-	t.menu.bottomdesccolor = bsddialog_color(col[4], col[3], 0);
-
-	t.form.f_fieldcolor    = bsddialog_color(col[5], col[3], 0);
-	t.form.fieldcolor      = bsddialog_color(col[5], col[4], 0);
-	t.form.readonlycolor   = bsddialog_color(col[4], col[5], 0);
-	t.form.bottomdesccolor = bsddialog_color(col[4], col[3], 0);
-
-	t.bar.f_color = bsddialog_color(col[5], col[3], 0);
-	t.bar.color   = bsddialog_color(col[3], col[5], 0);
-
-	t.button.minmargin       = 1,
-	t.button.maxmargin       = 5,
-	t.button.leftdelim       = '[',
-	t.button.rightdelim      = ']',
-	t.button.f_delimcolor    = bsddialog_color(col[5], col[3], 0);
-	t.button.delimcolor      = bsddialog_color(col[0], col[5], 0);
-	t.button.f_color         = bsddialog_color(col[2], col[3], 0);
-	t.button.color           = bsddialog_color(col[0], col[5], 0);
-	t.button.f_shortcutcolor = bsddialog_color(col[5], col[3], 0);
-	t.button.shortcutcolor   = bsddialog_color(col[1], col[5], 0);
-
-	if (bsddialog_set_theme(&t))
-		EXIT_FMTERROR("%s", bsddialog_geterror());
-
-	/* conf */
-	conf->button.always_active = (rand() % 2 == 0) ? true : false;
-	if (conf->title != NULL) {
-		memset(title, 0, 1024);
-		margin = rand() % 5;
-		memset(title, ' ', margin);
-		strcpy(title + margin, conf->title);
-		memset(title + strlen(title), ' ', margin);
-		conf->title = title;
-	}
-}
diff --git a/contrib/bsddialog/utility/GNUmakefile b/contrib/bsddialog/utility/GNUmakefile
new file mode 100644
index 000000000000..518ec0d912d6
--- /dev/null
+++ b/contrib/bsddialog/utility/GNUmakefile
@@ -0,0 +1,33 @@
+# PUBLIC DOMAIN - NO WARRANTY, see:
+#     <http://creativecommons.org/publicdomain/zero/1.0/>
+#
+# Written in 2021 by Alfonso Sabato Siciliano
+
+OUTPUT =  bsddialog
+SOURCES = bsddialog.c util_builders.c util_cli.c util_theme.c
+OBJECTS = $(SOURCES:.c=.o)
+
+ifneq ($(ENABLEDEBUG),)
+CFLAGS += -g
+endif
+CFLAGS += -D_GNU_SOURCE -Wall -Wextra -I$(LIBPATH)
+
+ifneq ($(DISABLERPATH),)
+LDFLAGS += -ltinfo -L$(LIBPATH) -lbsddialog
+else
+LDFLAGS += -ltinfo -Wl,-rpath=$(LIBPATH) -L$(LIBPATH) -lbsddialog
+endif
+
+RM = rm -f
+
+all : $(OUTPUT)
+
+$(OUTPUT): $(OBJECTS)
+	$(CC) $^ -o $@ $(LDFLAGS)
+
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $<
+
+clean:
+	$(RM) $(OUTPUT) *.o *~
diff --git a/contrib/bsddialog/utility/Makefile b/contrib/bsddialog/utility/Makefile
new file mode 100644
index 000000000000..ab51b46a25be
--- /dev/null
+++ b/contrib/bsddialog/utility/Makefile
@@ -0,0 +1,33 @@
+# PUBLIC DOMAIN - NO WARRANTY, see:
+#     <http://creativecommons.org/publicdomain/zero/1.0/>
+#
+# Written in 2021 by Alfonso Sabato Siciliano
+
+OUTPUT =  bsddialog
+SOURCES = bsddialog.c util_builders.c util_cli.c util_theme.c
+OBJECTS = ${SOURCES:.c=.o}
+
+.if defined(DEBUG)
+CFLAGS += -g
+.endif
+CFLAGS += -I${LIBPATH} -std=gnu99 -Wall -Wextra -Werror
+
+.if defined(NORPATH)
+LDFLAGS += -ltinfow -L${LIBPATH} -lbsddialog
+.else
+LDFLAGS += -ltinfow -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
+.endif
+
+INSTALL = install
+RM = rm -f
+
+all : ${OUTPUT}
+
+${OUTPUT}: ${OBJECTS}
+	${CC} ${LDFLAGS} ${OBJECTS} -o ${.PREFIX}
+
+.c.o:
+	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+
+clean:
+	${RM} ${OUTPUT} *.o *~ *.core *.gz
diff --git a/contrib/bsddialog/bsddialog.1 b/contrib/bsddialog/utility/bsddialog.1
similarity index 75%
rename from contrib/bsddialog/bsddialog.1
rename to contrib/bsddialog/utility/bsddialog.1
index 759fe6dc3fff..653f91a3f122 100644
--- a/contrib/bsddialog/bsddialog.1
+++ b/contrib/bsddialog/utility/bsddialog.1
@@ -1,6 +1,5 @@
 .\"
-.\"
-.\" Copyright (c) 2021-2022 Alfonso Sabato Siciliano
+.\" Copyright (c) 2021-2023 Alfonso Sabato Siciliano
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -23,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd September 23, 2022
+.Dd July 25, 2023
 .Dt BSDDIALOG 1
 .Os
 .Sh NAME
@@ -31,9 +30,7 @@
 .Nd TUI dialogs
 .Sh SYNOPSIS
 .Nm
-.Fl Fl help
-.Nm
-.Fl Fl version
+.Fl Fl help | Fl Fl version
 .Nm
 .Op Fl Fl option
 .Fl Fl dialog
@@ -41,7 +38,9 @@
 .Ar rows
 .Ar cols
 .Op Ar dialog-argument
+.Op Fl Fl option
 .Nm
+\&...
 .Fl Fl dialog1
 .Ar ...
 .Oo Fl Fl and-dialog
@@ -51,25 +50,31 @@
 .Sh DESCRIPTION
 The
 .Nm bsddialog
-utility builds Text User Interface dialogs and widgets: to display messages,
-to get input and to inform about a computation status.
+utility builds Text User Interface dialogs and widgets.
 .Pp
-The options
+The option
 .Fl Fl help
-and
+prints a brief list of features and exits.
+The option
 .Fl Fl version
-print the list of options and the version, respectively, then exit.
+prints the version and exits.
+The option
 .Fl Fl and-dialog
 builds another dialog unless the previous one returns Error, ESC or Cancel.
 .Pp
+Each dialog accepts
 .Ar text
-is a message printed inside the dialog.
+to print a message inside,
 .Ar rows
 and
 .Ar cols
-are the height and width, 0 for autosize and -1 for fullscreen.
+to set height and width,
+.Dv 0
+for autosize and
+.Dv -1
+for fullscreen.
 .Pp
-The possible input got from the user interface is printed to standard error.
+The possible input from the user interface is printed to standard error at exit.
 .Ss Options
 The following options can change the default behavior of the utility and are
 common to some dialog.
@@ -80,18 +85,37 @@ If available set alternate screen mode, see
 .It Fl Fl ascii-lines
 Ascii characters to draw lines.
 .It Fl Fl backtitle Ar backtitle
-Title on the top side of the screen.
+Screen title.
 .It Fl Fl begin-x Ar x
-Dialog horizontal position, 0 is the left screen side, -1 center.
+Set dialog horizontal position,
+.Dv -1
+center,
+.Dv 0
+left screen.
 .It Fl Fl begin-y Ar y
-Dialog vertical position, 0 is the top screen side, -1 center.
+Set dialog vertical position,
+.Dv -1
+center,
+.Dv 0
+top screen.
 .It Fl Fl bikeshed
 Random settings.
-Colors.
-Delimiter and margins around the title.
-Buttons always active or TAB to switch focus with input components, see
+Colors, title delimiter, button delimiter; see theme features.
+Title margin.
+Buttons always active or TAB to switch focus with other components, see
 .Fl Fl switch-buttons .
-Zero padding with time or date output.
+Zero padding with time output; see
+.Fl Fl time-format .
+Zero padding with date output; see
+.Fl Fl date-format .
+User Interface date format for
+.Fl Fl datebox ;
+see
+.Fl Fl datebox-format .
+.It Fl Fl cancel-exit-code Ar retval
+Set an exit code value for the
+.Dq Cancel
+button.
 .It Fl Fl cancel-label Ar label
 Label for the
 .Dq Cancel
@@ -99,41 +123,7 @@ button.
 .It Fl Fl clear-dialog
 Hide the dialog at exit.
 .It Fl Fl clear-screen
-Clear the screen, after the dialog exit if a dialog is built.
-.It Fl Fl colors
-Enable highlights for text, the following sequences are considered escapes:
-.Bl -column -compact
-.It Dq \eZ0
-black.
-.It Dq \eZ1
-red.
-.It Dq \eZ2
-green.
-.It Dq \eZ3
-yellow.
-.It Dq \eZ4
-blue.
-.It Dq \eZ5
-magenta.
-.It Dq \eZ6
-cyan.
-.It Dq \eZ7
-white.
-.It Dq \eZr
-reverse foreground and background.
-.It Dq \eZR
-disable reverse.
-.It Dq \eZb
-bold.
-.It Dq \eZB
-disable bold.
-.It Dq \eZu
-underline.
-.It Dq \eZU
-disable underline.
-.It Dq \eZn
-restore normal text.
-.El
+Clear the screen, wait a dialog if built.
 .It Fl Fl columns-per-row Ar columns
 Try to set the number of columns for a row of text with autosizing; default
 .Dv 10 .
@@ -144,13 +134,20 @@ also if it constains a
 .Dq \en ,
 see
 .Fl Fl text-unchanged .
+.It Fl Fl datebox-format Ar format
+String to customize
+.Fl Fl datebox
+interface, possible values:
+.Dq d/m/y ,
+.Dq m/y/d ,
+.Dq y/m/d .
 .It Fl Fl date-format Ar format
 String accepted by
 .Xr strftime 3
 to customize the output of
 .Fl Fl datebox
 and
-.Fl Fl calendar
+.Fl Fl calendar .
 .It Fl Fl default-button Ar label
 Focus on the button with
 .Ar label
@@ -167,48 +164,74 @@ or
 button on startup.
 .It Fl Fl disable-esc
 Disable ESC key to quit.
-.It Fl Fl esc-return-cancel
-ESC key returns
-.Dq Cancel
-button value.
+.It Fl Fl error-exit-code Ar retval
+Set an exit code value for the
+.Nm
+errors.
+.It Fl Fl esc-exit-code Ar retval
+Set an exit code value for the
+.Dv ESC
+key.
 .It Fl Fl extra-button
 Add a button with
 .Dq Extra
 label.
+.It Fl Fl extra-exit-code Ar retval
+Set an exit code value for the
+.Dq Extra
+button.
 .It Fl Fl extra-label Ar label
 Set
 .Ar label
 for the
 .Dq Extra
 button.
-.It Fl Fl generic-button1 Ar label
+.It Fl Fl left1-button Ar label
+Add a button with
+.Ar label .
+.It Fl Fl left1-exit-code Ar retval
+Set an exit code for
+.Fl Fl left1-button .
+.It Fl Fl left2-button Ar label
 Add a button with
 .Ar label .
-.It Fl Fl generic-button2 Ar label
+.It Fl Fl left2-exit-code Ar retval
+Set an exit code for
+.Fl Fl left2-button .
+.It Fl Fl left3-button Ar label
 Add a button with
 .Ar label .
+.It Fl Fl left3-exit-code Ar retval
+Set an exit code for
+.Fl Fl left3-button .
 .It Fl Fl help-button
 Add a button with
 .Dq Help
 label.
+.It Fl Fl help-exit-code Ar retval
+Set an exit code value for the
+.Dq Help
+button.
 .It Fl Fl help-label Ar label
 Set
 .Ar label
 for
 .Dq Help
 button.
+.It Fl Fl help-print-items
+Print also the selected items or form values if the
+.Dq Help
+button is pressed.
 .It Fl Fl help-print-name
-Print the name of the focused item if the Help button is pressed also
+Print the name of the focused item if the
+.Dq Help
+button is pressed also
 with
 .Fl Fl item-bottom-desc .
-.It Fl Fl help-status
-Print also the selected items if the
-.Dq Help
-button is pressed.
 .It Fl Fl hfile Ar filename
 Open
 .Ar filename
-in a Textbox if F1 key is pressed,
+in a Textbox if F1 key is pressed.
 .It Fl Fl hline Ar string
 Dialog subtitle.
 .It Fl Fl hmsg Ar string
@@ -220,7 +243,7 @@ Do not exit with unknown options.
 .It Fl Fl insecure
 Print
 .Sq *
-to hide passwords while typing; whitespace otherwise.
+to hide passwords while typing, white space otherwise.
 .It Fl Fl item-bottom-desc
 Set a help string for each item of a Checklist, Form, Menu, Mixedform,
 Passwordform, Radiolist and Treeview to display at the bottom screen side.
@@ -234,7 +257,7 @@ Load theme from
 .It Fl Fl max-input Ar size
 Maximum length of the input for
 .Fl Fl inputbox
-ans
+and
 .Fl Fl passwordbox ,
 default 2048.
 .It Fl Fl no-cancel
@@ -242,11 +265,15 @@ Do not show
 .Dq Cancel
 button.
 .It Fl Fl no-descriptions
-Do not display items desciption, for Checklist, Menu, Radiolist or Treeview.
+Do not display items desciption, for Checklist, Menu, Radiolist or Treeview;
+mutually exclusive with
+.Fl Fl no-names .
 .It Fl Fl no-lines
 Do not draw borders and lines.
 .It Fl Fl no-names
-Do not display items name, for Checklist, Menu and Radiolist.
+Do not display items name, for Checklist, Menu and Radiolist; mutually exclusive
+with
+.Fl Fl no-descriptions .
 .It Fl Fl no-ok
 Do not draw
 .Dq OK
@@ -259,30 +286,52 @@ Set
 for
 .Dq OK
 button.
+.It Fl Fl ok-exit-code Ar retval
+Set an exit code value for the
+.Dq Ok
+button.
 .It Fl Fl normal-screen
 If available set normal screen mode, see
 .Xr terminfo 5 .
 .It Fl Fl output-fd Ar fd
 Print input from user interface to the specified file descriptor.
 .It Fl Fl output-separator Ar sep
-Set a sepator for the items in output, default whitespace.
+Set a sepator for the items in output, default white space.
 .It Fl Fl print-maxsize
 Screen size.
 This option can be used without a dialog.
 .It Fl Fl print-size
-Print Dialog height and widget at exit.
+Print dialog height and width at exit.
 .It Fl Fl print-version
 Print version.
 This option can be used without a dialog.
 .It Fl Fl quoted
 Quote items in output, default only when necessary.
+.It Fl Fl right1-button Ar label
+Add a button with
+.Ar label .
+.It Fl Fl right1-exit-code Ar retval
+Set an exit code for
+.Fl Fl right1-button .
+.It Fl Fl right2-button Ar label
+Add a button with
+.Ar label .
+.It Fl Fl right2-exit-code Ar retval
+Set an exit code for
+.Fl Fl right2-button .
+.It Fl Fl right3-button Ar label
+Add a button with
+.Ar label .
+.It Fl Fl right3-exit-code Ar retval
+Set an exit code for
+.Fl Fl right3-button .
 .It Fl Fl save-theme Ar file
 Save the current theme.
 This option can be used without a dialog.
 .It Fl Fl separate-output
-Separate selected items with a new line and avoid to quote.
+Print selected items separated by a new line and avoid to quote.
 .It Fl Fl shadow
-Show a pseudo shadow for the dialog, enabled by default.
+Show a shadow for the dialog, enabled by default.
 .It Fl Fl single-quoted
 Use single quote for items in output.
 .It Fl Fl sleep Ar secs
@@ -294,7 +343,7 @@ Print input from user interface to standand error, default.
 .It Fl Fl stdout
 Print input from user interface to standard output.
 .It Fl Fl switch-buttons
-enables focus switching between buttons and input components pressing TAB,
+Enable focus switching between buttons and input components pressing TAB,
 otherwise buttons are always active and ENTER key closes the dialog.
 Suitable for:
 .Fl Fl form ,
@@ -314,24 +363,78 @@ with a tab in
 .It Fl Fl tab-len Ar spaces
 Number of spaces to print a TAB in
 .Ar text .
+.It Fl Fl text-escape
+Enable escapes in
+.Ar text :
+.Bl -column -compact
+.It Dq \eZ0
+black.
+.It Dq \eZ1
+red.
+.It Dq \eZ2
+green.
+.It Dq \eZ3
+yellow.
+.It Dq \eZ4
+blue.
+.It Dq \eZ5
+magenta.
+.It Dq \eZ6
+cyan.
+.It Dq \eZ7
+white.
+.It Dq \eZb
+bold.
+.It Dq \eZB
+disable bold.
+.It Dq \eZd
+Half bright.
+.It Dq \eZD
+disable half bright.
+.It Dq \eZk
+Blink.
+.It Dq \eZK
+disable blinking.
+.It Dq \eZr
+reverse foreground and background.
+.It Dq \eZR
+disable reverse.
+.It Dq \eZs
+Highlight.
+.It Dq \eZS
+disable highlighting.
+.It Dq \eZu
+underline.
+.It Dq \eZU
+disable underline.
+.It Dq \eZn
+disable each customization.
+.El
 .It Fl Fl text-unchanged
-By default the
+Disable
+.Ar text
+modification.
+By default
 .Ar text
-is changed before to be printed.
+is changed before to be printed in the dialog.
 If it contains at least a
 .Dq \en
 each new line and TAB is converted to a space, subsequent spaces are merged.
 Otherwise new line characters are preserved and a TAB becomes a space.
-This option disable the
-.Ar text
-modification.
 .It Fl Fl theme Ar theme
-Set a graphical style: blackwhite, bsddialog, flat or dialog.
+Set theme, possible values:
+.Dq 3d ,
+.Dq blackwhite ,
+.Dq flat .
 .It Fl Fl time-format Ar format
 String accepted by
 .Xr strftime 3
 to customize the output of
 .Fl Fl timebox .
+.It Fl Fl timeout-exit-code Ar retval
+Set an exit code value for the
+.Fl Fl pause
+timeout.
 .It Fl Fl title Ar title
 Dialog title.
 .El
@@ -398,7 +501,7 @@ following strings replace
 until the next
 .Dq XXX ,
 the loop ends reading
-.Dv EOF .
+.Dq EOF .
 .It Fl Fl infobox Ar text Ar rows Ar cols
 Dialog without buttons to display a message and to exit immediately.
 .It Fl Fl inputbox Ar text Ar rows Ar cols Op Ar init
@@ -444,11 +547,12 @@ for autosize.
 Ar miniperc Oc ...
 Dialog to show a main bar to represent
 .Ar mainperc
-from 0 to 100 and some mini bar with a
+from 0 to 100.
+Some mini bar with a
 .Ar minilabel
 string and a
 .Ar miniperc
-with value from 0 and 100 or negative to print a descriptive string: -1
+with a value from 0 and 100 or negative to print a descriptive string: -1
 .Dq Succeeded ,
 -2
 .Dq Failed ,
@@ -465,16 +569,19 @@ with value from 0 and 100 or negative to print a descriptive string: -1
 -8
 .Dq \&In Progress ,
 -9
-a blank line,
+to hide
+.Fa miniperc ,
 -10
 .Dq N/A ,
 -11
-.Dq Pending .
+.Dq Pending ,
+otherwise
+.Dq UNKNOWN .
 .It Fl Fl msgbox Ar text Ar rows Ar cols
 Dialog to diplay a message without the
 .Dq Cancel
 button.
-UP, DOWN, HOME, END, PAGEUP and PAGEDOWN keys are availble to navigate the text.
+UP, DOWN, HOME, END, PAGEUP and PAGEDOWN keys are availble to scroll the text.
 .It Fl Fl passwordbox Ar text Ar rows Ar cols Op Ar init
 Dialog to get a password,
 .Ar init
@@ -486,9 +593,9 @@ Dialog to get a list of passwords, equivalent to
 .Fl Fl form
 except typed characters are hidden.
 .It Fl Fl pause Ar text Ar rows Ar cols Ar seconds
-Dialog runs until the timeout in
+Dialog runs until
 .Ar seconds
-expires or a button is pressed.
+timeout expires or a button is pressed.
 .It Fl Fl radiolist Ar text Ar rows Ar cols Ar menurows Oo Ar name Ar desc \
 Ar status Oc ...
 Radiolist to select at most an item from a list via the SPACE key.
@@ -514,8 +621,9 @@ is the default value, the keys UP, DOWN, HOME, END, PAGEUP and PAGEDOWN can
 change it.
 .It Fl Fl textbox Ar file Ar rows Ar cols
 Opens and prints
-.Ar file
-the UP, DOWN, HOME, END, PAGEUP and PAGEDOWN keys are availble to navigate;
+.Ar file .
+UP, DOWN, LEFT, RIGHT, HOME, END, PAGEUP and PAGEDOWN keys are available to
+navigate the file, TAB changes button.
 .Dq OK
 button is renamed
 .Dq EXIT .
@@ -536,8 +644,29 @@ buttons are renamed
 .Dq Yes
 and
 .Dq \&No .
-UP, DOWN, HOME, END, PAGEUP and PAGEDOWN keys are availble to navigate the text.
+UP, DOWN, HOME, END, PAGEUP and PAGEDOWN keys are availble to scroll the text.
 .El
+.Sh ENVIRONMENT
+The following environment variables take effect only on startup, other options
+can override their setting.
+.Bl -tag -width indent
+.It Ev NO_COLOR
+If present and not an empty string (regardless of its value) equivalent to
+.Fl Fl theme Ar blackwhite .
+.It Ev BSDDIALOG_ERROR , Ev BSDDIALOG_OK , Ev BSDDIALOG_CANCEL , \
+Ev BSDDIALOG_HELP , Ev BSDDIALOG_EXTRA , Ev BSDDIALOG_TIMEOUT , \
+Ev BSDDIALOG_ESC , Ev BSDDIALOG_LEFT1 , Ev BSDDIALOG_LEFT2 , \
+Ev BSDDIALOG_LEFT3 , Ev BSDDIALOG_RIGHT1 , Ev BSDDIALOG_RIGHT2 , \
+Ev BSDDIALOG_RIGHT3
+Set exit codes.
+.It Ev BSDDIALOG_THEMEFILE Ar file
+Equivalent to
+.Fl Fl load-theme Ar file .
+.El
+.Sh FILES
+The theme file
+.Pa $HOME/.bsddialog.conf
+is read on startup if exists.
 .Sh EXIT STATUS
 The
 .Nm
@@ -566,9 +695,17 @@ Timeout.
 .It 5
 ESC key.
 .It 6
-Generic 1 button.
+Left1 generic button.
 .It 7
-Generic 2 button.
+Left2 generic button.
+.It 8
+Left3 generic button.
+.It 9
+Right1 generic button.
+.It 10
+Right2 generic button.
+.It 11
+Right2 generic button.
 .El
 .Sh EXAMPLES
 Backtitle, title and message:
@@ -595,6 +732,7 @@ Multi-dialog:
 .Pp
 Bikeshed:
 .Dl bsddialog --bikeshed --inputbox Example 0 0
+.Dl bsddialog --bikeshed --datebox Example 0 0
 .Pp
 Mixedgauge:
 .Dl bsddialog --sleep 3 --mixedgauge Example 10 30 60 L1 \*q -1\*q L2 30
@@ -641,8 +779,10 @@ Obsolete                     Equivalent
 --and-widget                 --and-dialog
 --calendar <text> 2 <cols>   --calendar <text> 0 <cols>
 --clear                      --clear-screen
+--colors                     --text-escape
 --defaultno                  --default-no
 --exit-label                 --ok-label
+--help-status                --help-print-items
 --help-tags                  --help-print-name
 --item-help                  --item-bottom-desc
 --keep-tite                  --alternate-screen
@@ -655,7 +795,9 @@ Obsolete                     Equivalent
 --yes-label                  --ok-label
 .Ed
 .Sh SEE ALSO
-.Xr bsddialog 3
+.Xr bsddialog 3 ,
+.Xr strftime 3 ,
+.Xr terminfo 5
 .Sh HISTORY
 The
 .Nm bsddialog
@@ -668,7 +810,7 @@ was written by
 .Aq Mt asiciliano@FreeBSD.org .
 .Pp
 .Nm bsddialog
-provides a subset of the functionality described in the
+provides also a subset of the functionality described in the
 .Nm dialog
 manual.
 The following features were reimplemented:
@@ -757,8 +899,9 @@ Compatibility is not a priority for future development.
 .An Baptiste Daroussin
 .Aq Mt bapt@FreeBSD.org ,
 .An \&Ed Maste
-.Aq Mt emaste@FreeBSD.org
-and
+.Aq Mt emaste@FreeBSD.org ,
 .An Juraj Lutter
 .Aq Mt otis@FreeBSD.org
+and
+.An Trenton Schulz
 for suggestions, help, and testing.
diff --git a/contrib/bsddialog/utility/bsddialog.c b/contrib/bsddialog/utility/bsddialog.c
new file mode 100644
index 000000000000..d4d1fc3e0f3a
--- /dev/null
+++ b/contrib/bsddialog/utility/bsddialog.c
@@ -0,0 +1,338 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
+ *
+ * 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.
+ */
+
+#include <getopt.h>
+#include <limits.h>
+#include <locale.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <term.h>
+
+#include <bsddialog.h>
+#include <bsddialog_theme.h>
+
+#include "util.h"
+
+#define EXITCODE(retval) (exitcodes[retval + 1].value)
+#define UNUSED_PAR(x) UNUSED_ ## x __attribute__((__unused__))
+
+static void custom_text(struct options *opt, char *text, char *buf);
+
+/* Exit codes */
+struct exitcode {
+	const char *name;
+	int value;
+};
+
+static struct exitcode exitcodes[14] = {
+	{ "BSDDIALOG_ERROR",    255 },
+	{ "BSDDIALOG_OK",         0 },
+	{ "BSDDIALOG_CANCEL",     1 },
+	{ "BSDDIALOG_HELP",       2 },
+	{ "BSDDIALOG_EXTRA",      3 },
+	{ "BSDDIALOG_TIMEOUT",    4 },
+	{ "BSDDIALOG_ESC",        5 },
+	{ "BSDDIALOG_LEFT1",      6 },
+	{ "BSDDIALOG_LEFT2",      7 },
+	{ "BSDDIALOG_LEFT3",      8 },
+	{ "BSDDIALOG_RIGHT1",     9 },
+	{ "BSDDIALOG_RIGHT2",    10 },
+	{ "BSDDIALOG_RIGHT3",    11 },
+	{ "BSDDIALOG_ITEM_HELP",  2 } /* like HELP by default */
+};
+
+void set_exit_code(int lib_retval, int exitcode)
+{
+	exitcodes[lib_retval + 1].value = exitcode;
+}
+
+/* Error */
+void exit_error(bool usage, const char *fmt, ...)
+{
+	va_list arg_ptr;
+
+	if (bsddialog_inmode())
+		bsddialog_end();
+	printf("Error: ");
+	va_start(arg_ptr, fmt);
+	vprintf(fmt, arg_ptr);
+	va_end(arg_ptr);
+	printf(".\n\n");
+	if (usage) {
+		printf("See \'bsddialog --help\' or \'man 1 bsddialog\' ");
+		printf("for more information.\n");
+	}
+
+	exit (EXITCODE(BSDDIALOG_ERROR));
+}
+
+void error_args(const char *dialog, int argc, char **argv)
+{
+	int i;
+
+	if (bsddialog_inmode())
+		bsddialog_end();
+	printf("Error: %s unexpected argument%s:", dialog, argc > 1 ? "s" : "");
+	for (i = 0; i < argc; i++)
+		printf(" \"%s\"", argv[i]);
+	printf(".\n\n");
+	printf("See \'bsddialog --help\' or \'man 1 bsddialog\' ");
+	printf("for more information.\n");
+
+	exit (EXITCODE(BSDDIALOG_ERROR));
+}
+
+/* init */
+static void sigint_handler(int UNUSED_PAR(sig))
+{
+	bsddialog_end();
+
+	exit(EXITCODE(BSDDIALOG_ERROR));
+}
+
+static void start_bsddialog_mode(void)
+{
+	if (bsddialog_inmode())
+		return;
+	if (bsddialog_init() != BSDDIALOG_OK)
+		exit_error(false, bsddialog_geterror());
+
+	signal(SIGINT, sigint_handler);
+}
+
+static void getenv_exitcodes(void)
+{
+	int i;
+	int value;
+	char *envvalue;
+
+	for (i = 0; i < 10; i++) {
+		envvalue = getenv(exitcodes[i].name);
+		if (envvalue == NULL || envvalue[0] == '\0')
+			continue;
+		value = (int)strtol(envvalue, NULL, 10);
+		exitcodes[i].value = value;
+		/* ITEM_HELP follows HELP without explicit setting */
+		if(i == BSDDIALOG_HELP + 1)
+			exitcodes[BSDDIALOG_ITEM_HELP + 1].value = value;
+	}
+}
+
+/*
+ * bsddialog utility: TUI widgets and dialogs.
+ */
+int main(int argc, char *argv[argc])
+{
+	bool startup;
+	int i, rows, cols, retval, parsed, nargc, firstoptind;
+	char *text, **nargv, *pn;
+	struct bsddialog_conf conf;
+	struct options opt;
+
+	setlocale(LC_ALL, "");
+	getenv_exitcodes();
+	firstoptind = optind;
+	pn = argv[0];
+	retval = BSDDIALOG_OK;
+
+	for (i = 0; i < argc; i++) {
+		if (strcmp(argv[i], "--version") == 0) {
+			printf("Version: %s\n", LIBBSDDIALOG_VERSION);
+			return (BSDDIALOG_OK);
+		}
+		if (strcmp(argv[i], "--help") == 0) {
+			usage();
+			return (BSDDIALOG_OK);
+		}
+	}
+
+	startup = true;
+	while (true) {
+		parsed = parseargs(argc, argv, &conf, &opt);
+		nargc = argc - parsed;
+		nargv = argv + parsed;
+		argc = parsed - optind;
+		argv += optind;
+
+		if (opt.mandatory_dialog && opt.dialogbuilder == NULL)
+			exit_error(true, "expected a --<dialog>");
+
+		if (opt.dialogbuilder == NULL && argc > 0)
+			error_args("(no --<dialog>)", argc, argv);
+
+		/* --print-maxsize or --print-version */
+		if (opt.mandatory_dialog == false && opt.clearscreen == false &&
+		    opt.savethemefile == NULL && opt.dialogbuilder == NULL) {
+			retval = BSDDIALOG_OK;
+			break;
+		}
+
+		/* --<dialog>, --save-theme or clear-screen */
+		text = NULL; /* useless inits, fix compiler warnings */
+		rows = BSDDIALOG_AUTOSIZE;
+		cols = BSDDIALOG_AUTOSIZE;
+		if (opt.dialogbuilder != NULL) {
+			if (argc < 3)
+				exit_error(true,
+				    "expected <text> <rows> <cols>");
+			if ((text = strdup(argv[0])) == NULL)
+				exit_error(false, "cannot allocate <text>");
+			if (opt.dialogbuilder != textbox_builder)
+				custom_text(&opt, argv[0], text);
+			rows = (int)strtol(argv[1], NULL, 10);
+			cols = (int)strtol(argv[2], NULL, 10);
+			argc -= 3;
+			argv += 3;
+		}
+
+		/* bsddialog terminal mode (first iteration) */
+		start_bsddialog_mode();
+
+		if (opt.screen_mode != NULL) {
+			opt.screen_mode = tigetstr(opt.screen_mode);
+			if (opt.screen_mode != NULL &&
+			    opt.screen_mode != (char*)-1) {
+				tputs(opt.screen_mode, 1, putchar);
+				fflush(stdout);
+				bsddialog_refresh();
+			}
+		}
+
+		/* theme */
+		if (startup)
+			startuptheme();
+		startup = false;
+		if ((int)opt.theme >= 0)
+			setdeftheme(opt.theme);
+		if (opt.loadthemefile != NULL)
+			loadtheme(opt.loadthemefile, false);
+		if (opt.bikeshed)
+			bikeshed(&conf);
+		if (opt.savethemefile != NULL)
+			savetheme(opt.savethemefile);
+
+		/* backtitle and dialog */
+		if (opt.dialogbuilder == NULL)
+			break;
+		if (opt.backtitle != NULL)
+			if(bsddialog_backtitle(&conf, opt.backtitle))
+				exit_error(false, bsddialog_geterror());
+		retval = opt.dialogbuilder(&conf, text, rows, cols, argc, argv,
+		    &opt);
+		free(text);
+		if (retval == BSDDIALOG_ERROR)
+			exit_error(false, bsddialog_geterror());
+		if (conf.get_height != NULL && conf.get_width != NULL)
+			dprintf(opt.output_fd, "DialogSize: %d, %d\n",
+			    *conf.get_height, *conf.get_width);
+		if (opt.clearscreen)
+			bsddialog_clear(0);
+		opt.clearscreen = false;
+		/* --and-dialog ends loop with Cancel or ESC */
+		if (retval == BSDDIALOG_CANCEL || retval == BSDDIALOG_ESC)
+			break;
+		argc = nargc;
+		argv = nargv;
+		if (argc <= 0)
+			break;
+		/* prepare next parseargs() call */
+		argc++;
+		argv--;
+		argv[0] = pn;
+		optind = firstoptind;
+	}
+
+	if (bsddialog_inmode()) {
+		/* --clear-screen can be a single option */
+		if (opt.clearscreen)
+			bsddialog_clear(0);
+		bsddialog_end();
+	}
+	/* end bsddialog terminal mode */
+
+	return (EXITCODE(retval));
+}
+
+void custom_text(struct options *opt, char *text, char *buf)
+{
+	bool trim, crwrap;
+	int i, j;
+
+	if (strstr(text, "\\n") == NULL) {
+		/* "hasnl" mode */
+		trim = true;
+		crwrap = true;
+	} else {
+		trim = false;
+		crwrap = opt->cr_wrap;
+	}
+	if (opt->text_unchanged) {
+		trim = false;
+		crwrap = true;
+	}
+
+	i = j = 0;
+	while (text[i] != '\0') {
+		switch (text[i]) {
+		case '\\':
+			buf[j] = '\\';
+			switch (text[i+1]) {
+			case 'n': /* implicitly in "hasnl" mode */
+				buf[j] = '\n';
+				i++;
+				if (text[i+1] == '\n')
+					i++;
+				break;
+			case 't':
+				if (opt->tab_escape) {
+					buf[j] = '\t';
+				} else {
+					j++;
+					buf[j] = 't';
+				}
+				i++;
+				break;
+			}
+			break;
+		case '\n':
+			buf[j] = crwrap ? '\n' : ' ';
+			break;
+		case '\t':
+			buf[j] = opt->text_unchanged ? '\t' : ' ';
+			break;
+		default:
+			buf[j] = text[i];
+		}
+		i++;
+		if (!trim || buf[j] != ' ' || j == 0 || buf[j-1] != ' ')
+			j++;
+	}
+	buf[j] = '\0';
+}
diff --git a/contrib/bsddialog/utility/util.h b/contrib/bsddialog/utility/util.h
new file mode 100644
index 000000000000..2750c2ee6951
--- /dev/null
+++ b/contrib/bsddialog/utility/util.h
@@ -0,0 +1,125 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
+ *
+ * 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.
+ */
+
+#ifndef _BSDDIALOG_UTIL_H_
+#define _BSDDIALOG_UTIL_H_
+
+/*
+ * Exit codes and errors, bsddialog.c
+ */
+#define BSDDIALOG_ITEM_HELP 12
+
+void set_exit_code(int lib_retval, int exitcode);
+void exit_error(bool usage, const char *fmt, ...);
+void error_args(const char *dialog, int argc, char **argv);
+
+/*
+ * Command Line, util_cli.c
+ */
+struct options {
+	/* Menus options */
+	bool item_always_quote;
+	char *item_default;
+	bool item_depth;
+	char *item_output_sep;
+	bool item_output_sepnl;
+	bool item_prefix;
+	bool item_singlequote;
+	/* Menus and Forms options */
+	bool help_print_item_name;
+	bool help_print_items;
+	bool item_bottomdesc;
+	/* Forms options */
+	int unsigned max_input_form;
+	/* Date and Time options */
+	char *date_fmt;
+	char *time_fmt;
+	/* General options */
+	int getH;
+	int getW;
+	bool ignore;
+	int output_fd;
+	/* Text option */
+	bool cr_wrap;
+	bool tab_escape;
+	bool text_unchanged;
+	/* Theme and Screen options*/
+	char *backtitle;
+	bool bikeshed;
+	enum bsddialog_default_theme theme;
+	bool clearscreen;
+	char *loadthemefile;
+	char *savethemefile;
+	const char *screen_mode;
+	/* Dialog */
+	bool mandatory_dialog;
+	const char *name;
+	int (*dialogbuilder)(struct bsddialog_conf *conf, char* text, int rows,
+	    int cols, int argc, char **argv, struct options *opt);
+};
+
+void usage(void);
+int
+parseargs(int argc, char **argv, struct bsddialog_conf *conf,
+    struct options *opt);
+
+/*
+ * Dialogs builders, util_builders.c
+ */
+#define BUILDER_ARGS struct bsddialog_conf *conf, char* text, int rows,        \
+	int cols, int argc, char **argv, struct options *opt
+int calendar_builder(BUILDER_ARGS);
+int checklist_builder(BUILDER_ARGS);
+int datebox_builder(BUILDER_ARGS);
+int form_builder(BUILDER_ARGS);
+int gauge_builder(BUILDER_ARGS);
+int infobox_builder(BUILDER_ARGS);
+int inputbox_builder(BUILDER_ARGS);
+int menu_builder(BUILDER_ARGS);
+int mixedform_builder(BUILDER_ARGS);
+int mixedgauge_builder(BUILDER_ARGS);
+int msgbox_builder(BUILDER_ARGS);
+int passwordbox_builder(BUILDER_ARGS);
+int passwordform_builder(BUILDER_ARGS);
+int pause_builder(BUILDER_ARGS);
+int radiolist_builder(BUILDER_ARGS);
+int rangebox_builder(BUILDER_ARGS);
+int textbox_builder(BUILDER_ARGS);
+int timebox_builder(BUILDER_ARGS);
+int treeview_builder(BUILDER_ARGS);
+int yesno_builder(BUILDER_ARGS);
+
+/*
+ * Theme, util_theme.c
+ */
+void savetheme(const char *file);
+void loadtheme(const char *file, bool compatibility);
+void setdeftheme(enum bsddialog_default_theme theme);
+void bikeshed(struct bsddialog_conf *conf);
+void startuptheme(void);
+
+#endif
diff --git a/contrib/bsddialog/utility/util_builders.c b/contrib/bsddialog/utility/util_builders.c
new file mode 100644
index 000000000000..2dfa20cb0f86
--- /dev/null
+++ b/contrib/bsddialog/utility/util_builders.c
@@ -0,0 +1,768 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
+ *
+ * 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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <bsddialog.h>
+#include <bsddialog_theme.h>
+
+#include "util.h"
+
+#define NO_PRINT_VALUES(rv)                                                    \
+(rv == BSDDIALOG_ERROR || rv == BSDDIALOG_CANCEL || rv == BSDDIALOG_ESC)
+
+/* message */
+int infobox_builder(BUILDER_ARGS)
+{
+	if (argc > 0)
+		error_args(opt->name, argc, argv);
+
+	return (bsddialog_infobox(conf, text, rows, cols));
+}
+
+int msgbox_builder(BUILDER_ARGS)
+{
+	if (argc > 0)
+		error_args(opt->name, argc, argv);
+
+	return (bsddialog_msgbox(conf, text, rows, cols));
+}
+
+int yesno_builder(BUILDER_ARGS)
+{
+	if (argc > 0)
+		error_args(opt->name, argc, argv);
+
+	return (bsddialog_yesno(conf, text, rows, cols));
+}
+
+/* textbox */
+int textbox_builder(BUILDER_ARGS)
+{
+	if (argc > 0)
+		error_args(opt->name, argc, argv);
+
+	return (bsddialog_textbox(conf, text, rows, cols));
+}
+
+/* bar */
+int gauge_builder(BUILDER_ARGS)
+{
+	int output;
+	unsigned int perc;
+
+	perc = 0;
+	if (argc == 1) {
+		perc = (u_int)strtoul(argv[0], NULL, 10);
+		perc = perc > 100 ? 100 : perc;
+	} else if (argc > 1) {
+		error_args(opt->name, argc - 1, argv + 1);
+	}
+
+	output = bsddialog_gauge(conf, text, rows, cols, perc, STDIN_FILENO,
+	    "XXX", "EOF");
+
+	return (output);
+}
+
+int mixedgauge_builder(BUILDER_ARGS)
+{
+	int output, *minipercs;
+	unsigned int i, mainperc, nminibars;
+	const char **minilabels;
+
+	if (argc < 1)
+		exit_error(true, "%s missing <mainperc>", opt->name);
+	if (((argc-1) % 2) != 0)
+		exit_error(true,
+		    "bad %s pair number [<minilabel> <miniperc>]", opt->name);
+
+	mainperc = (u_int)strtoul(argv[0], NULL, 10);
+	mainperc = mainperc > 100 ? 100 : mainperc;
+	argc--;
+	argv++;
+
+	nminibars  = argc / 2;
+	if ((minilabels = calloc(nminibars, sizeof(char*))) == NULL)
+		exit_error(false, "Cannot allocate memory for minilabels");
+	if ((minipercs = calloc(nminibars, sizeof(int))) == NULL)
+		exit_error(false, "Cannot allocate memory for minipercs");
+
+	for (i = 0; i < nminibars; i++) {
+		minilabels[i] = argv[i * 2];
+		minipercs[i] = (int)strtol(argv[i * 2 + 1], NULL, 10);
+	}
+
+	output = bsddialog_mixedgauge(conf, text, rows, cols, mainperc,
+	    nminibars, minilabels, minipercs);
+
+	return (output);
+}
+
+int pause_builder(BUILDER_ARGS)
+{
+	int output;
+	unsigned int secs;
+
+	if (argc == 0)
+		exit_error(true, "--pause missing <seconds>");
+	if (argc > 1)
+		error_args(opt->name, argc - 1, argv + 1);
+
+	secs = (u_int)strtoul(argv[0], NULL, 10);
+	output = bsddialog_pause(conf, text, rows, cols, &secs);
+
+	return (output);
+}
+
+int rangebox_builder(BUILDER_ARGS)
+{
+	int output, min, max, value;
+
+	if (argc < 2)
+		exit_error(true, "--rangebox missing <min> <max> [<init>]");
+	if (argc > 3)
+		error_args("--rangebox", argc - 3, argv + 3);
+
+	min = (int)strtol(argv[0], NULL, 10);
+	max = (int)strtol(argv[1], NULL, 10);
+
+	if (argc == 3) {
+		value = (int)strtol(argv[2], NULL, 10);
+		value = value < min ? min : value;
+		value = value > max ? max : value;
+	} else
+		value = min;
+
+	output = bsddialog_rangebox(conf, text, rows, cols, min, max, &value);
+	if (NO_PRINT_VALUES(output) == false)
+		dprintf(opt->output_fd, "%d", value);
+
+	return (output);
+}
+
+/* date and time */
+static int date(BUILDER_ARGS)
+{
+	int rv;
+	unsigned int yy, mm, dd;
+	time_t cal;
+	struct tm *localtm;
+	char stringdate[1024];
+
+	time(&cal);
+	localtm = localtime(&cal);
+	yy = localtm->tm_year + 1900;
+	mm = localtm->tm_mon + 1;
+	dd = localtm->tm_mday;
+
+	if (argc > 3) {
+		error_args(opt->name, argc - 3, argv + 3);
+	} else if (argc == 3) {
+		/* lib checks/sets max and min */
+		dd = (u_int)strtoul(argv[0], NULL, 10);
+		mm = (u_int)strtoul(argv[1], NULL, 10);
+		yy = (u_int)strtoul(argv[2], NULL, 10);
+	}
+
+	if (strcmp(opt->name, "--datebox") == 0)
+		rv = bsddialog_datebox(conf, text, rows, cols, &yy, &mm, &dd);
+	else
+		rv = bsddialog_calendar(conf, text, rows, cols, &yy, &mm, &dd);
+	if (NO_PRINT_VALUES(rv))
+		return (rv);
+
+	if (opt->date_fmt != NULL) {
+		time(&cal);
+		localtm = localtime(&cal);
+		localtm->tm_year = yy - 1900;
+		localtm->tm_mon = mm - 1;
+		localtm->tm_mday = dd;
+		strftime(stringdate, 1024, opt->date_fmt, localtm);
+		dprintf(opt->output_fd, "%s", stringdate);
+	} else if (opt->bikeshed && ~dd & 1) {
+		dprintf(opt->output_fd, "%u/%u/%u", dd, mm, yy);
+	} else {
+		dprintf(opt->output_fd, "%02u/%02u/%u", dd, mm, yy);
+	}
+
+	return (rv);
+}
+
+int calendar_builder(BUILDER_ARGS)
+{
+	/* Use height autosizing with rows = 2. Documented in bsddialog(1).
+	 *
+	 * f_dialog_calendar_size() in bsdconfig/share/dialog.subr:1352
+	 * computes height 2 for `dialog --calendar', called by:
+	 * 1) f_dialog_input_expire_password() in
+	 * bsdconfig/usermgmt/share/user_input.subr:517 and
+	 * 2) f_dialog_input_expire_account() in
+	 * bsdconfig/usermgmt/share/user_input.subr:660.
+	 *
+	 * Then use height autosizing with 2 that is min height like dialog.
+	 */
+	if (rows == 2)
+		rows = 0;
+
+	return (date(conf, text, rows, cols, argc, argv, opt));
+}
+
+int datebox_builder(BUILDER_ARGS)
+{
+	return (date(conf, text, rows, cols, argc, argv, opt));
+}
+
+int timebox_builder(BUILDER_ARGS)
+{
+	int output;
+	unsigned int hh, mm, ss;
+	time_t clock;
+	struct tm *localtm;
+	char stringtime[1024];
+
+	time(&clock);
+	localtm = localtime(&clock);
+	hh = localtm->tm_hour;
+	mm = localtm->tm_min;
+	ss = localtm->tm_sec;
+
+	if (argc > 3) {
+		error_args("--timebox", argc - 3, argv + 3);
+	} else if (argc == 3) {
+		hh = (u_int)strtoul(argv[0], NULL, 10);
+		mm = (u_int)strtoul(argv[1], NULL, 10);
+		ss = (u_int)strtoul(argv[2], NULL, 10);
+	}
+
+	output = bsddialog_timebox(conf, text, rows, cols, &hh, &mm, &ss);
+	if (NO_PRINT_VALUES(output))
+		return (output);
+
+	if (opt->time_fmt != NULL) {
+		time(&clock);
+		localtm = localtime(&clock);
+		localtm->tm_hour = hh;
+		localtm->tm_min = mm;
+		localtm->tm_sec = ss;
+		strftime(stringtime, 1024, opt->time_fmt, localtm);
+		dprintf(opt->output_fd, "%s", stringtime);
+	} else if (opt->bikeshed && ~ss & 1) {
+		dprintf(opt->output_fd, "%u:%u:%u", hh, mm, ss);
+	} else {
+		dprintf(opt->output_fd, "%02u:%02u:%02u", hh, mm, ss);
+	}
+
+	return (output);
+}
+
+/* menu */
+static void
+get_menu_items(int argc, char **argv, bool setprefix, bool setdepth,
+    bool setname, bool setdesc, bool setstatus, bool sethelp,
+    unsigned int *nitems, struct bsddialog_menuitem **items, int *focusitem,
+    struct options *opt)
+{
+	unsigned int i, j, sizeitem;
+
+	*focusitem = -1;
+
+	sizeitem = 0;
+	sizeitem += setprefix ? 1 : 0;
+	sizeitem += setdepth  ? 1 : 0;
+	sizeitem += setname   ? 1 : 0;
+	sizeitem += setdesc   ? 1 : 0;
+	sizeitem += setstatus ? 1 : 0;
+	sizeitem += sethelp   ? 1 : 0;
+	if ((argc % sizeitem) != 0)
+		exit_error(true, "%s bad arguments items number", opt->name);
+
+	*nitems = argc / sizeitem;
+	*items = calloc(*nitems, sizeof(struct bsddialog_menuitem));
+	if (items == NULL)
+		exit_error(false, "%s cannot allocate items", opt->name);
+
+	j = 0;
+	for (i = 0; i < *nitems; i++) {
+		(*items)[i].prefix = setprefix ? argv[j++] : "";
+		(*items)[i].depth = setdepth ?
+		    (u_int)strtoul(argv[j++], NULL, 0) : 0;
+		(*items)[i].name = setname ? argv[j++] : "";
+		(*items)[i].desc = setdesc ? argv[j++] : "";
+		if (setstatus) {
+			if (strcasecmp(argv[j], "on") == 0)
+				(*items)[i].on = true;
+			else if (strcasecmp(argv[j], "off") == 0)
+				(*items)[i].on = false;
+			else
+				exit_error(true,
+				    "\"%s\" (item %i) invalid status \"%s\"",
+				    (*items)[i].name, i+1, argv[j]);
+			j++;
+		} else
+			(*items)[i].on = false;
+		(*items)[i].bottomdesc = sethelp ? argv[j++] : "";
+
+		if (opt->item_default != NULL && *focusitem == -1)
+			if (strcmp((*items)[i].name, opt->item_default) == 0)
+				*focusitem = i;
+	}
+}
+
+static void
+print_menu_items(int output, int nitems, struct bsddialog_menuitem *items,
+    int focusitem, struct options *opt)
+{
+	bool sep, sepbefore, sepafter, sepsecond, toquote, ismenu, ischecklist;
+	int i;
+	char quotech;
+	const char *focusname, *sepstr;
+
+	ismenu = (strcmp(opt->name, "--menu") == 0) ? true : false;
+	ischecklist = (strcmp(opt->name, "--checklist") == 0) ? true : false;
+	sep = false;
+	quotech = opt->item_singlequote ? '\'' : '"';
+
+	if (NO_PRINT_VALUES(output))
+		return;
+
+	if (output == BSDDIALOG_HELP) {
+		dprintf(opt->output_fd, "HELP ");
+
+		if (focusitem >= 0) {
+			focusname = items[focusitem].name;
+			if (opt->item_bottomdesc &&
+			    opt->help_print_item_name == false)
+				focusname = items[focusitem].bottomdesc;
+
+			toquote = false;
+			if (strchr(focusname, ' ') != NULL) {
+				toquote = opt->item_always_quote;
+				if (ismenu == false &&
+				    opt->item_output_sepnl == false)
+					toquote = true;
+			}
+			if (toquote) {
+				dprintf(opt->output_fd, "%c%s%c",
+				    quotech, focusname, quotech);
+			} else
+				dprintf(opt->output_fd, "%s", focusname);
+		}
+
+		if (ismenu || opt->help_print_items == false)
+			return;
+		sep = true;
+	}
+
+	sepbefore = false;
+	sepsecond = false;
+	if ((sepstr = opt->item_output_sep) == NULL) {
+		if (opt->item_output_sepnl)
+			sepstr = "\n";
+		else {
+			sepstr = " ";
+			sepsecond = true;
+		}
+	} else
+		sepbefore = true;
+
+	sepafter = false;
+	if (opt->item_output_sepnl) {
+		sepbefore = false;
+		sepafter = true;
+	}
+
+	for (i = 0; i < nitems; i++) {
+		if (items[i].on == false)
+			continue;
+
+		if (sep || sepbefore)
+			dprintf(opt->output_fd, "%s", sepstr);
+		sep = false;
+		if (sepsecond)
+			sep = true;
+
+		toquote = false;
+		if (strchr(items[i].name, ' ') != NULL) {
+			toquote = opt->item_always_quote;
+			if (ischecklist && opt->item_output_sepnl == false)
+				toquote = true;
+		}
+		if (toquote)
+			dprintf(opt->output_fd, "%c%s%c",
+			    quotech, items[i].name, quotech);
+		else
+			dprintf(opt->output_fd, "%s", items[i].name);
+
+		if (sepafter)
+			dprintf(opt->output_fd, "%s", sepstr);
+	}
+}
+
+int checklist_builder(BUILDER_ARGS)
+{
+	int output, focusitem;
+	unsigned int menurows, nitems;
+	struct bsddialog_menuitem *items;
+
+	if (argc < 1)
+		exit_error(true, "--checklist missing <menurows>");
+	menurows = (u_int)strtoul(argv[0], NULL, 10);
+
+	get_menu_items(argc-1, argv+1, opt->item_prefix, opt->item_depth, true,
+	    true, true, opt->item_bottomdesc, &nitems, &items, &focusitem, opt);
+
+	output = bsddialog_checklist(conf, text, rows, cols, menurows, nitems,
+	    items, &focusitem);
+
+	print_menu_items(output, nitems, items, focusitem, opt);
+	free(items);
+
+	if (output == BSDDIALOG_HELP && opt->item_bottomdesc)
+		output = BSDDIALOG_ITEM_HELP;
+
+	return (output);
+}
+
+int menu_builder(BUILDER_ARGS)
+{
+	int output, focusitem;
+	unsigned int menurows, nitems;
+	struct bsddialog_menuitem *items;
+
+	if (argc < 1)
+		exit_error(true, "--menu missing <menurows>");
+	menurows = (u_int)strtoul(argv[0], NULL, 10);
+
+	get_menu_items(argc-1, argv+1, opt->item_prefix, opt->item_depth, true,
+	    true, false, opt->item_bottomdesc, &nitems, &items, &focusitem,
+	    opt);
+
+	output = bsddialog_menu(conf, text, rows, cols, menurows, nitems,
+	    items, &focusitem);
+
+	print_menu_items(output, nitems, items, focusitem, opt);
+	free(items);
+
+	if (output == BSDDIALOG_HELP && opt->item_bottomdesc)
+		output = BSDDIALOG_ITEM_HELP;
+
+	return (output);
+}
+
+int radiolist_builder(BUILDER_ARGS)
+{
+	int output, focusitem;
+	unsigned int menurows, nitems;
+	struct bsddialog_menuitem *items;
+
+	if (argc < 1)
+		exit_error(true, "--radiolist missing <menurows>");
+	menurows = (u_int)strtoul(argv[0], NULL, 10);
+
+	get_menu_items(argc-1, argv+1, opt->item_prefix, opt->item_depth, true,
+	    true, true, opt->item_bottomdesc, &nitems, &items, &focusitem, opt);
+
+	output = bsddialog_radiolist(conf, text, rows, cols, menurows, nitems,
+	    items, &focusitem);
+
+	print_menu_items(output, nitems, items, focusitem, opt);
+	free(items);
+
+	if (output == BSDDIALOG_HELP && opt->item_bottomdesc)
+		output = BSDDIALOG_ITEM_HELP;
+
+	return (output);
+}
+
+int treeview_builder(BUILDER_ARGS)
+{
+	int output, focusitem;
+	unsigned int menurows, nitems;
+	struct bsddialog_menuitem *items;
+
+	if (argc < 1)
+		exit_error(true, "--treeview missing <menurows>");
+	menurows = (u_int)strtoul(argv[0], NULL, 10);
+
+	get_menu_items(argc-1, argv+1, opt->item_prefix, true, true, true, true,
+	    opt->item_bottomdesc, &nitems, &items, &focusitem, opt);
+
+	conf->menu.no_name = true;
+	conf->menu.align_left = true;
+
+	output = bsddialog_radiolist(conf, text, rows, cols, menurows, nitems,
+	    items, &focusitem);
+
+	print_menu_items(output, nitems, items, focusitem, opt);
+	free(items);
+
+	if (output == BSDDIALOG_HELP && opt->item_bottomdesc)
+		output = BSDDIALOG_ITEM_HELP;
+
+	return (output);
+}
+
+/* form */
+static void
+print_form_items(int output, int nitems, struct bsddialog_formitem *items,
+    int focusitem, struct options *opt)
+{
+	int i;
+	const char *helpname;
+
+	if (NO_PRINT_VALUES(output))
+		return;
+
+	if (output == BSDDIALOG_HELP) {
+		dprintf(opt->output_fd, "HELP");
+		if (focusitem >= 0) {
+			helpname = items[focusitem].label;
+			if (opt->item_bottomdesc &&
+			    opt->help_print_item_name == false)
+				helpname = items[focusitem].bottomdesc;
+			dprintf(opt->output_fd, " %s", helpname);
+		}
+		if(opt->help_print_items == false)
+			return;
+		dprintf(opt->output_fd, "\n");
+	}
+
+	for (i = 0; i < nitems; i++) {
+		dprintf(opt->output_fd, "%s\n", items[i].value);
+		free(items[i].value);
+	}
+}
+
+int form_builder(BUILDER_ARGS)
+{
+	int output, fieldlen, valuelen, focusitem;
+	unsigned int i, j, flags, formheight, nitems, sizeitem;
+	struct bsddialog_formitem *items;
+
+	if (argc < 1)
+		exit_error(true, "--form missing <formheight>");
+	formheight = (u_int)strtoul(argv[0], NULL, 10);
+
+	argc--;
+	argv++;
+	sizeitem = opt->item_bottomdesc ? 9 : 8;
+	if (argc % sizeitem != 0)
+		exit_error(true, "--form bad number of arguments items");
+
+	nitems = argc / sizeitem;
+	if ((items = calloc(nitems, sizeof(struct bsddialog_formitem))) == NULL)
+		exit_error(false, "cannot allocate memory for form items");
+	j = 0;
+	for (i = 0; i < nitems; i++) {
+		items[i].label	= argv[j++];
+		items[i].ylabel = (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].xlabel = (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].init	= argv[j++];
+		items[i].yfield	= (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].xfield	= (u_int)strtoul(argv[j++], NULL, 10);
+
+		fieldlen = (int)strtol(argv[j++], NULL, 10);
+		items[i].fieldlen = abs(fieldlen);
+
+		valuelen = (int)strtol(argv[j++], NULL, 10);
+		items[i].maxvaluelen = valuelen == 0 ? abs(fieldlen) : valuelen;
+
+		flags = (fieldlen < 0 ? BSDDIALOG_FIELDREADONLY : 0);
+		items[i].flags = flags;
+
+		items[i].bottomdesc = opt->item_bottomdesc ? argv[j++] : "";
+	}
+
+	focusitem = -1;
+	output = bsddialog_form(conf, text, rows, cols, formheight, nitems,
+	    items, &focusitem);
+	print_form_items(output, nitems, items, focusitem, opt);
+	free(items);
+
+	if (output == BSDDIALOG_HELP && opt->item_bottomdesc)
+		output = BSDDIALOG_ITEM_HELP;
+
+	return (output);
+}
+
+int inputbox_builder(BUILDER_ARGS)
+{
+	int output;
+	struct bsddialog_formitem item;
+
+	if (argc > 1)
+		error_args("--inputbox", argc - 1, argv + 1);
+
+	item.label	 = "";
+	item.ylabel	 = 0;
+	item.xlabel	 = 0;
+	item.init	 = argc > 0 ? argv[0] : "";
+	item.yfield	 = 0;
+	item.xfield	 = 0;
+	item.fieldlen    = 1;
+	item.maxvaluelen = opt->max_input_form;
+	item.flags	 = BSDDIALOG_FIELDNOCOLOR;
+	item.flags      |= BSDDIALOG_FIELDCURSOREND;
+	item.flags      |= BSDDIALOG_FIELDEXTEND;
+	item.bottomdesc  = "";
+
+	output = bsddialog_form(conf, text, rows, cols, 1, 1, &item, NULL);
+	print_form_items(output, 1, &item, -1, opt);
+
+	return (output);
+}
+
+int mixedform_builder(BUILDER_ARGS)
+{
+	int output, focusitem;
+	unsigned int i, j, formheight, nitems, sizeitem;
+	struct bsddialog_formitem *items;
+
+	if (argc < 1)
+		exit_error(true, "--mixedform missing <formheight>");
+	formheight = (u_int)strtoul(argv[0], NULL, 10);
+
+	argc--;
+	argv++;
+	sizeitem = opt->item_bottomdesc ? 10 : 9;
+	if (argc % sizeitem != 0)
+		exit_error(true, "--mixedform bad number of arguments items");
+
+	nitems = argc / sizeitem;
+	if ((items = calloc(nitems, sizeof(struct bsddialog_formitem))) == NULL)
+		exit_error(false, "cannot allocate memory for form items");
+	j = 0;
+	for (i = 0; i < nitems; i++) {
+		items[i].label	     = argv[j++];
+		items[i].ylabel      = (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].xlabel      = (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].init	     = argv[j++];
+		items[i].yfield	     = (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].xfield	     = (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].fieldlen    = (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].maxvaluelen = (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].flags       = (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].bottomdesc  = opt->item_bottomdesc ? argv[j++] : "";
+	}
+
+	focusitem = -1;
+	output = bsddialog_form(conf, text, rows, cols, formheight, nitems,
+	    items, &focusitem);
+	print_form_items(output, nitems, items, focusitem, opt);
+	free(items);
+
+	if (output == BSDDIALOG_HELP && opt->item_bottomdesc)
+		output = BSDDIALOG_ITEM_HELP;
+
+	return (output);
+}
+
+int passwordbox_builder(BUILDER_ARGS)
+{
+	int output;
+	struct bsddialog_formitem item;
+
+	if (argc > 1)
+		error_args("--passwordbox", argc - 1, argv + 1);
+
+	item.label	 = "";
+	item.ylabel	 = 0;
+	item.xlabel	 = 0;
+	item.init	 = argc > 0 ? argv[0] : "";
+	item.yfield	 = 0;
+	item.xfield	 = 0;
+	item.fieldlen	 = 1;
+	item.maxvaluelen = opt->max_input_form;
+	item.flags       = BSDDIALOG_FIELDHIDDEN;
+	item.flags      |= BSDDIALOG_FIELDNOCOLOR;
+	item.flags      |= BSDDIALOG_FIELDCURSOREND;
+	item.flags      |= BSDDIALOG_FIELDEXTEND;
+	item.bottomdesc  = "";
+
+	output = bsddialog_form(conf, text, rows, cols, 1, 1, &item, NULL);
+	print_form_items(output, 1, &item, -1, opt);
+
+	return (output);
+}
+
+int passwordform_builder(BUILDER_ARGS)
+{
+	int output, fieldlen, valuelen, focusitem;
+	unsigned int i, j, flags, formheight, nitems, sizeitem;
+	struct bsddialog_formitem *items;
+
+	if (argc < 1)
+		exit_error(true, "--passwordform missing <formheight>");
+	formheight = (u_int)strtoul(argv[0], NULL, 10);
+
+	argc--;
+	argv++;
+	sizeitem = opt->item_bottomdesc ? 9 : 8;
+	if (argc % sizeitem != 0)
+		exit_error(true, "--passwordform bad arguments items number");
+
+	flags = BSDDIALOG_FIELDHIDDEN;
+	nitems = argc / sizeitem;
+	if ((items = calloc(nitems, sizeof(struct bsddialog_formitem))) == NULL)
+		exit_error(false, "cannot allocate memory for form items");
+	j = 0;
+	for (i = 0; i < nitems; i++) {
+		items[i].label	= argv[j++];
+		items[i].ylabel = (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].xlabel = (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].init	= argv[j++];
+		items[i].yfield	= (u_int)strtoul(argv[j++], NULL, 10);
+		items[i].xfield	= (u_int)strtoul(argv[j++], NULL, 10);
+
+		fieldlen = (int)strtol(argv[j++], NULL, 10);
+		items[i].fieldlen = abs(fieldlen);
+
+		valuelen = (int)strtol(argv[j++], NULL, 10);
+		items[i].maxvaluelen = valuelen == 0 ? abs(fieldlen) : valuelen;
+
+		flags |= (fieldlen < 0 ? BSDDIALOG_FIELDREADONLY : 0);
+		items[i].flags = flags;
+
+		items[i].bottomdesc  = opt->item_bottomdesc ? argv[j++] : "";
+	}
+
+	focusitem = -1;
+	output = bsddialog_form(conf, text, rows, cols, formheight, nitems,
+	    items, &focusitem);
+	print_form_items(output, nitems, items, focusitem, opt);
+	free(items);
+
+	if (output == BSDDIALOG_HELP && opt->item_bottomdesc)
+		output = BSDDIALOG_ITEM_HELP;
+
+	return (output);
+}
diff --git a/contrib/bsddialog/utility/util_cli.c b/contrib/bsddialog/utility/util_cli.c
new file mode 100644
index 000000000000..2d042aa18487
--- /dev/null
+++ b/contrib/bsddialog/utility/util_cli.c
@@ -0,0 +1,851 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2021-2023 Alfonso Sabato Siciliano
+ *
+ * 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.
+ */
+
+#include <sys/ioctl.h>
+
+#include <getopt.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <bsddialog.h>
+#include <bsddialog_theme.h>
+
+#include "util.h"
+
+enum OPTS {
+	/* Options */
+	ALTERNATE_SCREEN = '?' + 1,
+	AND_DIALOG,
+	ASCII_LINES,
+	AUTO_TRUNCATE,
+	BACKTITLE,
+	BEGIN_X,
+	BEGIN_Y,
+	BIKESHED,
+	CANCEL_EXIT_CODE,
+	CANCEL_LABEL,
+	CLEAR_DIALOG,
+	CLEAR_SCREEN,
+	COLUMNS_PER_ROW,
+	CR_WRAP,
+	DATEBOX_FORMAT,
+	DATE_FORMAT,
+	DEFAULT_BUTTON,
+	DEFAULT_ITEM,
+	DEFAULT_NO,
+	DISABLE_ESC,
+	ERROR_EXIT_CODE,
+	ESC_EXIT_CODE,
+	EXIT_LABEL,
+	EXTRA_BUTTON,
+	EXTRA_EXIT_CODE,
+	EXTRA_LABEL,
+	HELP_BUTTON,
+	HELP_EXIT_CODE,
+	HELP_LABEL,
+	HELP_PRINT_ITEMS,
+	HELP_PRINT_NAME,
+	HFILE,
+	HLINE,
+	HMSG,
+	IGNORE,
+	INSECURE,
+	ITEM_BOTTOM_DESC,
+	ITEM_DEPTH,
+	ITEM_PREFIX,
+	LEFT1_BUTTON,
+	LEFT1_EXIT_CODE,
+	LEFT2_BUTTON,
+	LEFT2_EXIT_CODE,
+	LEFT3_BUTTON,
+	LEFT3_EXIT_CODE,
+	LOAD_THEME,
+	MAX_INPUT,
+	NO_AUTO_TRUNCATE,
+	NO_CANCEL,
+	NO_DESCRIPTIONS,
+	NO_LINES,
+	NO_NAMES,
+	NO_OK,
+	NO_SHADOW,
+	NORMAL_SCREEN,
+	OK_EXIT_CODE,
+	OK_LABEL,
+	OUTPUT_FD,
+	OUTPUT_SEPARATOR,
+	PRINT_MAXSIZE,
+	PRINT_SIZE,
+	PRINT_VERSION,
+	QUOTED,
+	RIGHT1_BUTTON,
+	RIGHT1_EXIT_CODE,
+	RIGHT2_BUTTON,
+	RIGHT2_EXIT_CODE,
+	RIGHT3_BUTTON,
+	RIGHT3_EXIT_CODE,
+	SAVE_THEME,
+	SEPARATE_OUTPUT,
+	SHADOW,
+	SINGLE_QUOTED,
+	SLEEP,
+	STDERR,
+	STDOUT,
+	SWITCH_BUTTONS,
+	TAB_ESCAPE,
+	TAB_LEN,
+	TEXT_ESCAPE,
+	TEXT_UNCHANGED,
+	THEME,
+	TIMEOUT_EXIT_CODE,
+	TIME_FORMAT,
+	TITLE,
+	/* Dialogs */
+	CALENDAR,
+	CHECKLIST,
+	DATEBOX,
+	FORM,
+	GAUGE,
+	INFOBOX,
+	INPUTBOX,
+	MENU,
+	MIXEDFORM,
+	MIXEDGAUGE,
+	MSGBOX,
+	PASSWORDBOX,
+	PASSWORDFORM,
+	PAUSE,
+	RADIOLIST,
+	RANGEBOX,
+	TEXTBOX,
+	TIMEBOX,
+	TREEVIEW,
+	YESNO
+};
+
+/* options descriptor */
+static struct option longopts[] = {
+	/* Options */
+	{"alternate-screen",  no_argument,       NULL, ALTERNATE_SCREEN},
+	{"and-dialog",        no_argument,       NULL, AND_DIALOG},
+	{"and-widget",        no_argument,       NULL, AND_DIALOG},
+	{"ascii-lines",       no_argument,       NULL, ASCII_LINES},
+	{"auto-truncate",     no_argument,       NULL, AUTO_TRUNCATE},
+	{"backtitle",         required_argument, NULL, BACKTITLE},
+	{"begin-x",           required_argument, NULL, BEGIN_X},
+	{"begin-y",           required_argument, NULL, BEGIN_Y},
+	{"bikeshed",          no_argument,       NULL, BIKESHED},
+	{"cancel-exit-code",  required_argument, NULL, CANCEL_EXIT_CODE},
+	{"cancel-label",      required_argument, NULL, CANCEL_LABEL},
+	{"clear",             no_argument,       NULL, CLEAR_SCREEN},
+	{"clear-dialog",      no_argument,       NULL, CLEAR_DIALOG},
+	{"clear-screen",      no_argument,       NULL, CLEAR_SCREEN},
+	{"colors",            no_argument,       NULL, TEXT_ESCAPE},
+	{"columns-per-row",   required_argument, NULL, COLUMNS_PER_ROW},
+	{"cr-wrap",           no_argument,       NULL, CR_WRAP},
+	{"datebox-format",    required_argument, NULL, DATEBOX_FORMAT},
+	{"date-format",       required_argument, NULL, DATE_FORMAT},
+	{"defaultno",         no_argument,       NULL, DEFAULT_NO},
+	{"default-button",    required_argument, NULL, DEFAULT_BUTTON},
+	{"default-item",      required_argument, NULL, DEFAULT_ITEM},
+	{"default-no",        no_argument,       NULL, DEFAULT_NO},
+	{"disable-esc",       no_argument,       NULL, DISABLE_ESC},
+	{"error-exit-code",   required_argument, NULL, ERROR_EXIT_CODE},
+	{"esc-exit-code",     required_argument, NULL, ESC_EXIT_CODE},
+	{"exit-label",        required_argument, NULL, EXIT_LABEL},
+	{"extra-button",      no_argument,       NULL, EXTRA_BUTTON},
+	{"extra-exit-code",   required_argument, NULL, EXTRA_EXIT_CODE},
+	{"extra-label",       required_argument, NULL, EXTRA_LABEL},
+	{"help-button",       no_argument,       NULL, HELP_BUTTON},
+	{"help-exit-code",    required_argument, NULL, HELP_EXIT_CODE},
+	{"help-label",        required_argument, NULL, HELP_LABEL},
+	{"help-print-items",  no_argument,       NULL, HELP_PRINT_ITEMS},
+	{"help-print-name",   no_argument,       NULL, HELP_PRINT_NAME},
+	{"help-status",       no_argument,       NULL, HELP_PRINT_ITEMS},
+	{"help-tags",         no_argument,       NULL, HELP_PRINT_NAME},
+	{"hfile",             required_argument, NULL, HFILE},
+	{"hline",             required_argument, NULL, HLINE},
+	{"hmsg",              required_argument, NULL, HMSG},
+	{"ignore",            no_argument,       NULL, IGNORE},
+	{"insecure",          no_argument,       NULL, INSECURE},
+	{"item-bottom-desc",  no_argument,       NULL, ITEM_BOTTOM_DESC},
+	{"item-depth",        no_argument,       NULL, ITEM_DEPTH},
+	{"item-help",         no_argument,       NULL, ITEM_BOTTOM_DESC},
+	{"item-prefix",       no_argument,       NULL, ITEM_PREFIX},
+	{"keep-tite",         no_argument,       NULL, ALTERNATE_SCREEN},
+	{"left1-button",      required_argument, NULL, LEFT1_BUTTON},
+	{"left1-exit-code",   required_argument, NULL, LEFT1_EXIT_CODE},
+	{"left2-button",      required_argument, NULL, LEFT2_BUTTON},
+	{"left2-exit-code",   required_argument, NULL, LEFT2_EXIT_CODE},
+	{"left3-button",      required_argument, NULL, LEFT3_BUTTON},
+	{"left3-exit-code",   required_argument, NULL, LEFT3_EXIT_CODE},
+	{"load-theme",        required_argument, NULL, LOAD_THEME},
+	{"max-input",         required_argument, NULL, MAX_INPUT},
+	{"no-auto-truncate",  no_argument,       NULL, NO_AUTO_TRUNCATE},
+	{"no-cancel",         no_argument,       NULL, NO_CANCEL},
+	{"nocancel",          no_argument,       NULL, NO_CANCEL},
+	{"no-descriptions",   no_argument,       NULL, NO_DESCRIPTIONS},
+	{"no-items",          no_argument,       NULL, NO_DESCRIPTIONS},
+	{"no-label",          required_argument, NULL, CANCEL_LABEL},
+	{"no-lines",          no_argument,       NULL, NO_LINES},
+	{"no-names",          no_argument,       NULL, NO_NAMES},
+	{"no-ok",             no_argument,       NULL, NO_OK},
+	{"nook",              no_argument,       NULL, NO_OK},
+	{"no-shadow",         no_argument,       NULL, NO_SHADOW},
+	{"no-tags",           no_argument,       NULL, NO_NAMES},
+	{"normal-screen",     no_argument,       NULL, NORMAL_SCREEN},
+	{"ok-exit-code",      required_argument, NULL, OK_EXIT_CODE},
+	{"ok-label",          required_argument, NULL, OK_LABEL},
+	{"output-fd",         required_argument, NULL, OUTPUT_FD},
+	{"output-separator",  required_argument, NULL, OUTPUT_SEPARATOR},
+	{"print-maxsize",     no_argument,       NULL, PRINT_MAXSIZE},
+	{"print-size",        no_argument,       NULL, PRINT_SIZE},
+	{"print-version",     no_argument,       NULL, PRINT_VERSION},
+	{"quoted",            no_argument,       NULL, QUOTED},
+	{"right1-button",     required_argument, NULL, RIGHT1_BUTTON},
+	{"right1-exit-code",  required_argument, NULL, RIGHT1_EXIT_CODE},
+	{"right2-button",     required_argument, NULL, RIGHT2_BUTTON},
+	{"right2-exit-code",  required_argument, NULL, RIGHT2_EXIT_CODE},
+	{"right3-button",     required_argument, NULL, RIGHT3_BUTTON},
+	{"right3-exit-code",  required_argument, NULL, RIGHT3_EXIT_CODE},
+	{"save-theme",        required_argument, NULL, SAVE_THEME},
+	{"separate-output",   no_argument,       NULL, SEPARATE_OUTPUT},
+	{"separator",         required_argument, NULL, OUTPUT_SEPARATOR},
+	{"shadow",            no_argument,       NULL, SHADOW},
+	{"single-quoted",     no_argument,       NULL, SINGLE_QUOTED},
+	{"sleep",             required_argument, NULL, SLEEP},
+	{"stderr",            no_argument,       NULL, STDERR},
+	{"stdout",            no_argument,       NULL, STDOUT},
+	{"switch-buttons",    no_argument,       NULL, SWITCH_BUTTONS},
+	{"tab-escape",        no_argument,       NULL, TAB_ESCAPE},
+	{"tab-len",           required_argument, NULL, TAB_LEN},
+	{"text-escape",       no_argument,       NULL, TEXT_ESCAPE},
+	{"text-unchanged",    no_argument,       NULL, TEXT_UNCHANGED},
+	{"theme",             required_argument, NULL, THEME},
+	{"timeout-exit-code", required_argument, NULL, TIMEOUT_EXIT_CODE},
+	{"time-format",       required_argument, NULL, TIME_FORMAT},
+	{"title",             required_argument, NULL, TITLE},
+	{"yes-label",         required_argument, NULL, OK_LABEL},
+	/* Dialogs */
+	{"calendar",     no_argument, NULL, CALENDAR},
+	{"checklist",    no_argument, NULL, CHECKLIST},
+	{"datebox",      no_argument, NULL, DATEBOX},
+	{"form",         no_argument, NULL, FORM},
+	{"gauge",        no_argument, NULL, GAUGE},
+	{"infobox",      no_argument, NULL, INFOBOX},
+	{"inputbox",     no_argument, NULL, INPUTBOX},
+	{"menu",         no_argument, NULL, MENU},
+	{"mixedform",    no_argument, NULL, MIXEDFORM},
+	{"mixedgauge",   no_argument, NULL, MIXEDGAUGE},
+	{"msgbox",       no_argument, NULL, MSGBOX},
+	{"passwordbox",  no_argument, NULL, PASSWORDBOX},
+	{"passwordform", no_argument, NULL, PASSWORDFORM},
+	{"pause",        no_argument, NULL, PAUSE},
+	{"radiolist",    no_argument, NULL, RADIOLIST},
+	{"rangebox",     no_argument, NULL, RANGEBOX},
+	{"textbox",      no_argument, NULL, TEXTBOX},
+	{"timebox",      no_argument, NULL, TIMEBOX},
+	{"treeview",     no_argument, NULL, TREEVIEW},
+	{"yesno",        no_argument, NULL, YESNO},
+	/* END */
+	{ NULL, 0, NULL, 0}
+};
+
+void usage(void)
+{
+	printf("usage: bsddialog --help | --version\n");
+	printf("       bsddialog [--<opt>] --<dialog> <text> <rows> <cols> "
+	    "[<arg>] [--<opt>]\n");
+	printf("       bsddialog ... --<dialog1> ... [--and-dialog --<dialog2> "
+	    "...] ...\n");
+	printf("\n");
+
+	printf("Options:\n");
+	printf(" --alternate-screen, --ascii-lines, --backtitle <backtitle>,"
+	    " --begin-x <x>,\n --begin-y <y>, --bikeshed,"
+	    " --cancel-exit-code <retval>, --cancel-label <label>,\n"
+	    " --clear-dialog, --clear-screen, --columns-per-row <columns>,"
+	    " --cr-wrap,\n --datebox-format d/m/y|m/d/y|y/m/d,"
+	    " --date-format <format>,\n --default-button <label>,"
+	    " --default-item <name>, --default-no, --disable-esc,\n"
+	    " --error-exit-code <retval>, --esc-exit-code <retval>,"
+	    " --exit-label <label>,\n --extra-button,"
+	    " --extra-exit-code <retval>, --extra-label <label>,\n"
+	    " --left1-button <label>, --left1-exit-code <retval>,"
+	    " --left2-button <label>,\n --left2-exit-code <retval>,"
+	    " --left3-button <label>, --left3-exit-code <retval>,\n"
+	    " --help-button, --help-exit-code <retval>, --help-label <label>,\n"
+	    " --help-print-items, --help-print-name, --hfile <file>,"
+	    " --hline <string>,\n --hmsg <string>, --ignore, --insecure,"
+	    " --item-bottom-desc, --item-depth,\n --item-prefix,"
+	    " --load-theme <file>, --max-input <size>, --no-cancel,\n"
+	    " --no-descriptions, --no-label <label>, --no-lines, --no-names,"
+	    " --no-ok,\n --no-shadow, --normal-screen, --ok-exit-code <retval>,"
+	    " --ok-label <label>,\n --output-fd <fd>, --output-separator <sep>,"
+	    " --print-maxsize, --print-size,\n --print-version, --quoted,"
+	    " --right1-button <label>,\n --right1-exit-code <retval>,"
+	    " --right2-button <label>,\n --right2-exit-code <retval>,"
+	    " --right3-button <label>,\n --right3-exit-code <retval>,"
+	    " --save-theme <file>, --separate-output,\n --separator <sep>,"
+	    " --shadow, --single-quoted, --sleep <secs>, --stderr,\n --stdout,"
+	    " --switch-buttons, --tab-escape, --tab-len <spaces>,"
+	    " --text-escape,\n --text-unchanged, --theme 3d|blackwhite|flat,"
+	    " --timeout-exit-code <retval>,\n --time-format <format>,"
+	    " --title <title>, --yes-label <label>.");
+	printf("\n\n");
+
+	printf("Dialogs:\n");
+	printf(" --calendar <text> <rows> <cols> [<dd> <mm> <yy>]\n");
+	printf(" --checklist <text> <rows> <cols> <menurows> [<name> <desc> "
+	    "on|off] ...\n");
+	printf(" --datebox <text> <rows> <cols> [<dd> <mm> <yy>]\n");
+	printf(" --form <text> <rows> <cols> <formrows> [<label> <ylabel> "
+	    "<xlabel> <init> <yfield> <xfield> <fieldlen> <maxletters>] "
+	    "...\n");
+	printf(" --gauge <text> <rows> <cols> [<perc>]\n");
+	printf(" --infobox <text> <rows> <cols>\n");
+	printf(" --inputbox <text> <rows> <cols> [<init>]\n");
+	printf(" --menu <text> <rows> <cols> <menurows> [<name> <desc>] ...\n");
+	printf(" --mixedform <text> <rows> <cols> <formrows> [<label> <ylabel> "
+	    "<xlabel> <init> <yfield> <xfield> <fieldlen> <maxletters> "
+	    "0|1|2] ...\n");
+	printf(" --mixedgauge <text> <rows> <cols> <mainperc> [<minilabel> "
+	    "<miniperc>] ...\n");
+	printf(" --msgbox <text> <rows> <cols>\n");
+	printf(" --passwordbox <text> <rows> <cols> [<init>]\n");
+	printf(" --passwordform <text> <rows> <cols> <formrows> [<label> "
+	    "<ylabel> <xlabel> <init> <yfield> <xfield> <fieldlen> "
+	    "<maxletters>] ...\n");
+	printf(" --pause <text> <rows> <cols> <secs>\n");
+	printf(" --radiolist <text> <rows> <cols> <menurows> [<name> <desc> "
+	    "on|off] ...\n");
+	printf(" --rangebox <text> <rows> <cols> <min> <max> [<init>]\n");
+	printf(" --textbox <file> <rows> <cols>\n");
+	printf(" --timebox <text> <rows> <cols> [<hh> <mm> <ss>]\n");
+	printf(" --treeview <text> <rows> <cols> <menurows> [<depth> <name> "
+	    "<desc> on|off] ...\n");
+	printf(" --yesno <text> <rows> <cols>\n");
+	printf("\n");
+
+	printf("See 'man 1 bsddialog' for more information.\n");
+}
+
+int
+parseargs(int argc, char **argv, struct bsddialog_conf *conf,
+    struct options *opt)
+{
+	int arg, parsed, i;
+	struct winsize ws;
+
+	bsddialog_initconf(conf);
+	conf->key.enable_esc = true;
+	conf->button.always_active = true;
+
+	memset(opt, 0, sizeof(struct options));
+	opt->theme = -1;
+	opt->output_fd = STDERR_FILENO;
+	opt->max_input_form = 2048;
+	opt->mandatory_dialog = true;
+
+	for (i = 0; i < argc; i++) {
+		if (strcmp(argv[i], "--and-dialog") == 0 ||
+		    strcmp(argv[i], "--and-widget") == 0) {
+			argc = i + 1;
+			break;
+		}
+	}
+	parsed = argc;
+	while ((arg = getopt_long(argc, argv, "", longopts, NULL)) != -1) {
+		switch (arg) {
+		/* Options */
+		case ALTERNATE_SCREEN:
+			opt->screen_mode = "smcup";
+			break;
+		case AND_DIALOG:
+			if (opt->dialogbuilder == NULL)
+				exit_error(true,"--and-dialog without "
+				    "previous --<dialog>");
+			break;
+		case ASCII_LINES:
+			conf->ascii_lines = true;
+			break;
+		case AUTO_TRUNCATE:
+			conf->auto_truncate = true;
+			break;
+		case BACKTITLE:
+			opt->backtitle = optarg;
+			if (conf->y == BSDDIALOG_CENTER)
+				conf->auto_topmargin = 2;
+			break;
+		case BEGIN_X:
+			conf->x = (int)strtol(optarg, NULL, 10);
+			if (conf->x < BSDDIALOG_CENTER)
+				exit_error(false, "--begin-x %d is < %d",
+				    conf->x, BSDDIALOG_CENTER);
+			break;
+		case BEGIN_Y:
+			conf->y = (int)strtol(optarg, NULL, 10);
+			if (conf->y < BSDDIALOG_CENTER)
+				exit_error(false, "--begin-y %d is < %d",
+				    conf->y, BSDDIALOG_CENTER);
+			conf->auto_topmargin = 0;
+			break;
+		case BIKESHED:
+			opt->bikeshed = true;
+			break;
+		case CANCEL_EXIT_CODE:
+			set_exit_code(BSDDIALOG_CANCEL,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case CANCEL_LABEL:
+			conf->button.cancel_label = optarg;
+			break;
+		case CLEAR_DIALOG:
+			conf->clear = true;
+			break;
+		case CLEAR_SCREEN:
+			opt->mandatory_dialog = false;
+			opt->clearscreen = true;
+			break;
+		case COLUMNS_PER_ROW:
+			conf->text.cols_per_row =
+			    (u_int)strtoul(optarg, NULL, 10);
+			break;
+		case CR_WRAP:
+			opt->cr_wrap = true;
+			break;
+		case DATEBOX_FORMAT:
+			if (strcasecmp(optarg, "d/m/y") == 0)
+				conf->date.format = "d/m/y";
+			else if (strcasecmp(optarg, "m/d/y") == 0)
+				conf->date.format = "m/d/y";
+			else if (strcasecmp(optarg, "y/m/d") == 0)
+				conf->date.format = "y/m/d";
+			else
+				exit_error(true,
+				    "date format \"%s\" is invalid", optarg);
+			break;
+		case DATE_FORMAT:
+			opt->date_fmt = optarg;
+			break;
+		case DEFAULT_BUTTON:
+			conf->button.default_label = optarg;
+			break;
+		case DEFAULT_ITEM:
+			opt->item_default = optarg;
+			break;
+		case DEFAULT_NO:
+			conf->button.default_cancel = true;
+			break;
+		case DISABLE_ESC:
+			conf->key.enable_esc = false;
+			break;
+		case ERROR_EXIT_CODE:
+			set_exit_code(BSDDIALOG_ERROR,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case ESC_EXIT_CODE:
+			set_exit_code(BSDDIALOG_ESC,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case EXIT_LABEL:
+			conf->button.ok_label = optarg;
+			break;
+		case EXTRA_BUTTON:
+			conf->button.with_extra = true;
+			break;
+		case EXTRA_EXIT_CODE:
+			set_exit_code(BSDDIALOG_EXTRA,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case EXTRA_LABEL:
+			conf->button.extra_label = optarg;
+			break;
+		case HELP_BUTTON:
+			conf->button.with_help = true;
+			break;
+		case HELP_EXIT_CODE:
+			i = (int)strtol(optarg, NULL, 10);
+			set_exit_code(BSDDIALOG_HELP, i);
+			/* _TEM_HELP follows _HELP */
+			set_exit_code(BSDDIALOG_ITEM_HELP, i);
+			break;
+		case HELP_LABEL:
+			conf->button.help_label = optarg;
+			break;
+		case HELP_PRINT_ITEMS:
+			opt->help_print_items = true;
+			break;
+		case HELP_PRINT_NAME:
+			opt->help_print_item_name = true;
+			break;
+		case HFILE:
+			conf->key.f1_file = optarg;
+			break;
+		case HLINE:
+			if (optarg[0] != '\0')
+				conf->bottomtitle = optarg;
+			break;
+		case HMSG:
+			conf->key.f1_message = optarg;
+			break;
+		case IGNORE:
+			opt->ignore = true;
+			break;
+		case INSECURE:
+			conf->form.securech = '*';
+			break;
+		case ITEM_BOTTOM_DESC:
+			opt->item_bottomdesc = true;
+			break;
+		case ITEM_DEPTH:
+			opt->item_depth = true;
+			break;
+		case ITEM_PREFIX:
+			opt->item_prefix = true;
+			break;
+		case LEFT1_BUTTON:
+			conf->button.left1_label = optarg;
+			break;
+		case LEFT1_EXIT_CODE:
+			set_exit_code(BSDDIALOG_LEFT1,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case LEFT2_BUTTON:
+			conf->button.left2_label = optarg;
+			break;
+		case LEFT2_EXIT_CODE:
+			set_exit_code(BSDDIALOG_LEFT2,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case LEFT3_BUTTON:
+			conf->button.left3_label = optarg;
+			break;
+		case LEFT3_EXIT_CODE:
+			set_exit_code(BSDDIALOG_LEFT3,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case LOAD_THEME:
+			opt->loadthemefile = optarg;
+			break;
+		case MAX_INPUT:
+			opt->max_input_form = (u_int)strtoul(optarg, NULL, 10);
+			break;
+		case NO_AUTO_TRUNCATE:
+			conf->auto_truncate = false;
+			break;
+		case NO_CANCEL:
+			conf->button.without_cancel = true;
+			break;
+		case NO_DESCRIPTIONS:
+			conf->menu.no_desc = true;
+			break;
+		case NO_LINES:
+			conf->no_lines = true;
+			break;
+		case NO_NAMES:
+			conf->menu.no_name = true;
+			break;
+		case NO_OK:
+			conf->button.without_ok = true;
+			break;
+		case NO_SHADOW:
+			conf->shadow = false;
+			break;
+		case NORMAL_SCREEN:
+			opt->screen_mode = "rmcup";
+			break;
+		case OK_EXIT_CODE:
+			set_exit_code(BSDDIALOG_OK,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case OK_LABEL:
+			conf->button.ok_label = optarg;
+			break;
+		case OUTPUT_FD:
+			opt->output_fd = (int)strtol(optarg, NULL, 10);
+			break;
+		case OUTPUT_SEPARATOR:
+			opt->item_output_sep = optarg;
+			break;
+		case QUOTED:
+			opt->item_always_quote = true;
+			break;
+		case PRINT_MAXSIZE:
+			opt->mandatory_dialog = false;
+			ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws);
+			dprintf(opt->output_fd, "MaxSize: %d, %d\n",
+			    ws.ws_row, ws.ws_col);
+			break;
+		case PRINT_SIZE:
+			conf->get_height = &opt->getH;
+			conf->get_width = &opt->getW;
+			break;
+		case PRINT_VERSION:
+			opt->mandatory_dialog = false;
+			dprintf(opt->output_fd, "Version: %s\n",
+			    LIBBSDDIALOG_VERSION);
+			break;
+		case RIGHT1_BUTTON:
+			conf->button.right1_label = optarg;
+			break;
+		case RIGHT1_EXIT_CODE:
+			set_exit_code(BSDDIALOG_RIGHT1,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case RIGHT2_BUTTON:
+			conf->button.right2_label = optarg;
+			break;
+		case RIGHT2_EXIT_CODE:
+			set_exit_code(BSDDIALOG_RIGHT2,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case RIGHT3_BUTTON:
+			conf->button.right3_label = optarg;
+			break;
+		case RIGHT3_EXIT_CODE:
+			set_exit_code(BSDDIALOG_RIGHT3,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case SAVE_THEME:
+			opt->mandatory_dialog = false;
+			opt->savethemefile = optarg;
+			break;
+		case SEPARATE_OUTPUT:
+			opt->item_output_sepnl = true;
+			break;
+		case SHADOW:
+			conf->shadow = true;
+			break;
+		case SINGLE_QUOTED:
+			opt->item_singlequote = true;
+			break;
+		case SLEEP:
+			conf->sleep = (u_int)strtoul(optarg, NULL, 10);
+			break;
+		case STDERR:
+			opt->output_fd = STDERR_FILENO;
+			break;
+		case STDOUT:
+			opt->output_fd = STDOUT_FILENO;
+			break;
+		case SWITCH_BUTTONS:
+			conf->button.always_active = false;
+			break;
+		case TAB_ESCAPE:
+			opt->tab_escape = true;
+			break;
+		case TAB_LEN:
+			conf->text.tablen = (u_int)strtoul(optarg, NULL, 10);
+			break;
+		case TEXT_ESCAPE:
+			conf->text.escape = true;
+			break;
+		case TEXT_UNCHANGED:
+			opt->text_unchanged = true;
+			break;
+		case THEME:
+			if (strcasecmp(optarg, "blackwhite") == 0)
+				opt->theme = BSDDIALOG_THEME_BLACKWHITE;
+			else if (strcasecmp(optarg, "flat") == 0)
+				opt->theme = BSDDIALOG_THEME_FLAT;
+			else if (strcasecmp(optarg, "3d") == 0)
+				opt->theme = BSDDIALOG_THEME_3D;
+			else
+				exit_error(true,
+				    "--theme: \"%s\" is unknown", optarg);
+			break;
+		case TIMEOUT_EXIT_CODE:
+			set_exit_code(BSDDIALOG_TIMEOUT,
+			    (int)strtol(optarg, NULL, 10));
+			break;
+		case TIME_FORMAT:
+			opt->time_fmt = optarg;
+			break;
+		case TITLE:
+			conf->title = optarg;
+			break;
+		/* Dialogs */
+		case CALENDAR:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --calendar without "
+				    "--and-dialog", opt->name);
+			opt->name = "--calendar";
+			opt->dialogbuilder = calendar_builder;
+			break;
+		case CHECKLIST:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --checklist without "
+				    "--and-dialog", opt->name);
+			opt->name = "--checklist";
+			opt->dialogbuilder = checklist_builder;
+			conf->auto_downmargin = 1;
+			break;
+		case DATEBOX:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --datebox without "
+				    "--and-dialog", opt->name);
+			opt->name = "--datebox";
+			opt->dialogbuilder = datebox_builder;
+			break;
+		case FORM:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --form without "
+				    "--and-dialog", opt->name);
+			opt->name = "--form";
+			opt->dialogbuilder = form_builder;
+			conf->auto_downmargin = 1;
+			break;
+		case GAUGE:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --gauge without "
+				    "--and-dialog", opt->name);
+			opt->name = "--gauge";
+			opt->dialogbuilder = gauge_builder;
+			break;
+		case INFOBOX:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --infobox without "
+				    "--and-dialog", opt->name);
+			opt->name = "--infobox";
+			opt->dialogbuilder = infobox_builder;
+			break;
+		case INPUTBOX:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --inputbox without "
+				    "--and-dialog", opt->name);
+			opt->name = "--inputbox";
+			opt->dialogbuilder = inputbox_builder;
+			conf->auto_downmargin = 1;
+			break;
+		case MENU:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --menu without "
+				    "--and-dialog", opt->name);
+			opt->name = "--menu";
+			opt->dialogbuilder = menu_builder;
+			conf->auto_downmargin = 1;
+			break;
+		case MIXEDFORM:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --mixedform without "
+				    "--and-dialog", opt->name);
+			opt->name = "--mixedform";
+			opt->dialogbuilder = mixedform_builder;
+			conf->auto_downmargin = 1;
+			break;
+		case MIXEDGAUGE:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --mixedgauge without "
+				    "--and-dialog", opt->name);
+			opt->name = "--mixedgauge";
+			opt->dialogbuilder = mixedgauge_builder;
+			break;
+		case MSGBOX:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --msgbox without "
+				    "--and-dialog", opt->name);
+			opt->name = "--";
+			opt->dialogbuilder = msgbox_builder;
+			break;
+		case PAUSE:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --pause without "
+				    "--and-dialog", opt->name);
+			opt->name = "--pause";
+			opt->dialogbuilder = pause_builder;
+			break;
+		case PASSWORDBOX:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --passwordbox without "
+				    "--and-dialog", opt->name);
+			opt->name = "--passwordbox";
+			opt->dialogbuilder = passwordbox_builder;
+			conf->auto_downmargin = 1;
+			break;
+		case PASSWORDFORM:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --passwordform "
+				    "without --and-dialog", opt->name);
+			opt->name = "--passwordform";
+			opt->dialogbuilder = passwordform_builder;
+			conf->auto_downmargin = 1;
+			break;
+		case RADIOLIST:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --radiolist without "
+				    "--and-dialog", opt->name);
+			opt->name = "--radiolist";
+			opt->dialogbuilder = radiolist_builder;
+			conf->auto_downmargin = 1;
+			break;
+		case RANGEBOX:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --rangebox without "
+				    "--and-dialog", opt->name);
+			opt->name = "--rangebox";
+			opt->dialogbuilder = rangebox_builder;
+			break;
+		case TEXTBOX:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --textbox without "
+				    "--and-dialog", opt->name);
+			opt->name = "--textbox";
+			opt->dialogbuilder = textbox_builder;
+			break;
+		case TIMEBOX:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --timebox without "
+				    "--and-dialog", opt->name);
+			opt->name = "--timebox";
+			opt->dialogbuilder = timebox_builder;
+			break;
+		case TREEVIEW:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --treeview without "
+				    "--and-dialog", opt->name);
+			opt->name = "--treeview";
+			opt->dialogbuilder = treeview_builder;
+			conf->auto_downmargin = 1;
+			break;
+		case YESNO:
+			if (opt->dialogbuilder != NULL)
+				exit_error(true, "%s and --yesno without "
+				    "--and-dialog", opt->name);
+			opt->name = "--yesno";
+			opt->dialogbuilder = yesno_builder;
+			break;
+		default: /* Error */
+			if (opt->ignore == true)
+				break;
+			exit_error(true, "--ignore to continue");
+		}
+	}
+
+	return (parsed);
+}
diff --git a/contrib/bsddialog/utility/util_theme.c b/contrib/bsddialog/utility/util_theme.c
new file mode 100644
index 000000000000..c313d743252b
--- /dev/null
+++ b/contrib/bsddialog/utility/util_theme.c
@@ -0,0 +1,451 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022-2023 Alfonso Sabato Siciliano
+ *
+ * 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.
+ */
+
+#include <sys/time.h>
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <time.h>
+
+#include <bsddialog.h>
+#include <bsddialog_theme.h>
+
+#include "util.h"
+
+static struct bsddialog_theme t;
+static char title[1024];
+
+#define NPROPERTY  41
+#define NCOLOR      8
+#define NATTR       6
+
+#define PROP_ERROR(name, error) do {                                           \
+	fclose(fp);                                                            \
+	exit_error(false, "%s for \"%s\"", error, name);                       \
+} while (0)
+
+enum typeproperty {
+	BOOL,
+	CHAR,
+	INT,
+	UINT,
+	COLOR,
+	COMPAT
+};
+
+struct property {
+	const char *comment;
+	const char *name;
+	enum typeproperty type;
+	void *value;
+};
+
+struct namevalue {
+	const char *name;
+	unsigned int value;
+};
+
+static struct namevalue color[NCOLOR] = {
+	{"black",   BSDDIALOG_BLACK},
+	{"red",     BSDDIALOG_RED},
+	{"green",   BSDDIALOG_GREEN},
+	{"yellow",  BSDDIALOG_YELLOW},
+	{"blue",    BSDDIALOG_BLUE},
+	{"magenta", BSDDIALOG_MAGENTA},
+	{"cyan",    BSDDIALOG_CYAN},
+	{"white",   BSDDIALOG_WHITE}
+};
+
+static struct namevalue attr[NATTR] = {
+ 	{"bold",       BSDDIALOG_BOLD},
+	{"reverse",    BSDDIALOG_REVERSE},
+	{"underline",  BSDDIALOG_UNDERLINE},
+	{"blink",      BSDDIALOG_BLINK},
+	{"halfbright", BSDDIALOG_HALFBRIGHT},
+	{"highlight",  BSDDIALOG_HIGHLIGHT}
+};
+
+static struct property p[NPROPERTY] = {
+	{"\n#Terminal\n", "theme.screen.color", COLOR, &t.screen.color},
+
+	{"\n# Shadow\n",
+	    "theme.shadow.color", COLOR, &t.shadow.color},
+	{"# shift down right from main widget\n",
+	    "theme.shadow.y", UINT, &t.shadow.y},
+	{"", "theme.shadow.x", UINT, &t.shadow.x},
+
+	{"\n# Main widget\n",
+	    "theme.dialog.color", COLOR, &t.dialog.color},
+	{"", "theme.dialog.delimtitle", BOOL, &t.dialog.delimtitle},
+	{"", "theme.dialog.titlecolor", COLOR, &t.dialog.titlecolor},
+	{"", "theme.dialog.lineraisecolor", COLOR, &t.dialog.lineraisecolor},
+	{"", "theme.dialog.linelowercolor", COLOR, &t.dialog.linelowercolor},
+	{"", "theme.dialog.bottomtitlecolor", COLOR,
+	    &t.dialog.bottomtitlecolor},
+	{"", "theme.dialog.arrowcolor", COLOR, &t.dialog.arrowcolor},
+
+	{"\n# Menus: --checklist, --menu, --radiolist\n"
+	    "# prefix [selector] shortcut name desc bottomdesc\n",
+	    "theme.menu.f_prefixcolor", COLOR, &t.menu.f_prefixcolor},
+	{"", "theme.menu.prefixcolor", COLOR, &t.menu.prefixcolor},
+	{"", "theme.menu.f_selectorcolor", COLOR, &t.menu.f_selectorcolor},
+	{"", "theme.menu.selectorcolor", COLOR, &t.menu.selectorcolor},
+	{"", "theme.menu.f_namecolor", COLOR, &t.menu.f_namecolor},
+	{"", "theme.menu.namecolor", COLOR, &t.menu.namecolor},
+	{"", "theme.menu.f_desccolor", COLOR, &t.menu.f_desccolor},
+	{"", "theme.menu.desccolor", COLOR, &t.menu.desccolor},
+	{"", "theme.menu.f_shortcutcolor", COLOR, &t.menu.f_shortcutcolor},
+	{"", "theme.menu.shortcutcolor", COLOR, &t.menu.shortcutcolor},
+	{"", "theme.menu.bottomdesccolor", COLOR, &t.menu.bottomdesccolor},
+	{"# bsddialog_menutype BSDDIALOG_SEPARATOR\n",
+	    "theme.menu.sepnamecolor", COLOR, &t.menu.sepnamecolor},
+	{"", "theme.menu.sepdesccolor", COLOR, &t.menu.sepdesccolor},
+
+	{"\n# Forms\n",
+	    "theme.form.f_fieldcolor", COLOR, &t.form.f_fieldcolor},
+	{"", "theme.form.fieldcolor", COLOR, &t.form.fieldcolor},
+	{"", "theme.form.readonlycolor", COLOR, &t.form.readonlycolor},
+	{"", "theme.form.bottomdesccolor", COLOR, &t.form.bottomdesccolor},
+
+	{"\n# Bar of --gauge, --mixedgauge, --pause, --rangebox\n",
+	    "theme.bar.f_color", COLOR, &t.bar.f_color},
+	{"", "theme.bar.color", COLOR, &t.bar.color},
+
+	{"\n# Buttons\n",
+	    "theme.button.minmargin", UINT, &t.button.minmargin},
+	{"", "theme.button.maxmargin", UINT, &t.button.maxmargin},
+	{"", "theme.button.leftdelim", CHAR, &t.button.leftdelim},
+	{"", "theme.button.rightdelim", CHAR, &t.button.rightdelim},
+	{"", "theme.button.f_delimcolor", COLOR, &t.button.f_delimcolor},
+	{"", "theme.button.delimcolor", COLOR, &t.button.delimcolor},
+	{"", "theme.button.f_color", COLOR, &t.button.f_color},
+	{"", "theme.button.color", COLOR, &t.button.color},
+	{"", "theme.button.f_shortcutcolor", COLOR, &t.button.f_shortcutcolor},
+	{"", "theme.button.shortcutcolor", COLOR, &t.button.shortcutcolor},
+
+	{"\n#Compatibility. Do not use, can be deleted\n",
+	    "use_shadow", COMPAT, NULL}
+};
+
+void savetheme(const char *file)
+{
+	int i, j;
+	unsigned int flags;
+	enum bsddialog_color bg, fg;
+	time_t clock;
+	FILE *fp;
+
+	if (bsddialog_get_theme(&t) != BSDDIALOG_OK)
+		exit_error(false,
+		    "cannot save theme: %s", bsddialog_geterror());
+
+	if(time(&clock) < 0)
+		exit_error(false, "cannot save profile getting current time");
+	if ((fp = fopen(file, "w")) == NULL)
+		exit_error(false, "cannot open %s to save profile", file);
+
+	fprintf(fp, "### bsddialog theme - %s\n", ctime(&clock));
+
+	fputs("# Colors: ", fp);
+	fputs("black red green yellow blue magenta cyan white.\n", fp);
+	fputs("# Attributes: ", fp);
+	fputs("bold reverse underline blink halfbright highlight.\n", fp);
+	fputs("# f_* refers to focus for an element with selected or ", fp);
+	fputs("unselected state.\n\n", fp);
+
+	fprintf(fp, "version %s\n", LIBBSDDIALOG_VERSION);
+
+	for (i = 0; i < NPROPERTY; i++) {
+		if (p[i].type == COMPAT)
+			continue;
+		fprintf(fp, "%s%s", p[i].comment, p[i].name);
+		switch (p[i].type) {
+		case CHAR:
+			fprintf(fp, " %c\n", *((char*)p[i].value));
+			break;
+		case INT:
+			fprintf(fp, " %d\n", *((int*)p[i].value));
+			break;
+		case UINT:
+			fprintf(fp, " %u\n", *((unsigned int*)p[i].value));
+			break;
+		case BOOL:
+			fprintf(fp, " %s\n",
+			    *((bool*)p[i].value) ? "true" : "false");
+			break;
+		case COLOR:
+			bsddialog_color_attrs(*(int*)p[i].value, &fg, &bg,
+			    &flags);
+			fprintf(fp, " %s %s", color[fg].name, color[bg].name);
+			for (j = 0; j < NATTR; j++)
+				if (flags & attr[j].value)
+					fprintf(fp, " %s", attr[j].name);
+			fputs("\n", fp);
+			break;
+		case COMPAT:
+			/* Do not save compat property for now */
+			break;
+		}
+	}
+
+	fclose(fp);
+}
+
+void loadtheme(const char *file, bool compatibility)
+{
+	bool boolvalue;
+	char charvalue, *value;
+	char line[BUFSIZ], name[BUFSIZ], c1[BUFSIZ], c2[BUFSIZ];
+	int i, j, intvalue;
+	unsigned int uintvalue, flags;
+	enum bsddialog_color bg, fg;
+	FILE *fp;
+
+	if (bsddialog_hascolors() == false)
+		return;
+
+	if (bsddialog_get_theme(&t) != BSDDIALOG_OK)
+		exit_error(false, "Cannot get current theme: %s",
+		    bsddialog_geterror());
+
+	if((fp = fopen(file, "r")) == NULL)
+		exit_error(false, "Cannot open theme \"%s\" file", file);
+
+	while(fgets(line, BUFSIZ, fp) != NULL) {
+		if(line[0] == '#' || line[0] == '\n')
+			continue;  /* superfluous, only for efficiency */
+		sscanf(line, "%s", name);
+		value = NULL; /* useless init, fix compiler warning */
+		for (i = 0; i < NPROPERTY; i++) {
+			if (strcmp(name, p[i].name) == 0) {
+				value = &line[strlen(name)];
+				break;
+			}
+		}
+		if (i >= NPROPERTY) {
+			/* unknown name in property p[] */
+			if (strcmp(name, "version") == 0)
+				continue; /* nothing for now */
+			else if (compatibility)
+				continue; /* just ignore */
+			else
+				PROP_ERROR(name, "Unknown theme property name");
+		}
+		switch (p[i].type) {
+		case CHAR:
+			while (value[0] == ' ' || value[0] == '\n' ||
+			    value[0] == '\0')
+				value++;
+			if (sscanf(value, "%c", &charvalue) != 1)
+				PROP_ERROR(p[i].name, "Cannot get a char");
+			*((int*)p[i].value) = charvalue;
+			break;
+		case INT:
+			if (sscanf(value, "%d", &intvalue) != 1)
+				PROP_ERROR(p[i].name, "Cannot get a int");
+			*((int*)p[i].value) = intvalue;
+			break;
+		case UINT:
+			if (sscanf(value, "%u", &uintvalue) != 1)
+				PROP_ERROR(p[i].name, "Cannot get a uint");
+			*((unsigned int*)p[i].value) = uintvalue;
+			break;
+		case BOOL:
+			boolvalue = (strstr(value, "true") != NULL) ?
+			    true :false;
+			*((bool*)p[i].value) = boolvalue;
+			break;
+		case COLOR:
+			if (sscanf(value, "%s %s", c1, c2) != 2)
+				PROP_ERROR(p[i].name, "Cannot get 2 colors");
+			/* Foreground */
+			for (j = 0; j < NCOLOR ; j++)
+				if ((strstr(c1, color[j].name)) != NULL)
+					break;
+			if (j >= NCOLOR)
+				PROP_ERROR(p[i].name, "Bad foreground");
+			fg = color[j].value;
+			/* Background */
+			for (j = 0; j < NCOLOR ; j++)
+				if ((strstr(c2, color[j].name)) != NULL)
+					break;
+			if (j >= NCOLOR)
+				PROP_ERROR(p[i].name, "Bad background");
+			bg = color[j].value;
+			/* Flags */
+			flags = 0;
+			for (j = 0; j < NATTR; j++)
+				if (strstr(value, attr[j].name) != NULL)
+					flags |= attr[j].value;
+			*((int*)p[i].value) = bsddialog_color(fg, bg, flags);
+			break;
+		case COMPAT:
+			/*
+			 * usr.sbin/bsdconfig/share/dialog.subr:2255
+			 * uses this parameter to set NO_SHADOW.
+			 * Set t.shadow.[y|x] for compatibilty.
+			 */
+			if (strcmp(name, "use_shadow") == 0) {
+				 if (strcasestr(value, "off") != NULL)
+				 	t.shadow.y = t.shadow.x = 0;
+			}
+			break;
+		}
+	}
+
+	fclose(fp);
+
+	if(bsddialog_set_theme(&t) != BSDDIALOG_OK)
+		exit_error(false, bsddialog_geterror());
+}
+
+void setdeftheme(enum bsddialog_default_theme theme)
+{
+	if (bsddialog_hascolors() == false)
+		return;
+	if (bsddialog_set_default_theme(theme) != BSDDIALOG_OK)
+		exit_error(false, bsddialog_geterror());
+}
+
+void startuptheme(void)
+{
+	bool sep;
+	char *env, *file, *home, path[PATH_MAX];
+
+	env = getenv("NO_COLOR");
+	if (env != NULL && env[0] != '\0')
+		setdeftheme(BSDDIALOG_THEME_BLACKWHITE);
+
+	if ((home = getenv("HOME")) != NULL) {
+		sep = (strcmp(home, "/") == 0) ? false : true;
+
+		snprintf(path, PATH_MAX, "%s%s.bsddialog.conf",
+		    home, sep ? "/" : "");
+		if (access(path, F_OK) == 0)
+			loadtheme(path, false);
+
+		if ((file = getenv("BSDDIALOG_COMPATRC")) != NULL) {
+			snprintf(path, PATH_MAX, "%s%s%s",
+			    home, sep ? "/" : "", file);
+			if (access(path, F_OK) == 0)
+				loadtheme(path, true);
+		}
+	}
+	if ((file = getenv("BSDDIALOG_THEMEFILE")) != NULL) {
+		if (access(file, F_OK) == 0)
+			loadtheme(file, false);
+	}
+}
+
+void bikeshed(struct bsddialog_conf *conf)
+{
+	int margin, i;
+	int colors[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+	char delim[8] = {'[', '<', '(', '|', ']', '>', ')', '|'};
+	enum bsddialog_color col[6];
+	struct timeval tv;
+
+	/* theme */
+	if (bsddialog_get_theme(&t) != BSDDIALOG_OK)
+		exit_error(false, bsddialog_geterror());
+
+	gettimeofday(&tv, NULL);
+	srand(tv.tv_usec);
+	for (i = 0; i < 6; i++) {
+		do {
+			col[i] = rand() % 8;
+		} while (colors[col[i]] == 1);
+		colors[col[i]] = 1;
+	}
+
+	t.screen.color = bsddialog_color(col[4], col[3], 0);
+
+	t.shadow.color   = bsddialog_color(col[0], col[0], 0);
+	t.shadow.y       = 1,
+	t.shadow.x       = 2,
+
+	t.dialog.delimtitle       = (~rand() & 1) ? true : false;
+	t.dialog.titlecolor       = bsddialog_color(col[3], col[5], 0);
+	t.dialog.lineraisecolor   = bsddialog_color(col[0], col[5], 0);
+	t.dialog.linelowercolor   = bsddialog_color(col[0], col[5], 0);
+	t.dialog.color            = bsddialog_color(col[0], col[5], 0);
+	t.dialog.bottomtitlecolor = bsddialog_color(col[0], col[5], 0);
+	t.dialog.arrowcolor       = bsddialog_color(col[3], col[5], 0);
+
+	t.menu.f_prefixcolor   = bsddialog_color(col[5], col[3], 0);
+	t.menu.prefixcolor     = bsddialog_color(col[0], col[5], 0);
+	t.menu.f_selectorcolor = bsddialog_color(col[5], col[3], 0);
+	t.menu.selectorcolor   = bsddialog_color(col[0], col[5], 0);
+	t.menu.f_desccolor     = bsddialog_color(col[5], col[3], 0);
+	t.menu.desccolor       = bsddialog_color(col[0], col[5], 0);
+	t.menu.f_namecolor     = bsddialog_color(col[5], col[3], 0);
+	t.menu.namecolor       = bsddialog_color(col[3], col[5], 0);
+	t.menu.f_shortcutcolor = bsddialog_color(col[1], col[3], 0);
+	t.menu.shortcutcolor   = bsddialog_color(col[1], col[5], 0);
+	t.menu.bottomdesccolor = bsddialog_color(col[4], col[3], 0);
+	t.menu.sepnamecolor    = bsddialog_color(col[1], col[5], 0);
+	t.menu.sepdesccolor    = bsddialog_color(col[1], col[5], 0);
+
+	t.form.f_fieldcolor    = bsddialog_color(col[5], col[3], 0);
+	t.form.fieldcolor      = bsddialog_color(col[5], col[4], 0);
+	t.form.readonlycolor   = bsddialog_color(col[4], col[5], 0);
+	t.form.bottomdesccolor = bsddialog_color(col[4], col[3], 0);
+
+	t.bar.f_color = bsddialog_color(col[5], col[3], 0);
+	t.bar.color   = bsddialog_color(col[3], col[5], 0);
+
+	t.button.minmargin       = 1,
+	t.button.maxmargin       = 5,
+	i = rand() % 4;
+	t.button.leftdelim       = delim[i];
+	t.button.rightdelim      = delim[i + 4];
+	t.button.f_delimcolor    = bsddialog_color(col[5], col[3], 0);
+	t.button.delimcolor      = bsddialog_color(col[0], col[5], 0);
+	t.button.f_color         = bsddialog_color(col[2], col[3], 0);
+	t.button.color           = bsddialog_color(col[0], col[5], 0);
+	t.button.f_shortcutcolor = bsddialog_color(col[5], col[3], 0);
+	t.button.shortcutcolor   = bsddialog_color(col[1], col[5], 0);
+
+	if (bsddialog_set_theme(&t))
+		exit_error(false, bsddialog_geterror());
+
+	/* conf */
+	conf->button.always_active = (~rand() & 1) ? true : false;
+	if ((i = rand() % 3) != 0) /* default "d/m/y" */
+		conf->date.format = (i & 1) ? "m/d/y" : "y/m/d" ;
+	if (conf->title != NULL) {
+		memset(title, 0, 1024);
+		margin = rand() % 5;
+		memset(title, ' ', margin);
+		strcpy(title + margin, conf->title);
+		memset(title + strlen(title), ' ', margin);
+		conf->title = title;
+	}
+}
diff --git a/contrib/file/tests/bcachefs2.result b/contrib/file/tests/bcachefs2.result
index 9ebf64bb55bc..30fe8e8910d2 100644
--- a/contrib/file/tests/bcachefs2.result
+++ b/contrib/file/tests/bcachefs2.result
@@ -1 +1 @@
-bcachefs, UUID=4fa11b1e-75e6-4210-9167-34e1769c0fe1, label "Label", version 26, min version 26, device 0/UUID=0a3643b7-c515-47f8-a0ea-91fc38d043d1, 1 devices (unclean)
\ No newline at end of file
+bcachefs, UUID=4fa11b1e-75e6-4210-9167-34e1769c0fe1, label "Label", version 26, min version 26, device 0/UUID=0a3643b7-c515-47f8-a0ea-91fc38d043d1, 1 devices (unclean)
diff --git a/contrib/file/tests/gpkg-1-zst.result b/contrib/file/tests/gpkg-1-zst.result
index 10379834d4b1..e99149450b1a 100644
--- a/contrib/file/tests/gpkg-1-zst.result
+++ b/contrib/file/tests/gpkg-1-zst.result
@@ -1 +1 @@
-Gentoo GLEP 78 (GPKG) binary package for "inkscape-1.2.1-r2-1" using zstd compression
\ No newline at end of file
+Gentoo GLEP 78 (GPKG) binary package for "inkscape-1.2.1-r2-1" using zstd compression
diff --git a/contrib/unbound/.gitignore b/contrib/unbound/.gitignore
new file mode 100644
index 000000000000..b25c15b81fae
--- /dev/null
+++ b/contrib/unbound/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/contrib/unbound/util/netevent.c b/contrib/unbound/util/netevent.c
index 204e4883cf27..b9395a8998b9 100644
--- a/contrib/unbound/util/netevent.c
+++ b/contrib/unbound/util/netevent.c
@@ -116,6 +116,8 @@
 
 /** timeout in millisec to wait for write to unblock, packets dropped after.*/
 #define SEND_BLOCKED_WAIT_TIMEOUT 200
+/** max number of times to wait for write to unblock, packets dropped after.*/
+#define SEND_BLOCKED_MAX_RETRY 5
 
 /** Let's make timestamping code cleaner and redefine SO_TIMESTAMP* */
 #ifndef SO_TIMESTAMP
@@ -402,9 +404,10 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet,
 			WSAGetLastError() == WSAENOBUFS ||
 			WSAGetLastError() == WSAEWOULDBLOCK) {
 #endif
+			int retries = 0;
 			/* if we set the fd blocking, other threads suddenly
 			 * have a blocking fd that they operate on */
-			while(sent == -1 && (
+			while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && (
 #ifndef USE_WINSOCK
 				errno == EAGAIN || errno == EINTR ||
 #  ifdef EWOULDBLOCK
@@ -419,6 +422,13 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet,
 #endif
 			)) {
 #if defined(HAVE_POLL) || defined(USE_WINSOCK)
+				int send_nobufs = (
+#ifndef USE_WINSOCK
+					errno == ENOBUFS
+#else
+					WSAGetLastError() == WSAENOBUFS
+#endif
+				);
 				struct pollfd p;
 				int pret;
 				memset(&p, 0, sizeof(p));
@@ -457,8 +467,48 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet,
 					log_err("poll udp out failed: %s",
 						sock_strerror(errno));
 					return 0;
+				} else if((pret < 0 &&
+#ifndef USE_WINSOCK
+					errno == ENOBUFS
+#else
+					WSAGetLastError() == WSAENOBUFS
+#endif
+					) || (send_nobufs && retries > 0)) {
+					/* ENOBUFS, and poll returned without
+					 * a timeout. Or the retried send call
+					 * returned ENOBUFS. It is good to
+					 * wait a bit for the error to clear. */
+					/* The timeout is 20*(2^(retries+1)),
+					 * it increases exponentially, starting
+					 * at 40 msec. After 5 tries, 1240 msec
+					 * have passed in total, when poll
+					 * returned the error, and 1200 msec
+					 * when send returned the errors. */
+#ifndef USE_WINSOCK
+					pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
+#else
+					pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
+#endif
+					if(pret < 0 &&
+#ifndef USE_WINSOCK
+						errno != EAGAIN && errno != EINTR &&
+#  ifdef EWOULDBLOCK
+						errno != EWOULDBLOCK &&
+#  endif
+						errno != ENOBUFS
+#else
+						WSAGetLastError() != WSAEINPROGRESS &&
+						WSAGetLastError() != WSAEINTR &&
+						WSAGetLastError() != WSAENOBUFS &&
+						WSAGetLastError() != WSAEWOULDBLOCK
+#endif
+					) {
+						log_err("poll udp out timer failed: %s",
+							sock_strerror(errno));
+					}
 				}
 #endif /* defined(HAVE_POLL) || defined(USE_WINSOCK) */
+				retries++;
 				if (!is_connected) {
 					sent = sendto(c->fd, (void*)sldns_buffer_begin(packet),
 						sldns_buffer_remaining(packet), 0,
@@ -665,7 +715,8 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet,
 			WSAGetLastError() == WSAENOBUFS ||
 			WSAGetLastError() == WSAEWOULDBLOCK) {
 #endif
-			while(sent == -1 && (
+			int retries = 0;
+			while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && (
 #ifndef USE_WINSOCK
 				errno == EAGAIN || errno == EINTR ||
 #  ifdef EWOULDBLOCK
@@ -680,6 +731,13 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet,
 #endif
 			)) {
 #if defined(HAVE_POLL) || defined(USE_WINSOCK)
+				int send_nobufs = (
+#ifndef USE_WINSOCK
+					errno == ENOBUFS
+#else
+					WSAGetLastError() == WSAENOBUFS
+#endif
+				);
 				struct pollfd p;
 				int pret;
 				memset(&p, 0, sizeof(p));
@@ -718,8 +776,48 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet,
 					log_err("poll udp out failed: %s",
 						sock_strerror(errno));
 					return 0;
+				} else if((pret < 0 &&
+#ifndef USE_WINSOCK
+					errno == ENOBUFS
+#else
+					WSAGetLastError() == WSAENOBUFS
+#endif
+					) || (send_nobufs && retries > 0)) {
+					/* ENOBUFS, and poll returned without
+					 * a timeout. Or the retried send call
+					 * returned ENOBUFS. It is good to
+					 * wait a bit for the error to clear. */
+					/* The timeout is 20*(2^(retries+1)),
+					 * it increases exponentially, starting
+					 * at 40 msec. After 5 tries, 1240 msec
+					 * have passed in total, when poll
+					 * returned the error, and 1200 msec
+					 * when send returned the errors. */
+#ifndef USE_WINSOCK
+					pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
+#else
+					pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1));
+#endif
+					if(pret < 0 &&
+#ifndef USE_WINSOCK
+						errno != EAGAIN && errno != EINTR &&
+#  ifdef EWOULDBLOCK
+						errno != EWOULDBLOCK &&
+#  endif
+						errno != ENOBUFS
+#else
+						WSAGetLastError() != WSAEINPROGRESS &&
+						WSAGetLastError() != WSAEINTR &&
+						WSAGetLastError() != WSAENOBUFS &&
+						WSAGetLastError() != WSAEWOULDBLOCK
+#endif
+					) {
+						log_err("poll udp out timer failed: %s",
+							sock_strerror(errno));
+					}
 				}
 #endif /* defined(HAVE_POLL) || defined(USE_WINSOCK) */
+				retries++;
 				sent = sendmsg(c->fd, &msg, 0);
 			}
 		}
diff --git a/crypto/openssl/CHANGES.md b/crypto/openssl/CHANGES.md
index d5c0ba8daf1b..a26bdbdd0ad0 100644
--- a/crypto/openssl/CHANGES.md
+++ b/crypto/openssl/CHANGES.md
@@ -28,6 +28,30 @@ breaking changes, and mappings for the large list of deprecated functions.
 
 [Migration guide]: https://github.com/openssl/openssl/tree/master/doc/man7/migration_guide.pod
 
+### Changes between 3.0.10 and 3.0.11 [19 Sep 2023]
+
+ * Fix POLY1305 MAC implementation corrupting XMM registers on Windows.
+
+   The POLY1305 MAC (message authentication code) implementation in OpenSSL
+   does not save the contents of non-volatile XMM registers on Windows 64
+   platform when calculating the MAC of data larger than 64 bytes. Before
+   returning to the caller all the XMM registers are set to zero rather than
+   restoring their previous content. The vulnerable code is used only on newer
+   x86_64 processors supporting the AVX512-IFMA instructions.
+
+   The consequences of this kind of internal application state corruption can
+   be various - from no consequences, if the calling application does not
+   depend on the contents of non-volatile XMM registers at all, to the worst
+   consequences, where the attacker could get complete control of the
+   application process. However given the contents of the registers are just
+   zeroized so the attacker cannot put arbitrary values inside, the most likely
+   consequence, if any, would be an incorrect result of some application
+   dependent calculations or a crash leading to a denial of service.
+
+   ([CVE-2023-4807])
+
+   *Bernd Edlinger*
+
 ### Changes between 3.0.9 and 3.0.10 [1 Aug 2023]
 
  * Fix excessive time spent checking DH q parameter value.
@@ -19708,6 +19732,7 @@ ndif
 
 <!-- Links -->
 
+[CVE-2023-4807]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-4807
 [CVE-2023-3817]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3817
 [CVE-2023-3446]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3446
 [CVE-2023-2975]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2975
diff --git a/crypto/openssl/NEWS.md b/crypto/openssl/NEWS.md
index feed90269760..f7ca47baff87 100644
--- a/crypto/openssl/NEWS.md
+++ b/crypto/openssl/NEWS.md
@@ -18,6 +18,11 @@ OpenSSL Releases
 OpenSSL 3.0
 -----------
 
+### Major changes between OpenSSL 3.0.10 and OpenSSL 3.0.11 [19 Sep 2023]
+
+  * Fix POLY1305 MAC implementation corrupting XMM registers on Windows
+    ([CVE-2023-4807])
+
 ### Major changes between OpenSSL 3.0.9 and OpenSSL 3.0.10 [1 Aug 2023]
 
   * Fix excessive time spent checking DH q parameter value ([CVE-2023-3817])
@@ -1448,6 +1453,7 @@ OpenSSL 0.9.x
 
 <!-- Links -->
 
+[CVE-2023-4807]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-4807
 [CVE-2023-3817]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3817
 [CVE-2023-3446]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3446
 [CVE-2023-2975]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2975
diff --git a/crypto/openssl/README.md b/crypto/openssl/README.md
index f2f4fd39ad05..b848d050132a 100644
--- a/crypto/openssl/README.md
+++ b/crypto/openssl/README.md
@@ -166,7 +166,7 @@ attempting to develop or distribute cryptographic code.
 Copyright
 =========
 
-Copyright (c) 1998-2022 The OpenSSL Project
+Copyright (c) 1998-2023 The OpenSSL Project
 
 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
 
diff --git a/crypto/openssl/VERSION.dat b/crypto/openssl/VERSION.dat
index 34658d316b4c..c4157a86274d 100644
--- a/crypto/openssl/VERSION.dat
+++ b/crypto/openssl/VERSION.dat
@@ -1,7 +1,7 @@
 MAJOR=3
 MINOR=0
-PATCH=10
+PATCH=11
 PRE_RELEASE_TAG=
 BUILD_METADATA=
-RELEASE_DATE="1 Aug 2023"
+RELEASE_DATE="19 Sep 2023"
 SHLIB_VERSION=3
diff --git a/crypto/openssl/apps/cmp.c b/crypto/openssl/apps/cmp.c
index a317fdb0bf3e..c479b1549660 100644
--- a/crypto/openssl/apps/cmp.c
+++ b/crypto/openssl/apps/cmp.c
@@ -2512,7 +2512,7 @@ static int get_opts(int argc, char **argv)
             }
             break;
         case OPT_CSR:
-            opt_csr = opt_arg();
+            opt_csr = opt_str();
             break;
         case OPT_OUT_TRUSTED:
             opt_out_trusted = opt_str();
diff --git a/crypto/openssl/apps/lib/apps.c b/crypto/openssl/apps/lib/apps.c
index 4baeb352fedf..572f6a3f8f28 100644
--- a/crypto/openssl/apps/lib/apps.c
+++ b/crypto/openssl/apps/lib/apps.c
@@ -944,7 +944,7 @@ int load_key_certs_crls_suppress(const char *uri, int format, int maybe_stdin,
         BIO *bio;
 
         if (!maybe_stdin) {
-            BIO_printf(bio_err, "No filename or uri specified for loading");
+            BIO_printf(bio_err, "No filename or uri specified for loading\n");
             goto end;
         }
         uri = "<stdin>";
@@ -960,10 +960,8 @@ int load_key_certs_crls_suppress(const char *uri, int format, int maybe_stdin,
         ctx = OSSL_STORE_open_ex(uri, libctx, propq, get_ui_method(), &uidata,
                                  params, NULL, NULL);
     }
-    if (ctx == NULL) {
-        BIO_printf(bio_err, "Could not open file or uri for loading");
+    if (ctx == NULL)
         goto end;
-    }
     if (expect > 0 && !OSSL_STORE_expect(ctx, expect))
         goto end;
 
@@ -1948,16 +1946,17 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
         nid = OBJ_txt2nid(typestr);
         if (nid == NID_undef) {
             BIO_printf(bio_err,
-                       "%s: Skipping unknown %s name attribute \"%s\"\n",
+                       "%s warning: Skipping unknown %s name attribute \"%s\"\n",
                        opt_getprog(), desc, typestr);
             if (ismulti)
                 BIO_printf(bio_err,
-                           "Hint: a '+' in a value string needs be escaped using '\\' else a new member of a multi-valued RDN is expected\n");
+                           "%s hint: a '+' in a value string needs be escaped using '\\' else a new member of a multi-valued RDN is expected\n",
+                           opt_getprog());
             continue;
         }
         if (*valstr == '\0') {
             BIO_printf(bio_err,
-                       "%s: No value provided for %s name attribute \"%s\", skipped\n",
+                       "%s warning: No value provided for %s name attribute \"%s\", skipped\n",
                        opt_getprog(), desc, typestr);
             continue;
         }
diff --git a/crypto/openssl/apps/req.c b/crypto/openssl/apps/req.c
index 73b320a7098c..926f0796bc8f 100644
--- a/crypto/openssl/apps/req.c
+++ b/crypto/openssl/apps/req.c
@@ -990,10 +990,10 @@ int req_main(int argc, char **argv)
         else
             tpubkey = X509_REQ_get0_pubkey(req);
         if (tpubkey == NULL) {
-            fprintf(stdout, "Modulus is unavailable\n");
+            BIO_puts(bio_err, "Modulus is unavailable\n");
             goto end;
         }
-        fprintf(stdout, "Modulus=");
+        BIO_puts(out, "Modulus=");
         if (EVP_PKEY_is_a(tpubkey, "RSA") || EVP_PKEY_is_a(tpubkey, "RSA-PSS")) {
             BIGNUM *n = NULL;
 
@@ -1002,9 +1002,9 @@ int req_main(int argc, char **argv)
             BN_print(out, n);
             BN_free(n);
         } else {
-            fprintf(stdout, "Wrong Algorithm type");
+            BIO_puts(out, "Wrong Algorithm type");
         }
-        fprintf(stdout, "\n");
+        BIO_puts(out, "\n");
     }
 
     if (!noout && !gen_x509) {
diff --git a/crypto/openssl/apps/s_server.c b/crypto/openssl/apps/s_server.c
index a203d6a091ca..c8ccdfd03ca1 100644
--- a/crypto/openssl/apps/s_server.c
+++ b/crypto/openssl/apps/s_server.c
@@ -789,7 +789,7 @@ const OPTIONS s_server_options[] = {
      "second server certificate chain file in PEM format"},
     {"dkey", OPT_DKEY, '<',
      "Second private key file to use (usually for DSA)"},
-    {"dkeyform", OPT_DKEYFORM, 'F',
+    {"dkeyform", OPT_DKEYFORM, 'f',
      "Second key file format (ENGINE, other values ignored)"},
     {"dpass", OPT_DPASS, 's',
      "Second private key and cert file pass phrase source"},
diff --git a/crypto/openssl/crypto/aes/asm/aesv8-armx.pl b/crypto/openssl/crypto/aes/asm/aesv8-armx.pl
index 544dc7e8effe..837eb69e4aa1 100755
--- a/crypto/openssl/crypto/aes/asm/aesv8-armx.pl
+++ b/crypto/openssl/crypto/aes/asm/aesv8-armx.pl
@@ -120,6 +120,8 @@
 .Lenc_key:
 ___
 $code.=<<___	if ($flavour =~ /64/);
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 ___
@@ -295,7 +297,7 @@
 ${prefix}_set_decrypt_key:
 ___
 $code.=<<___	if ($flavour =~ /64/);
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 ___
@@ -339,7 +341,7 @@
 ___
 $code.=<<___	if ($flavour =~ /64/);
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 ___
 $code.=<<___;
@@ -359,6 +361,11 @@ ()
 .type	${prefix}_${dir}crypt,%function
 .align	5
 ${prefix}_${dir}crypt:
+___
+$code.=<<___	if ($flavour =~ /64/);
+	AARCH64_VALID_CALL_TARGET
+___
+$code.=<<___;
 	ldr	$rounds,[$key,#240]
 	vld1.32	{$rndkey0},[$key],#16
 	vld1.8	{$inout},[$inp]
@@ -442,6 +449,7 @@ ()
 ${prefix}_ecb_encrypt:
 ___
 $code.=<<___	if ($flavour =~ /64/);
+	AARCH64_VALID_CALL_TARGET
 	subs	$len,$len,#16
 	// Original input data size bigger than 16, jump to big size processing.
 	b.ne    .Lecb_big_size
@@ -1236,6 +1244,8 @@ ()
 ${prefix}_cbc_encrypt:
 ___
 $code.=<<___	if ($flavour =~ /64/);
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 ___
@@ -1764,6 +1774,8 @@ ()
 ${prefix}_ctr32_encrypt_blocks:
 ___
 $code.=<<___	if ($flavour =~ /64/);
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp		x29,x30,[sp,#-16]!
 	add		x29,sp,#0
 ___
@@ -2256,6 +2268,7 @@ ()
 ${prefix}_xts_encrypt:
 ___
 $code.=<<___	if ($flavour =~ /64/);
+	AARCH64_VALID_CALL_TARGET
 	cmp	$len,#16
 	// Original input data size bigger than 16, jump to big size processing.
 	b.ne	.Lxts_enc_big_size
@@ -2930,6 +2943,7 @@ ()
 .type	${prefix}_xts_decrypt,%function
 .align	5
 ${prefix}_xts_decrypt:
+	AARCH64_VALID_CALL_TARGET
 ___
 $code.=<<___	if ($flavour =~ /64/);
 	cmp	$len,#16
diff --git a/crypto/openssl/crypto/aes/asm/vpaes-armv8.pl b/crypto/openssl/crypto/aes/asm/vpaes-armv8.pl
index dcd5065e68c0..49988e9c2b29 100755
--- a/crypto/openssl/crypto/aes/asm/vpaes-armv8.pl
+++ b/crypto/openssl/crypto/aes/asm/vpaes-armv8.pl
@@ -53,6 +53,8 @@
 *STDOUT=*OUT;
 
 $code.=<<___;
+#include "arm_arch.h"
+
 .text
 
 .type	_vpaes_consts,%object
@@ -259,7 +261,7 @@
 .type	vpaes_encrypt,%function
 .align	4
 vpaes_encrypt:
-	.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -269,7 +271,7 @@
 	st1	{v0.16b}, [$out]
 
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_encrypt,.-vpaes_encrypt
 
@@ -492,7 +494,7 @@
 .type	vpaes_decrypt,%function
 .align	4
 vpaes_decrypt:
-	.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -502,7 +504,7 @@
 	st1	{v0.16b}, [$out]
 
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_decrypt,.-vpaes_decrypt
 
@@ -673,7 +675,7 @@
 .type	_vpaes_schedule_core,%function
 .align	4
 _vpaes_schedule_core:
-	.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29, x30, [sp,#-16]!
 	add	x29,sp,#0
 
@@ -838,7 +840,7 @@
 	eor	v6.16b, v6.16b, v6.16b		// vpxor	%xmm6,	%xmm6,	%xmm6
 	eor	v7.16b, v7.16b, v7.16b		// vpxor	%xmm7,	%xmm7,	%xmm7
 	ldp	x29, x30, [sp],#16
-	.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	_vpaes_schedule_core,.-_vpaes_schedule_core
 
@@ -1051,7 +1053,7 @@
 .type	vpaes_set_encrypt_key,%function
 .align	4
 vpaes_set_encrypt_key:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1067,7 +1069,7 @@
 
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_set_encrypt_key,.-vpaes_set_encrypt_key
 
@@ -1075,7 +1077,7 @@
 .type	vpaes_set_decrypt_key,%function
 .align	4
 vpaes_set_decrypt_key:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1095,7 +1097,7 @@
 
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_set_decrypt_key,.-vpaes_set_decrypt_key
 ___
@@ -1108,11 +1110,11 @@
 .type	vpaes_cbc_encrypt,%function
 .align	4
 vpaes_cbc_encrypt:
+	AARCH64_SIGN_LINK_REGISTER
 	cbz	$len, .Lcbc_abort
 	cmp	w5, #0			// check direction
 	b.eq	vpaes_cbc_decrypt
 
-	.inst	0xd503233f		// paciasp
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -1135,15 +1137,16 @@
 	st1	{v0.16b}, [$ivec]	// write ivec
 
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
 .Lcbc_abort:
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_cbc_encrypt,.-vpaes_cbc_encrypt
 
 .type	vpaes_cbc_decrypt,%function
 .align	4
 vpaes_cbc_decrypt:
-	.inst	0xd503233f		// paciasp
+	// Not adding AARCH64_SIGN_LINK_REGISTER here because vpaes_cbc_decrypt is jumped to
+	// only from vpaes_cbc_encrypt which has already signed the return address.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1185,7 +1188,7 @@
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_cbc_decrypt,.-vpaes_cbc_decrypt
 ___
@@ -1195,7 +1198,7 @@
 .type	vpaes_ecb_encrypt,%function
 .align	4
 vpaes_ecb_encrypt:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1229,7 +1232,7 @@
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_ecb_encrypt,.-vpaes_ecb_encrypt
 
@@ -1237,7 +1240,7 @@
 .type	vpaes_ecb_decrypt,%function
 .align	4
 vpaes_ecb_decrypt:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1271,7 +1274,7 @@
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_ecb_decrypt,.-vpaes_ecb_decrypt
 ___
diff --git a/crypto/openssl/crypto/aes/build.info b/crypto/openssl/crypto/aes/build.info
index b250903fa6e2..47f99fdf3366 100644
--- a/crypto/openssl/crypto/aes/build.info
+++ b/crypto/openssl/crypto/aes/build.info
@@ -116,6 +116,7 @@ INCLUDE[aes-mips.o]=..
 GENERATE[aesv8-armx.S]=asm/aesv8-armx.pl
 INCLUDE[aesv8-armx.o]=..
 GENERATE[vpaes-armv8.S]=asm/vpaes-armv8.pl
+INCLUDE[vpaes-armv8.o]=..
 
 GENERATE[aes-armv4.S]=asm/aes-armv4.pl
 INCLUDE[aes-armv4.o]=..
diff --git a/crypto/openssl/crypto/arm64cpuid.pl b/crypto/openssl/crypto/arm64cpuid.pl
index ac76dd449f37..11f0e5027942 100755
--- a/crypto/openssl/crypto/arm64cpuid.pl
+++ b/crypto/openssl/crypto/arm64cpuid.pl
@@ -31,6 +31,7 @@
 .globl	_armv7_neon_probe
 .type	_armv7_neon_probe,%function
 _armv7_neon_probe:
+	AARCH64_VALID_CALL_TARGET
 	orr	v15.16b, v15.16b, v15.16b
 	ret
 .size	_armv7_neon_probe,.-_armv7_neon_probe
@@ -38,6 +39,7 @@
 .globl	_armv7_tick
 .type	_armv7_tick,%function
 _armv7_tick:
+	AARCH64_VALID_CALL_TARGET
 #ifdef	__APPLE__
 	mrs	x0, CNTPCT_EL0
 #else
@@ -49,6 +51,7 @@
 .globl	_armv8_aes_probe
 .type	_armv8_aes_probe,%function
 _armv8_aes_probe:
+	AARCH64_VALID_CALL_TARGET
 	aese	v0.16b, v0.16b
 	ret
 .size	_armv8_aes_probe,.-_armv8_aes_probe
@@ -56,6 +59,7 @@
 .globl	_armv8_sha1_probe
 .type	_armv8_sha1_probe,%function
 _armv8_sha1_probe:
+	AARCH64_VALID_CALL_TARGET
 	sha1h	s0, s0
 	ret
 .size	_armv8_sha1_probe,.-_armv8_sha1_probe
@@ -63,6 +67,7 @@
 .globl	_armv8_sha256_probe
 .type	_armv8_sha256_probe,%function
 _armv8_sha256_probe:
+	AARCH64_VALID_CALL_TARGET
 	sha256su0	v0.4s, v0.4s
 	ret
 .size	_armv8_sha256_probe,.-_armv8_sha256_probe
@@ -70,6 +75,7 @@
 .globl	_armv8_pmull_probe
 .type	_armv8_pmull_probe,%function
 _armv8_pmull_probe:
+	AARCH64_VALID_CALL_TARGET
 	pmull	v0.1q, v0.1d, v0.1d
 	ret
 .size	_armv8_pmull_probe,.-_armv8_pmull_probe
@@ -77,6 +83,7 @@
 .globl	_armv8_sha512_probe
 .type	_armv8_sha512_probe,%function
 _armv8_sha512_probe:
+	AARCH64_VALID_CALL_TARGET
 	.long	0xcec08000	// sha512su0	v0.2d,v0.2d
 	ret
 .size	_armv8_sha512_probe,.-_armv8_sha512_probe
@@ -84,6 +91,7 @@
 .globl	_armv8_cpuid_probe
 .type	_armv8_cpuid_probe,%function
 _armv8_cpuid_probe:
+	AARCH64_VALID_CALL_TARGET
 	mrs	x0, midr_el1
 	ret
 .size	_armv8_cpuid_probe,.-_armv8_cpuid_probe
@@ -92,6 +100,7 @@
 .type	OPENSSL_cleanse,%function
 .align	5
 OPENSSL_cleanse:
+	AARCH64_VALID_CALL_TARGET
 	cbz	x1,.Lret	// len==0?
 	cmp	x1,#15
 	b.hi	.Lot		// len>15
@@ -123,6 +132,7 @@
 .type	CRYPTO_memcmp,%function
 .align	4
 CRYPTO_memcmp:
+	AARCH64_VALID_CALL_TARGET
 	eor	w3,w3,w3
 	cbz	x2,.Lno_data	// len==0?
 	cmp	x2,#16
diff --git a/crypto/openssl/crypto/arm_arch.h b/crypto/openssl/crypto/arm_arch.h
index 45d7e1556475..a815a5c72b7f 100644
--- a/crypto/openssl/crypto/arm_arch.h
+++ b/crypto/openssl/crypto/arm_arch.h
@@ -126,4 +126,62 @@ extern unsigned int OPENSSL_armv8_rsa_neonized;
 
 # define MIDR_IS_CPU_MODEL(midr, imp, partnum) \
            (((midr) & MIDR_CPU_MODEL_MASK) == MIDR_CPU_MODEL(imp, partnum))
+
+#if defined(__ASSEMBLER__)
+
+   /*
+    * Support macros for
+    *   - Armv8.3-A Pointer Authentication and
+    *   - Armv8.5-A Branch Target Identification
+    * features which require emitting a .note.gnu.property section with the
+    * appropriate architecture-dependent feature bits set.
+    * Read more: "ELF for the Arm® 64-bit Architecture"
+    */
+
+#  if defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1
+#   define GNU_PROPERTY_AARCH64_BTI (1 << 0)   /* Has Branch Target Identification */
+#   define AARCH64_VALID_CALL_TARGET hint #34  /* BTI 'c' */
+#  else
+#   define GNU_PROPERTY_AARCH64_BTI 0  /* No Branch Target Identification */
+#   define AARCH64_VALID_CALL_TARGET
+#  endif
+
+#  if defined(__ARM_FEATURE_PAC_DEFAULT) && \
+       (__ARM_FEATURE_PAC_DEFAULT & 1) == 1  /* Signed with A-key */
+#   define GNU_PROPERTY_AARCH64_POINTER_AUTH \
+     (1 << 1)                                       /* Has Pointer Authentication */
+#   define AARCH64_SIGN_LINK_REGISTER hint #25      /* PACIASP */
+#   define AARCH64_VALIDATE_LINK_REGISTER hint #29  /* AUTIASP */
+#  elif defined(__ARM_FEATURE_PAC_DEFAULT) && \
+       (__ARM_FEATURE_PAC_DEFAULT & 2) == 2  /* Signed with B-key */
+#   define GNU_PROPERTY_AARCH64_POINTER_AUTH \
+     (1 << 1)                                       /* Has Pointer Authentication */
+#   define AARCH64_SIGN_LINK_REGISTER hint #27      /* PACIBSP */
+#   define AARCH64_VALIDATE_LINK_REGISTER hint #31  /* AUTIBSP */
+#  else
+#   define GNU_PROPERTY_AARCH64_POINTER_AUTH 0  /* No Pointer Authentication */
+#   if GNU_PROPERTY_AARCH64_BTI != 0
+#    define AARCH64_SIGN_LINK_REGISTER AARCH64_VALID_CALL_TARGET
+#   else
+#    define AARCH64_SIGN_LINK_REGISTER
+#   endif
+#   define AARCH64_VALIDATE_LINK_REGISTER
+#  endif
+
+#  if GNU_PROPERTY_AARCH64_POINTER_AUTH != 0 || GNU_PROPERTY_AARCH64_BTI != 0
+    .pushsection .note.gnu.property, "a";
+    .balign 8;
+    .long 4;
+    .long 0x10;
+    .long 0x5;
+    .asciz "GNU";
+    .long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
+    .long 4;
+    .long (GNU_PROPERTY_AARCH64_POINTER_AUTH | GNU_PROPERTY_AARCH64_BTI);
+    .long 0;
+    .popsection;
+#  endif
+
+# endif  /* defined __ASSEMBLER__ */
+
 #endif
diff --git a/crypto/openssl/crypto/asn1/a_strnid.c b/crypto/openssl/crypto/asn1/a_strnid.c
index 9e54db929282..d052935661d3 100644
--- a/crypto/openssl/crypto/asn1/a_strnid.c
+++ b/crypto/openssl/crypto/asn1/a_strnid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -129,8 +129,10 @@ ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid)
     int idx;
     ASN1_STRING_TABLE fnd;
 
+#ifndef OPENSSL_NO_AUTOLOAD_CONFIG
     /* "stable" can be impacted by config, so load the config file first */
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL);
+#endif
 
     fnd.nid = nid;
     if (stable) {
diff --git a/crypto/openssl/crypto/asn1/asn1_gen.c b/crypto/openssl/crypto/asn1/asn1_gen.c
index 64620a4f28a7..402ab34e6a46 100644
--- a/crypto/openssl/crypto/asn1/asn1_gen.c
+++ b/crypto/openssl/crypto/asn1/asn1_gen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -698,9 +698,12 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype)
             atmp->value.asn1_string->data = rdata;
             atmp->value.asn1_string->length = rdlen;
             atmp->value.asn1_string->type = utype;
-        } else if (format == ASN1_GEN_FORMAT_ASCII)
-            ASN1_STRING_set(atmp->value.asn1_string, str, -1);
-        else if ((format == ASN1_GEN_FORMAT_BITLIST)
+        } else if (format == ASN1_GEN_FORMAT_ASCII) {
+            if (!ASN1_STRING_set(atmp->value.asn1_string, str, -1)) {
+                ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
+                goto bad_str;
+            }
+        } else if ((format == ASN1_GEN_FORMAT_BITLIST)
                  && (utype == V_ASN1_BIT_STRING)) {
             if (!CONF_parse_list
                 (str, ',', 1, bitstr_cb, atmp->value.bit_string)) {
diff --git a/crypto/openssl/crypto/bn/asm/armv8-mont.pl b/crypto/openssl/crypto/bn/asm/armv8-mont.pl
index 54d2e8245f15..21ab12bdf07e 100755
--- a/crypto/openssl/crypto/bn/asm/armv8-mont.pl
+++ b/crypto/openssl/crypto/bn/asm/armv8-mont.pl
@@ -67,8 +67,8 @@
 $num="x5";	# int num);
 
 $code.=<<___;
+#include "arm_arch.h"
 #ifndef	__KERNEL__
-# include "arm_arch.h"
 .extern OPENSSL_armv8_rsa_neonized
 .hidden OPENSSL_armv8_rsa_neonized
 #endif
@@ -78,6 +78,7 @@
 .type	bn_mul_mont,%function
 .align	5
 bn_mul_mont:
+	AARCH64_SIGN_LINK_REGISTER
 .Lbn_mul_mont:
 	tst	$num,#3
 	b.ne	.Lmul_mont
@@ -288,6 +289,7 @@
 	mov	x0,#1
 	ldp	x23,x24,[x29,#48]
 	ldr	x29,[sp],#64
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	bn_mul_mont,.-bn_mul_mont
 ___
@@ -309,6 +311,8 @@
 .type	bn_mul8x_mont_neon,%function
 .align	5
 bn_mul8x_mont_neon:
+	// Not adding AARCH64_SIGN_LINK_REGISTER here because bn_mul8x_mont_neon is jumped to
+	// only from bn_mul_mont which has already signed the return address.
 	stp	x29,x30,[sp,#-80]!
 	mov	x16,sp
 	stp	d8,d9,[sp,#16]
@@ -649,6 +653,7 @@
 	ldp	d10,d11,[sp,#32]
 	ldp	d8,d9,[sp,#16]
 	ldr	x29,[sp],#80
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret			// bx lr
 
 .size	bn_mul8x_mont_neon,.-bn_mul8x_mont_neon
@@ -671,7 +676,8 @@
 	cmp	$ap,$bp
 	b.ne	__bn_mul4x_mont
 .Lsqr8x_mont:
-	.inst	0xd503233f		// paciasp
+	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_sqr8x_mont is jumped to
+	// only from bn_mul_mont which has already signed the return address.
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -1425,7 +1431,8 @@
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
-	.inst	0xd50323bf		// autiasp
+	// x30 is loaded earlier
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	__bn_sqr8x_mont,.-__bn_sqr8x_mont
 ___
@@ -1449,7 +1456,8 @@
 .type	__bn_mul4x_mont,%function
 .align	5
 __bn_mul4x_mont:
-	.inst	0xd503233f		// paciasp
+	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_mul4x_mont is jumped to
+	// only from bn_mul_mont (or __bn_sqr8x_mont from bn_mul_mont) which has already signed the return address.
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -1883,7 +1891,8 @@
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
-	.inst	0xd50323bf		// autiasp
+	// x30 loaded earlier
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	__bn_mul4x_mont,.-__bn_mul4x_mont
 ___
diff --git a/crypto/openssl/crypto/chacha/asm/chacha-armv8.pl b/crypto/openssl/crypto/chacha/asm/chacha-armv8.pl
index dcdc4a04e367..e1a8b8159421 100755
--- a/crypto/openssl/crypto/chacha/asm/chacha-armv8.pl
+++ b/crypto/openssl/crypto/chacha/asm/chacha-armv8.pl
@@ -132,8 +132,8 @@ sub ROUND {
 }
 
 $code.=<<___;
+#include "arm_arch.h"
 #ifndef	__KERNEL__
-# include "arm_arch.h"
 .extern	OPENSSL_armcap_P
 .hidden	OPENSSL_armcap_P
 #endif
@@ -153,6 +153,7 @@ sub ROUND {
 .type	ChaCha20_ctr32,%function
 .align	5
 ChaCha20_ctr32:
+	AARCH64_SIGN_LINK_REGISTER
 	cbz	$len,.Labort
 	cmp	$len,#192
 	b.lo	.Lshort
@@ -165,7 +166,6 @@ sub ROUND {
 #endif
 
 .Lshort:
-	.inst	0xd503233f			// paciasp
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -285,8 +285,8 @@ sub ROUND {
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	.inst	0xd50323bf			// autiasp
 .Labort:
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 .align	4
@@ -342,7 +342,7 @@ sub ROUND {
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_ctr32,.-ChaCha20_ctr32
 ___
@@ -432,8 +432,8 @@ sub NEON_lane_ROUND {
 .type	ChaCha20_neon,%function
 .align	5
 ChaCha20_neon:
+	AARCH64_SIGN_LINK_REGISTER
 .LChaCha20_neon:
-	.inst	0xd503233f			// paciasp
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -667,7 +667,7 @@ sub NEON_lane_ROUND {
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 .align	4
@@ -799,7 +799,7 @@ sub NEON_lane_ROUND {
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_neon,.-ChaCha20_neon
 ___
@@ -844,7 +844,7 @@ sub NEONROUND {
 .type	ChaCha20_512_neon,%function
 .align	5
 ChaCha20_512_neon:
-	.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -1268,7 +1268,7 @@ sub NEONROUND {
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_512_neon,.-ChaCha20_512_neon
 ___
diff --git a/crypto/openssl/crypto/chacha/asm/chacha-ia64.pl b/crypto/openssl/crypto/chacha/asm/chacha-ia64.pl
index b13d97285575..78201649d550 100644
--- a/crypto/openssl/crypto/chacha/asm/chacha-ia64.pl
+++ b/crypto/openssl/crypto/chacha/asm/chacha-ia64.pl
@@ -46,6 +46,8 @@
 	ADDP		@k[11]=4,$key
 	.save		ar.lc,r3
 	mov		r3=ar.lc		}
+{ .mmi;	ADDP		$out=0,$out
+	ADDP		$inp=0,$inp		}
 { .mmi;	ADDP		$key=0,$key
 	ADDP		$counter=0,$counter
 	.save		pr,r14
diff --git a/crypto/openssl/crypto/cmp/cmp_asn.c b/crypto/openssl/crypto/cmp/cmp_asn.c
index 0ca107554c96..a8de73ad979b 100644
--- a/crypto/openssl/crypto/cmp/cmp_asn.c
+++ b/crypto/openssl/crypto/cmp/cmp_asn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
@@ -188,22 +188,22 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
     return 0;
 }
 
-/* get ASN.1 encoded integer, return -1 on error */
+/* get ASN.1 encoded integer, return -2 on error; -1 is valid for certReqId */
 int ossl_cmp_asn1_get_int(const ASN1_INTEGER *a)
 {
     int64_t res;
 
     if (!ASN1_INTEGER_get_int64(&res, a)) {
         ERR_raise(ERR_LIB_CMP, ASN1_R_INVALID_NUMBER);
-        return -1;
+        return -2;
     }
     if (res < INT_MIN) {
         ERR_raise(ERR_LIB_CMP, ASN1_R_TOO_SMALL);
-        return -1;
+        return -2;
     }
     if (res > INT_MAX) {
         ERR_raise(ERR_LIB_CMP, ASN1_R_TOO_LARGE);
-        return -1;
+        return -2;
     }
     return (int)res;
 }
diff --git a/crypto/openssl/crypto/cmp/cmp_client.c b/crypto/openssl/crypto/cmp/cmp_client.c
index dc41f4c3b7d9..df334cc00198 100644
--- a/crypto/openssl/crypto/cmp/cmp_client.c
+++ b/crypto/openssl/crypto/cmp/cmp_client.c
@@ -584,7 +584,7 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
         return 0;
     if (rid == OSSL_CMP_CERTREQID_NONE) { /* used for OSSL_CMP_PKIBODY_P10CR */
         rid = ossl_cmp_asn1_get_int(crep->certReqId);
-        if (rid != OSSL_CMP_CERTREQID_NONE) {
+        if (rid < OSSL_CMP_CERTREQID_NONE) {
             ERR_raise(ERR_LIB_CMP, CMP_R_BAD_REQUEST_ID);
             return 0;
         }
diff --git a/crypto/openssl/crypto/cmp/cmp_status.c b/crypto/openssl/crypto/cmp/cmp_status.c
index bfe6cd9906b8..68144aa4fed8 100644
--- a/crypto/openssl/crypto/cmp/cmp_status.c
+++ b/crypto/openssl/crypto/cmp/cmp_status.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
@@ -30,9 +30,12 @@
 
 int ossl_cmp_pkisi_get_status(const OSSL_CMP_PKISI *si)
 {
+    int res ;
+
     if (!ossl_assert(si != NULL && si->status != NULL))
         return -1;
-    return ossl_cmp_asn1_get_int(si->status);
+    res = ossl_cmp_asn1_get_int(si->status);
+    return res == -2 ? -1 : res;
 }
 
 const char *ossl_cmp_PKIStatus_to_string(int status)
diff --git a/crypto/openssl/crypto/cms/cms_env.c b/crypto/openssl/crypto/cms/cms_env.c
index bd1f3e7345d4..99cf1dcb396c 100644
--- a/crypto/openssl/crypto/cms/cms_env.c
+++ b/crypto/openssl/crypto/cms/cms_env.c
@@ -26,7 +26,7 @@ static void cms_env_set_version(CMS_EnvelopedData *env);
 #define CMS_ENVELOPED_STANDARD 1
 #define CMS_ENVELOPED_AUTH     2
 
-static int cms_get_enveloped_type(const CMS_ContentInfo *cms)
+static int cms_get_enveloped_type_simple(const CMS_ContentInfo *cms)
 {
     int nid = OBJ_obj2nid(cms->contentType);
 
@@ -38,11 +38,28 @@ static int cms_get_enveloped_type(const CMS_ContentInfo *cms)
         return CMS_ENVELOPED_AUTH;
 
     default:
-        ERR_raise(ERR_LIB_CMS, CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA);
         return 0;
     }
 }
 
+static int cms_get_enveloped_type(const CMS_ContentInfo *cms)
+{
+    int ret = cms_get_enveloped_type_simple(cms);
+
+    if (ret == 0)
+        ERR_raise(ERR_LIB_CMS, CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA);
+    return ret;
+}
+
+void ossl_cms_env_enc_content_free(const CMS_ContentInfo *cinf)
+{
+    if (cms_get_enveloped_type_simple(cinf) != 0) {
+        CMS_EncryptedContentInfo *ec = ossl_cms_get0_env_enc_content(cinf);
+        if (ec != NULL)
+            OPENSSL_clear_free(ec->key, ec->keylen);
+    }
+}
+
 CMS_EnvelopedData *ossl_cms_get0_enveloped(CMS_ContentInfo *cms)
 {
     if (OBJ_obj2nid(cms->contentType) != NID_pkcs7_enveloped) {
diff --git a/crypto/openssl/crypto/cms/cms_lib.c b/crypto/openssl/crypto/cms/cms_lib.c
index 1d2c5bc42288..8b135e95aacc 100644
--- a/crypto/openssl/crypto/cms/cms_lib.c
+++ b/crypto/openssl/crypto/cms/cms_lib.c
@@ -76,10 +76,7 @@ CMS_ContentInfo *CMS_ContentInfo_new(void)
 void CMS_ContentInfo_free(CMS_ContentInfo *cms)
 {
     if (cms != NULL) {
-        CMS_EncryptedContentInfo *ec = ossl_cms_get0_env_enc_content(cms);
-
-        if (ec != NULL)
-            OPENSSL_clear_free(ec->key, ec->keylen);
+        ossl_cms_env_enc_content_free(cms);
         OPENSSL_free(cms->ctx.propq);
         ASN1_item_free((ASN1_VALUE *)cms, ASN1_ITEM_rptr(CMS_ContentInfo));
     }
diff --git a/crypto/openssl/crypto/cms/cms_local.h b/crypto/openssl/crypto/cms/cms_local.h
index 15b4a29ce03d..253f6819e435 100644
--- a/crypto/openssl/crypto/cms/cms_local.h
+++ b/crypto/openssl/crypto/cms/cms_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -444,6 +444,7 @@ BIO *ossl_cms_EnvelopedData_init_bio(CMS_ContentInfo *cms);
 int ossl_cms_EnvelopedData_final(CMS_ContentInfo *cms, BIO *chain);
 BIO *ossl_cms_AuthEnvelopedData_init_bio(CMS_ContentInfo *cms);
 int ossl_cms_AuthEnvelopedData_final(CMS_ContentInfo *cms, BIO *cmsbio);
+void ossl_cms_env_enc_content_free(const CMS_ContentInfo *cinf);
 CMS_EnvelopedData *ossl_cms_get0_enveloped(CMS_ContentInfo *cms);
 CMS_AuthEnvelopedData *ossl_cms_get0_auth_enveloped(CMS_ContentInfo *cms);
 CMS_EncryptedContentInfo *ossl_cms_get0_env_enc_content(const CMS_ContentInfo *cms);
diff --git a/crypto/openssl/crypto/cms/cms_sd.c b/crypto/openssl/crypto/cms/cms_sd.c
index 34c021bba64a..53c8e378f318 100644
--- a/crypto/openssl/crypto/cms/cms_sd.c
+++ b/crypto/openssl/crypto/cms/cms_sd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -233,9 +233,9 @@ static int cms_sd_asn1_ctrl(CMS_SignerInfo *si, int cmd)
     int i;
 
     if (EVP_PKEY_is_a(pkey, "DSA") || EVP_PKEY_is_a(pkey, "EC"))
-        return ossl_cms_ecdsa_dsa_sign(si, cmd);
+        return ossl_cms_ecdsa_dsa_sign(si, cmd) > 0;
     else if (EVP_PKEY_is_a(pkey, "RSA") || EVP_PKEY_is_a(pkey, "RSA-PSS"))
-        return ossl_cms_rsa_sign(si, cmd);
+        return ossl_cms_rsa_sign(si, cmd) > 0;
 
     /* Something else? We'll give engines etc a chance to handle this */
     if (pkey->ameth == NULL || pkey->ameth->pkey_ctrl == NULL)
diff --git a/crypto/openssl/crypto/conf/conf_sap.c b/crypto/openssl/crypto/conf/conf_sap.c
index 513f8bfc1fb9..3019bcf31af8 100644
--- a/crypto/openssl/crypto/conf/conf_sap.c
+++ b/crypto/openssl/crypto/conf/conf_sap.c
@@ -65,7 +65,8 @@ int ossl_config_int(const OPENSSL_INIT_SETTINGS *settings)
 #endif
 
 #ifndef OPENSSL_SYS_UEFI
-    ret = CONF_modules_load_file(filename, appname, flags);
+    ret = CONF_modules_load_file_ex(OSSL_LIB_CTX_get0_global_default(),
+                                    filename, appname, flags);
 #else
     ret = 1;
 #endif
diff --git a/crypto/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl b/crypto/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl
index 81ee3947d7e4..6c5d0e8b3cf0 100755
--- a/crypto/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl
+++ b/crypto/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl
@@ -122,7 +122,7 @@
 .type	ecp_nistz256_to_mont,%function
 .align	6
 ecp_nistz256_to_mont:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-32]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -138,7 +138,7 @@
 
 	ldp	x19,x20,[sp,#16]
 	ldp	x29,x30,[sp],#32
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_to_mont,.-ecp_nistz256_to_mont
 
@@ -147,7 +147,7 @@
 .type	ecp_nistz256_from_mont,%function
 .align	4
 ecp_nistz256_from_mont:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-32]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -163,7 +163,7 @@
 
 	ldp	x19,x20,[sp,#16]
 	ldp	x29,x30,[sp],#32
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_from_mont,.-ecp_nistz256_from_mont
 
@@ -173,7 +173,7 @@
 .type	ecp_nistz256_mul_mont,%function
 .align	4
 ecp_nistz256_mul_mont:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-32]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -188,7 +188,7 @@
 
 	ldp	x19,x20,[sp,#16]
 	ldp	x29,x30,[sp],#32
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_mul_mont,.-ecp_nistz256_mul_mont
 
@@ -197,7 +197,7 @@
 .type	ecp_nistz256_sqr_mont,%function
 .align	4
 ecp_nistz256_sqr_mont:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-32]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -211,7 +211,7 @@
 
 	ldp	x19,x20,[sp,#16]
 	ldp	x29,x30,[sp],#32
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_sqr_mont,.-ecp_nistz256_sqr_mont
 
@@ -221,7 +221,7 @@
 .type	ecp_nistz256_add,%function
 .align	4
 ecp_nistz256_add:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -235,7 +235,7 @@
 	bl	__ecp_nistz256_add
 
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_add,.-ecp_nistz256_add
 
@@ -244,7 +244,7 @@
 .type	ecp_nistz256_div_by_2,%function
 .align	4
 ecp_nistz256_div_by_2:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -256,7 +256,7 @@
 	bl	__ecp_nistz256_div_by_2
 
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		//  autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_div_by_2,.-ecp_nistz256_div_by_2
 
@@ -265,7 +265,7 @@
 .type	ecp_nistz256_mul_by_2,%function
 .align	4
 ecp_nistz256_mul_by_2:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -281,7 +281,7 @@
 	bl	__ecp_nistz256_add	// ret = a+a	// 2*a
 
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_mul_by_2,.-ecp_nistz256_mul_by_2
 
@@ -290,7 +290,7 @@
 .type	ecp_nistz256_mul_by_3,%function
 .align	4
 ecp_nistz256_mul_by_3:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -317,7 +317,7 @@
 	bl	__ecp_nistz256_add	// ret += a	// 2*a+a=3*a
 
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_mul_by_3,.-ecp_nistz256_mul_by_3
 
@@ -327,7 +327,7 @@
 .type	ecp_nistz256_sub,%function
 .align	4
 ecp_nistz256_sub:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -339,7 +339,7 @@
 	bl	__ecp_nistz256_sub_from
 
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_sub,.-ecp_nistz256_sub
 
@@ -348,7 +348,7 @@
 .type	ecp_nistz256_neg,%function
 .align	4
 ecp_nistz256_neg:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -363,7 +363,7 @@
 	bl	__ecp_nistz256_sub_from
 
 	ldp	x29,x30,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_neg,.-ecp_nistz256_neg
 
@@ -724,7 +724,7 @@
 .type	ecp_nistz256_point_double,%function
 .align	5
 ecp_nistz256_point_double:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -859,7 +859,7 @@
 	ldp	x19,x20,[x29,#16]
 	ldp	x21,x22,[x29,#32]
 	ldp	x29,x30,[sp],#96
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_point_double,.-ecp_nistz256_point_double
 ___
@@ -882,7 +882,7 @@
 .type	ecp_nistz256_point_add,%function
 .align	5
 ecp_nistz256_point_add:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -1117,7 +1117,7 @@
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_point_add,.-ecp_nistz256_point_add
 ___
@@ -1139,7 +1139,7 @@
 .type	ecp_nistz256_point_add_affine,%function
 .align	5
 ecp_nistz256_point_add_affine:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-80]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -1328,7 +1328,7 @@
 	ldp	x23,x24,[x29,#48]
 	ldp	x25,x26,[x29,#64]
 	ldp	x29,x30,[sp],#80
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_point_add_affine,.-ecp_nistz256_point_add_affine
 ___
@@ -1346,6 +1346,8 @@
 .type	ecp_nistz256_ord_mul_mont,%function
 .align	4
 ecp_nistz256_ord_mul_mont:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-64]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -1487,6 +1489,8 @@
 .type	ecp_nistz256_ord_sqr_mont,%function
 .align	4
 ecp_nistz256_ord_sqr_mont:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-64]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -1641,6 +1645,8 @@
 .type	ecp_nistz256_scatter_w5,%function
 .align	4
 ecp_nistz256_scatter_w5:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -1703,6 +1709,8 @@
 .type	ecp_nistz256_gather_w5,%function
 .align	4
 ecp_nistz256_gather_w5:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -1780,6 +1788,8 @@
 .type	ecp_nistz256_scatter_w7,%function
 .align	4
 ecp_nistz256_scatter_w7:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -1824,6 +1834,8 @@
 .type	ecp_nistz256_gather_w7,%function
 .align	4
 ecp_nistz256_gather_w7:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
diff --git a/crypto/openssl/crypto/encode_decode/decoder_lib.c b/crypto/openssl/crypto/encode_decode/decoder_lib.c
index e24d2c6cd588..2e4b7ed60b9c 100644
--- a/crypto/openssl/crypto/encode_decode/decoder_lib.c
+++ b/crypto/openssl/crypto/encode_decode/decoder_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -743,10 +743,11 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
                            (void *)new_data.ctx, LEVEL, rv);
             } OSSL_TRACE_END(DECODER);
 
-            data->flag_construct_called = 1;
             ok = (rv > 0);
-            if (ok)
+            if (ok) {
+                data->flag_construct_called = 1;
                 goto end;
+            }
         }
 
         /* The constructor didn't return success */
diff --git a/crypto/openssl/crypto/encode_decode/decoder_pkey.c b/crypto/openssl/crypto/encode_decode/decoder_pkey.c
index ed10bb1cee03..ad5e2805319b 100644
--- a/crypto/openssl/crypto/encode_decode/decoder_pkey.c
+++ b/crypto/openssl/crypto/encode_decode/decoder_pkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -150,7 +150,11 @@ static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
 
             import_data.keymgmt = keymgmt;
             import_data.keydata = NULL;
-            import_data.selection = data->selection;
+            if (data->selection == 0)
+                /* import/export functions do not tolerate 0 selection */
+                import_data.selection = OSSL_KEYMGMT_SELECT_ALL;
+            else
+                import_data.selection = data->selection;
 
             /*
              * No need to check for errors here, the value of
diff --git a/crypto/openssl/crypto/engine/eng_lib.c b/crypto/openssl/crypto/engine/eng_lib.c
index dfd53a433195..cfdb5a50f481 100644
--- a/crypto/openssl/crypto/engine/eng_lib.c
+++ b/crypto/openssl/crypto/engine/eng_lib.c
@@ -133,28 +133,34 @@ static ENGINE_CLEANUP_ITEM *int_cleanup_item(ENGINE_CLEANUP_CB *cb)
     return item;
 }
 
-void engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb)
+int engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb)
 {
     ENGINE_CLEANUP_ITEM *item;
 
     if (!int_cleanup_check(1))
-        return;
+        return 0;
     item = int_cleanup_item(cb);
-    if (item != NULL)
-        if (sk_ENGINE_CLEANUP_ITEM_insert(cleanup_stack, item, 0) <= 0)
-            OPENSSL_free(item);
+    if (item != NULL) {
+        if (sk_ENGINE_CLEANUP_ITEM_insert(cleanup_stack, item, 0))
+            return 1;
+        OPENSSL_free(item);
+    }
+    return 0;
 }
 
-void engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb)
+int engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb)
 {
     ENGINE_CLEANUP_ITEM *item;
+
     if (!int_cleanup_check(1))
-        return;
+        return 0;
     item = int_cleanup_item(cb);
     if (item != NULL) {
-        if (sk_ENGINE_CLEANUP_ITEM_push(cleanup_stack, item) <= 0)
-            OPENSSL_free(item);
+        if (sk_ENGINE_CLEANUP_ITEM_push(cleanup_stack, item) > 0)
+            return 1;
+        OPENSSL_free(item);
     }
+    return 0;
 }
 
 /* The API function that performs all cleanup */
diff --git a/crypto/openssl/crypto/engine/eng_list.c b/crypto/openssl/crypto/engine/eng_list.c
index 04c73c762864..f2eed3b07174 100644
--- a/crypto/openssl/crypto/engine/eng_list.c
+++ b/crypto/openssl/crypto/engine/eng_list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -78,12 +78,15 @@ static int engine_list_add(ENGINE *e)
             ERR_raise(ERR_LIB_ENGINE, ENGINE_R_INTERNAL_LIST_ERROR);
             return 0;
         }
-        engine_list_head = e;
-        e->prev = NULL;
         /*
          * The first time the list allocates, we should register the cleanup.
          */
-        engine_cleanup_add_last(engine_list_cleanup);
+        if (!engine_cleanup_add_last(engine_list_cleanup)) {
+            ERR_raise(ERR_LIB_ENGINE, ENGINE_R_INTERNAL_LIST_ERROR);
+            return 0;
+        }
+        engine_list_head = e;
+        e->prev = NULL;
     } else {
         /* We are adding to the tail of an existing list. */
         if ((engine_list_tail == NULL) || (engine_list_tail->next != NULL)) {
diff --git a/crypto/openssl/crypto/engine/eng_local.h b/crypto/openssl/crypto/engine/eng_local.h
index 03a86299cf88..75bc9e6f1675 100644
--- a/crypto/openssl/crypto/engine/eng_local.h
+++ b/crypto/openssl/crypto/engine/eng_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -46,8 +46,8 @@ typedef struct st_engine_cleanup_item {
     ENGINE_CLEANUP_CB *cb;
 } ENGINE_CLEANUP_ITEM;
 DEFINE_STACK_OF(ENGINE_CLEANUP_ITEM)
-void engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb);
-void engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb);
+int engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb);
+int engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb);
 
 /* We need stacks of ENGINEs for use in eng_table.c */
 DEFINE_STACK_OF(ENGINE)
diff --git a/crypto/openssl/crypto/engine/eng_table.c b/crypto/openssl/crypto/engine/eng_table.c
index a8209d9e7176..3138a1526002 100644
--- a/crypto/openssl/crypto/engine/eng_table.c
+++ b/crypto/openssl/crypto/engine/eng_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -93,9 +93,11 @@ int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup,
         added = 1;
     if (!int_table_check(table, 1))
         goto end;
-    if (added)
-        /* The cleanup callback needs to be added */
-        engine_cleanup_add_first(cleanup);
+    /* The cleanup callback needs to be added */
+    if (added && !engine_cleanup_add_first(cleanup)) {
+        lh_ENGINE_PILE_free(&(*table)->piles);
+        *table = NULL;
+    }
     while (num_nids--) {
         tmplate.nid = *nids;
         fnd = lh_ENGINE_PILE_retrieve(&(*table)->piles, &tmplate);
@@ -201,8 +203,10 @@ ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid,
     ENGINE_PILE tmplate, *fnd = NULL;
     int initres, loop = 0;
 
+#ifndef OPENSSL_NO_AUTOLOAD_CONFIG
     /* Load the config before trying to check if engines are available */
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL);
+#endif
 
     if (!(*table)) {
         OSSL_TRACE3(ENGINE_TABLE,
diff --git a/crypto/openssl/crypto/evp/ctrl_params_translate.c b/crypto/openssl/crypto/evp/ctrl_params_translate.c
index b28875037c72..dcd53b43f92b 100644
--- a/crypto/openssl/crypto/evp/ctrl_params_translate.c
+++ b/crypto/openssl/crypto/evp/ctrl_params_translate.c
@@ -1786,7 +1786,8 @@ static int get_rsa_payload_n(enum state state,
 {
     const BIGNUM *bn = NULL;
 
-    if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA)
+    if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA
+        && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS)
         return 0;
     bn = RSA_get0_n(EVP_PKEY_get0_RSA(ctx->p2));
 
@@ -1799,7 +1800,8 @@ static int get_rsa_payload_e(enum state state,
 {
     const BIGNUM *bn = NULL;
 
-    if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA)
+    if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA
+        && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS)
         return 0;
     bn = RSA_get0_e(EVP_PKEY_get0_RSA(ctx->p2));
 
@@ -1812,7 +1814,8 @@ static int get_rsa_payload_d(enum state state,
 {
     const BIGNUM *bn = NULL;
 
-    if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA)
+    if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA
+        && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS)
         return 0;
     bn = RSA_get0_d(EVP_PKEY_get0_RSA(ctx->p2));
 
@@ -1912,7 +1915,8 @@ static int get_rsa_payload_coefficient(enum state state,
                          const struct translation_st *translation,      \
                          struct translation_ctx_st *ctx)                \
     {                                                                   \
-        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA)              \
+        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA               \
+            && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS)       \
             return 0;                                                   \
         return get_rsa_payload_factor(state, translation, ctx, n - 1);  \
     }
@@ -1923,7 +1927,8 @@ static int get_rsa_payload_coefficient(enum state state,
                          const struct translation_st *translation,      \
                          struct translation_ctx_st *ctx)                \
     {                                                                   \
-        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA)              \
+        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA               \
+            && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS)       \
             return 0;                                                   \
         return get_rsa_payload_exponent(state, translation, ctx,        \
                                         n - 1);                         \
@@ -1935,7 +1940,8 @@ static int get_rsa_payload_coefficient(enum state state,
                          const struct translation_st *translation,      \
                          struct translation_ctx_st *ctx)                \
     {                                                                   \
-        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA)              \
+        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA               \
+            && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS)       \
             return 0;                                                   \
         return get_rsa_payload_coefficient(state, translation, ctx,     \
                                            n - 1);                      \
@@ -2271,10 +2277,10 @@ static const struct translation_st evp_pkey_ctx_translations[] = {
     { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
       EVP_PKEY_CTRL_RSA_KEYGEN_BITS, "rsa_keygen_bits", NULL,
       OSSL_PKEY_PARAM_RSA_BITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_KEYGEN,
+    { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
       EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, "rsa_keygen_pubexp", NULL,
       OSSL_PKEY_PARAM_RSA_E, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_KEYGEN,
+    { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
       EVP_PKEY_CTRL_RSA_KEYGEN_PRIMES, "rsa_keygen_primes", NULL,
       OSSL_PKEY_PARAM_RSA_PRIMES, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
 
diff --git a/crypto/openssl/crypto/evp/p_lib.c b/crypto/openssl/crypto/evp/p_lib.c
index aa6ec31dab6e..59a7a867ecbb 100644
--- a/crypto/openssl/crypto/evp/p_lib.c
+++ b/crypto/openssl/crypto/evp/p_lib.c
@@ -717,6 +717,7 @@ static void detect_foreign_key(EVP_PKEY *pkey)
 {
     switch (pkey->type) {
     case EVP_PKEY_RSA:
+    case EVP_PKEY_RSA_PSS:
         pkey->foreign = pkey->pkey.rsa != NULL
                         && ossl_rsa_is_foreign(pkey->pkey.rsa);
         break;
@@ -1075,6 +1076,7 @@ int EVP_PKEY_can_sign(const EVP_PKEY *pkey)
     if (pkey->keymgmt == NULL) {
         switch (EVP_PKEY_get_base_id(pkey)) {
         case EVP_PKEY_RSA:
+        case EVP_PKEY_RSA_PSS:
             return 1;
 # ifndef OPENSSL_NO_DSA
         case EVP_PKEY_DSA:
diff --git a/crypto/openssl/crypto/http/http_client.c b/crypto/openssl/crypto/http/http_client.c
index ee41c03103e5..e3ccc6c4cc2f 100644
--- a/crypto/openssl/crypto/http/http_client.c
+++ b/crypto/openssl/crypto/http/http_client.c
@@ -164,7 +164,8 @@ void OSSL_HTTP_REQ_CTX_set_max_response_length(OSSL_HTTP_REQ_CTX *rctx,
 
 /*
  * Create request line using |rctx| and |path| (or "/" in case |path| is NULL).
- * Server name (and port) must be given if and only if plain HTTP proxy is used.
+ * Server name (and optional port) must be given if and only if
+ * a plain HTTP proxy is used and |path| does not begin with 'http://'.
  */
 int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
                                        const char *server, const char *port,
@@ -193,11 +194,17 @@ int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
             return 0;
     }
 
-    /* Make sure path includes a forward slash */
-    if (path == NULL)
+    /* Make sure path includes a forward slash (abs_path) */
+    if (path == NULL)  {
         path = "/";
-    if (path[0] != '/' && BIO_printf(rctx->mem, "/") <= 0)
+    } else if (HAS_PREFIX(path, "http://")) { /* absoluteURI for proxy use */
+        if (server != NULL) {
+            ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_INVALID_ARGUMENT);
+            return 0;
+        }
+    } else if (path[0] != '/' && BIO_printf(rctx->mem, "/") <= 0) {
         return 0;
+    }
     /*
      * Add (the rest of) the path and the HTTP version,
      * which is fixed to 1.0 for straightforward implementation of keep-alive
diff --git a/crypto/openssl/crypto/mem.c b/crypto/openssl/crypto/mem.c
index f6cdcf5a423e..bc9dc111676f 100644
--- a/crypto/openssl/crypto/mem.c
+++ b/crypto/openssl/crypto/mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -195,7 +195,6 @@ void *CRYPTO_zalloc(size_t num, const char *file, int line)
     void *ret;
 
     ret = CRYPTO_malloc(num, file, line);
-    FAILTEST();
     if (ret != NULL)
         memset(ret, 0, num);
 
@@ -208,7 +207,6 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
     if (realloc_impl != CRYPTO_realloc)
         return realloc_impl(str, num, file, line);
 
-    FAILTEST();
     if (str == NULL)
         return CRYPTO_malloc(num, file, line);
 
@@ -217,6 +215,7 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
         return NULL;
     }
 
+    FAILTEST();
     return realloc(str, num);
 }
 
diff --git a/crypto/openssl/crypto/modes/asm/aes-gcm-armv8_64.pl b/crypto/openssl/crypto/modes/asm/aes-gcm-armv8_64.pl
index 302b6f5a8ec8..ac061f797d32 100755
--- a/crypto/openssl/crypto/modes/asm/aes-gcm-armv8_64.pl
+++ b/crypto/openssl/crypto/modes/asm/aes-gcm-armv8_64.pl
@@ -257,6 +257,7 @@
 .type   aes_gcm_enc_128_kernel,%function
 .align  4
 aes_gcm_enc_128_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz     x1, .L128_enc_ret
 	stp     x19, x20, [sp, #-112]!
 	mov     x16, x4
@@ -1142,6 +1143,7 @@
 .type   aes_gcm_dec_128_kernel,%function
 .align  4
 aes_gcm_dec_128_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz     x1, .L128_dec_ret
 	stp     x19, x20, [sp, #-112]!
 	mov     x16, x4
@@ -2099,6 +2101,7 @@
 .type   aes_gcm_enc_192_kernel,%function
 .align  4
 aes_gcm_enc_192_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz     x1, .L192_enc_ret
 	stp     x19, x20, [sp, #-112]!
 	mov     x16, x4
@@ -3035,6 +3038,7 @@
 .type   aes_gcm_dec_192_kernel,%function
 .align  4
 aes_gcm_dec_192_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz     x1, .L192_dec_ret
 	stp     x19, x20, [sp, #-112]!
 	mov     x16, x4
@@ -4042,6 +4046,7 @@
 .type   aes_gcm_enc_256_kernel,%function
 .align  4
 aes_gcm_enc_256_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz     x1, .L256_enc_ret
 	stp     x19, x20, [sp, #-112]!
 	mov     x16, x4
@@ -5026,6 +5031,7 @@
 .type   aes_gcm_dec_256_kernel,%function
 .align  4
 aes_gcm_dec_256_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz     x1, .L256_dec_ret
 	stp     x19, x20, [sp, #-112]!
 	mov     x16, x4
diff --git a/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl b/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl
index b1d35d25b5b1..57f893e77c1d 100644
--- a/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl
+++ b/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl
@@ -107,6 +107,11 @@
 .type	gcm_init_v8,%function
 .align	4
 gcm_init_v8:
+___
+$code.=<<___	if ($flavour =~ /64/);
+	AARCH64_VALID_CALL_TARGET
+___
+$code.=<<___;
 	vld1.64		{$t1},[x1]		@ load input H
 	vmov.i8		$xC2,#0xe1
 	vshl.i64	$xC2,$xC2,#57		@ 0xc2.0
@@ -214,6 +219,11 @@
 .type	gcm_gmult_v8,%function
 .align	4
 gcm_gmult_v8:
+___
+$code.=<<___	if ($flavour =~ /64/);
+	AARCH64_VALID_CALL_TARGET
+___
+$code.=<<___;
 	vld1.64		{$t1},[$Xi]		@ load Xi
 	vmov.i8		$xC2,#0xe1
 	vld1.64		{$H-$Hhl},[$Htbl]	@ load twisted H, ...
@@ -268,6 +278,7 @@
 gcm_ghash_v8:
 ___
 $code.=<<___	if ($flavour =~ /64/);
+	AARCH64_VALID_CALL_TARGET
 	cmp		$len,#64
 	b.hs		.Lgcm_ghash_v8_4x
 ___
diff --git a/crypto/openssl/crypto/pem/pem_pkey.c b/crypto/openssl/crypto/pem/pem_pkey.c
index 3e76852c67a4..4deee46ce550 100644
--- a/crypto/openssl/crypto/pem/pem_pkey.c
+++ b/crypto/openssl/crypto/pem/pem_pkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -366,10 +366,19 @@ int PEM_write_bio_PrivateKey_traditional(BIO *bp, const EVP_PKEY *x,
     return ret;
 }
 
+static int no_password_cb(char *buf, int num, int rwflag, void *userdata)
+{
+    return -1;
+}
+
 EVP_PKEY *PEM_read_bio_Parameters_ex(BIO *bp, EVP_PKEY **x,
                                      OSSL_LIB_CTX *libctx, const char *propq)
 {
-    return pem_read_bio_key(bp, x, NULL, NULL, libctx, propq,
+    /*
+     * PEM_read_bio_Parameters(_ex) should never ask for a password. Any attempt
+     * to get a password just fails.
+     */
+    return pem_read_bio_key(bp, x, no_password_cb, NULL, libctx, propq,
                             EVP_PKEY_KEY_PARAMETERS);
 }
 
diff --git a/crypto/openssl/crypto/perlasm/arm-xlate.pl b/crypto/openssl/crypto/perlasm/arm-xlate.pl
index 57b75c4e5dad..38d570c79017 100755
--- a/crypto/openssl/crypto/perlasm/arm-xlate.pl
+++ b/crypto/openssl/crypto/perlasm/arm-xlate.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/crypto/pkcs12/p12_crt.c b/crypto/openssl/crypto/pkcs12/p12_crt.c
index 00c71297463d..26a444f868b0 100644
--- a/crypto/openssl/crypto/pkcs12/p12_crt.c
+++ b/crypto/openssl/crypto/pkcs12/p12_crt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -14,6 +14,12 @@
 
 static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
                           PKCS12_SAFEBAG *bag);
+static PKCS12_SAFEBAG *pkcs12_add_cert_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
+                                           X509 *cert,
+                                           const char *name,
+                                           int namelen,
+                                           unsigned char *keyid,
+                                           int keyidlen);
 
 static int copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid)
 {
@@ -40,6 +46,9 @@ PKCS12 *PKCS12_create_ex(const char *pass, const char *name, EVP_PKEY *pkey,
     int i;
     unsigned char keyid[EVP_MAX_MD_SIZE];
     unsigned int keyidlen = 0;
+    int namelen = -1;
+    unsigned char *pkeyid = NULL;
+    int pkeyidlen = -1;
 
     /* Set defaults */
     if (nid_cert == NID_undef)
@@ -64,11 +73,16 @@ PKCS12 *PKCS12_create_ex(const char *pass, const char *name, EVP_PKEY *pkey,
     }
 
     if (cert) {
-        bag = PKCS12_add_cert(&bags, cert);
-        if (name && !PKCS12_add_friendlyname(bag, name, -1))
-            goto err;
-        if (keyidlen && !PKCS12_add_localkeyid(bag, keyid, keyidlen))
-            goto err;
+        if (name == NULL)
+            name = (char *)X509_alias_get0(cert, &namelen);
+        if (keyidlen > 0) {
+            pkeyid = keyid;
+            pkeyidlen = keyidlen;
+        } else {
+            pkeyid = X509_keyid_get0(cert, &pkeyidlen);
+        }
+
+        bag = pkcs12_add_cert_bag(&bags, cert, name, namelen, pkeyid, pkeyidlen);
     }
 
     /* Add all other certificates */
@@ -139,30 +153,23 @@ PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey, X509 *
                             iter, mac_iter, keytype, NULL, NULL);
 }
 
-PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert)
+static PKCS12_SAFEBAG *pkcs12_add_cert_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
+                                           X509 *cert,
+                                           const char *name,
+                                           int namelen,
+                                           unsigned char *keyid,
+                                           int keyidlen)
 {
     PKCS12_SAFEBAG *bag = NULL;
-    char *name;
-    int namelen = -1;
-    unsigned char *keyid;
-    int keyidlen = -1;
 
     /* Add user certificate */
     if ((bag = PKCS12_SAFEBAG_create_cert(cert)) == NULL)
         goto err;
 
-    /*
-     * Use friendlyName and localKeyID in certificate. (if present)
-     */
-
-    name = (char *)X509_alias_get0(cert, &namelen);
-
-    if (name && !PKCS12_add_friendlyname(bag, name, namelen))
+    if (name != NULL && !PKCS12_add_friendlyname(bag, name, namelen))
         goto err;
 
-    keyid = X509_keyid_get0(cert, &keyidlen);
-
-    if (keyid && !PKCS12_add_localkeyid(bag, keyid, keyidlen))
+    if (keyid != NULL && !PKCS12_add_localkeyid(bag, keyid, keyidlen))
         goto err;
 
     if (!pkcs12_add_bag(pbags, bag))
@@ -173,7 +180,22 @@ PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert)
  err:
     PKCS12_SAFEBAG_free(bag);
     return NULL;
+}
+
+PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert)
+{
+    char *name = NULL;
+    int namelen = -1;
+    unsigned char *keyid = NULL;
+    int keyidlen = -1;
+
+    /*
+     * Use friendlyName and localKeyID in certificate. (if present)
+     */
+    name = (char *)X509_alias_get0(cert, &namelen);
+    keyid = X509_keyid_get0(cert, &keyidlen);
 
+    return pkcs12_add_cert_bag(pbags, cert, name, namelen, keyid, keyidlen);
 }
 
 PKCS12_SAFEBAG *PKCS12_add_key_ex(STACK_OF(PKCS12_SAFEBAG) **pbags,
diff --git a/crypto/openssl/crypto/poly1305/asm/poly1305-armv8.pl b/crypto/openssl/crypto/poly1305/asm/poly1305-armv8.pl
index 113a2151b6fa..20816c428316 100755
--- a/crypto/openssl/crypto/poly1305/asm/poly1305-armv8.pl
+++ b/crypto/openssl/crypto/poly1305/asm/poly1305-armv8.pl
@@ -72,6 +72,7 @@
 .type	poly1305_init,%function
 .align	5
 poly1305_init:
+	AARCH64_VALID_CALL_TARGET
 	cmp	$inp,xzr
 	stp	xzr,xzr,[$ctx]		// zero hash value
 	stp	xzr,xzr,[$ctx,#16]	// [along with is_base2_26]
@@ -119,6 +120,9 @@
 .align	5
 poly1305_blocks:
 .Lpoly1305_blocks:
+	// The symbol .Lpoly1305_blocks is not a .globl symbol
+	// but a pointer to it is returned by poly1305_init
+	AARCH64_VALID_CALL_TARGET
 	ands	$len,$len,#-16
 	b.eq	.Lno_data
 
@@ -184,6 +188,9 @@
 .align	5
 poly1305_emit:
 .Lpoly1305_emit:
+	// The symbol .poly1305_emit is not a .globl symbol
+	// but a pointer to it is returned by poly1305_init
+	AARCH64_VALID_CALL_TARGET
 	ldp	$h0,$h1,[$ctx]		// load hash base 2^64
 	ldr	$h2,[$ctx,#16]
 	ldp	$t0,$t1,[$nonce]	// load nonce
@@ -291,13 +298,16 @@
 .align	5
 poly1305_blocks_neon:
 .Lpoly1305_blocks_neon:
+	// The symbol .Lpoly1305_blocks_neon is not a .globl symbol
+	// but a pointer to it is returned by poly1305_init
+	AARCH64_VALID_CALL_TARGET
 	ldr	$is_base2_26,[$ctx,#24]
 	cmp	$len,#128
 	b.hs	.Lblocks_neon
 	cbz	$is_base2_26,.Lpoly1305_blocks
 
 .Lblocks_neon:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-80]!
 	add	x29,sp,#0
 
@@ -867,7 +877,7 @@
 
 .Lno_data_neon:
 	ldr	x29,[sp],#80
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	poly1305_blocks_neon,.-poly1305_blocks_neon
 
@@ -875,6 +885,9 @@
 .align	5
 poly1305_emit_neon:
 .Lpoly1305_emit_neon:
+	// The symbol .Lpoly1305_emit_neon is not a .globl symbol
+	// but a pointer to it is returned by poly1305_init
+	AARCH64_VALID_CALL_TARGET
 	ldr	$is_base2_26,[$ctx,#24]
 	cbz	$is_base2_26,poly1305_emit
 
diff --git a/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl
index fa9bfb7a7b81..4cddca1c514c 100755
--- a/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl
+++ b/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -195,7 +195,7 @@ sub poly1305_iteration {
 	bt	\$`5+32`,%r9		# AVX2?
 	cmovc	%rax,%r10
 ___
-$code.=<<___	if ($avx>3);
+$code.=<<___	if ($avx>3 && !$win64);
 	mov	\$`(1<<31|1<<21|1<<16)`,%rax
 	shr	\$32,%r9
 	and	%rax,%r9
@@ -2724,7 +2724,7 @@ sub poly1305_iteration {
 .cfi_endproc
 .size	poly1305_blocks_avx512,.-poly1305_blocks_avx512
 ___
-if ($avx>3) {
+if ($avx>3 && !$win64) {
 ########################################################################
 # VPMADD52 version using 2^44 radix.
 #
diff --git a/crypto/openssl/crypto/property/property.c b/crypto/openssl/crypto/property/property.c
index b97861d4862f..602db0f3ff54 100644
--- a/crypto/openssl/crypto/property/property.c
+++ b/crypto/openssl/crypto/property/property.c
@@ -129,11 +129,11 @@ static const OSSL_LIB_CTX_METHOD ossl_ctx_global_properties_method = {
 };
 
 OSSL_PROPERTY_LIST **ossl_ctx_global_properties(OSSL_LIB_CTX *libctx,
-                                                int loadconfig)
+                                                ossl_unused int loadconfig)
 {
     OSSL_GLOBAL_PROPERTIES *globp;
 
-#ifndef FIPS_MODULE
+#if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG)
     if (loadconfig && !OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL))
         return NULL;
 #endif
@@ -513,7 +513,7 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store,
     if (nid <= 0 || method == NULL || store == NULL)
         return 0;
 
-#ifndef FIPS_MODULE
+#if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG)
     if (ossl_lib_ctx_is_default(store->ctx)
             && !OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL))
         return 0;
diff --git a/crypto/openssl/crypto/provider_core.c b/crypto/openssl/crypto/provider_core.c
index 7a1232812162..92cce32c5bbf 100644
--- a/crypto/openssl/crypto/provider_core.c
+++ b/crypto/openssl/crypto/provider_core.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -408,7 +408,7 @@ int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
 }
 
 OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name,
-                                  int noconfig)
+                                  ossl_unused int noconfig)
 {
     struct provider_store_st *store = NULL;
     OSSL_PROVIDER *prov = NULL;
@@ -417,7 +417,7 @@ OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name,
         OSSL_PROVIDER tmpl = { 0, };
         int i;
 
-#ifndef FIPS_MODULE
+#if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG)
         /*
          * Make sure any providers are loaded from config before we try to find
          * them.
@@ -1356,7 +1356,7 @@ int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
     struct provider_store_st *store = get_provider_store(ctx);
     STACK_OF(OSSL_PROVIDER) *provs = NULL;
 
-#ifndef FIPS_MODULE
+#if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG)
     /*
      * Make sure any providers are loaded from config before we try to use
      * them.
diff --git a/crypto/openssl/crypto/rsa/rsa_ameth.c b/crypto/openssl/crypto/rsa/rsa_ameth.c
index e819780e7d94..07734077e322 100644
--- a/crypto/openssl/crypto/rsa/rsa_ameth.c
+++ b/crypto/openssl/crypto/rsa/rsa_ameth.c
@@ -60,13 +60,16 @@ static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     if (!rsa_param_encode(pkey, &str, &strtype))
         return 0;
     penclen = i2d_RSAPublicKey(pkey->pkey.rsa, &penc);
-    if (penclen <= 0)
+    if (penclen <= 0) {
+        ASN1_STRING_free(str);
         return 0;
+    }
     if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
                                strtype, str, penc, penclen))
         return 1;
 
     OPENSSL_free(penc);
+    ASN1_STRING_free(str);
     return 0;
 }
 
diff --git a/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl b/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl
index 65102e7c292f..40f7aa7a695a 100755
--- a/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl
+++ b/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl
@@ -80,6 +80,8 @@
                 [ 18,  2, 61, 56, 14 ]);
 
 $code.=<<___;
+#include "arm_arch.h"
+
 .text
 
 .align 8	// strategic alignment and padding that allows to use
@@ -124,8 +126,8 @@
 .type	KeccakF1600_int,%function
 .align	5
 KeccakF1600_int:
+	AARCH64_SIGN_LINK_REGISTER
 	adr	$C[2],iotas
-	.inst	0xd503233f			// paciasp
 	stp	$C[2],x30,[sp,#16]		// 32 bytes on top are mine
 	b	.Loop
 .align	4
@@ -297,14 +299,14 @@
 	bne	.Loop
 
 	ldr	x30,[sp,#24]
-	.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	KeccakF1600_int,.-KeccakF1600_int
 
 .type	KeccakF1600,%function
 .align	5
 KeccakF1600:
-	.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -354,7 +356,7 @@
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
-	.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	KeccakF1600,.-KeccakF1600
 
@@ -362,7 +364,7 @@
 .type	SHA3_absorb,%function
 .align	5
 SHA3_absorb:
-	.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -460,7 +462,7 @@
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
-	.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	SHA3_absorb,.-SHA3_absorb
 ___
@@ -471,7 +473,7 @@
 .type	SHA3_squeeze,%function
 .align	5
 SHA3_squeeze:
-	.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-48]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -534,7 +536,7 @@
 	ldp	x19,x20,[sp,#16]
 	ldp	x21,x22,[sp,#32]
 	ldp	x29,x30,[sp],#48
-	.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	SHA3_squeeze,.-SHA3_squeeze
 ___
@@ -653,7 +655,7 @@
 .type	KeccakF1600_cext,%function
 .align	5
 KeccakF1600_cext:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-80]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#16]		// per ABI requirement
@@ -686,7 +688,7 @@
 	ldp	d12,d13,[sp,#48]
 	ldp	d14,d15,[sp,#64]
 	ldr	x29,[sp],#80
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	KeccakF1600_cext,.-KeccakF1600_cext
 ___
@@ -699,7 +701,7 @@
 .type	SHA3_absorb_cext,%function
 .align	5
 SHA3_absorb_cext:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-80]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#16]		// per ABI requirement
@@ -771,7 +773,7 @@
 	ldp	d12,d13,[sp,#48]
 	ldp	d14,d15,[sp,#64]
 	ldp	x29,x30,[sp],#80
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	SHA3_absorb_cext,.-SHA3_absorb_cext
 ___
@@ -783,7 +785,7 @@
 .type	SHA3_squeeze_cext,%function
 .align	5
 SHA3_squeeze_cext:
-	.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	mov	x9,$ctx
@@ -839,7 +841,7 @@
 
 .Lsqueeze_done_ce:
 	ldr	x29,[sp],#16
-	.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	SHA3_squeeze_cext,.-SHA3_squeeze_cext
 ___
diff --git a/crypto/openssl/crypto/sha/asm/sha1-armv8.pl b/crypto/openssl/crypto/sha/asm/sha1-armv8.pl
index cdea8845af85..5f23a20c1ab7 100755
--- a/crypto/openssl/crypto/sha/asm/sha1-armv8.pl
+++ b/crypto/openssl/crypto/sha/asm/sha1-armv8.pl
@@ -175,8 +175,8 @@ sub BODY_20_39 {
 }
 
 $code.=<<___;
+#include "arm_arch.h"
 #ifndef	__KERNEL__
-# include "arm_arch.h"
 .extern OPENSSL_armcap_P
 .hidden OPENSSL_armcap_P
 #endif
@@ -187,11 +187,13 @@ sub BODY_20_39 {
 .type	sha1_block_data_order,%function
 .align	6
 sha1_block_data_order:
+	AARCH64_VALID_CALL_TARGET
 	adrp	x16,OPENSSL_armcap_P
 	ldr	w16,[x16,#:lo12:OPENSSL_armcap_P]
 	tst	w16,#ARMV8_SHA1
 	b.ne	.Lv8_entry
 
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -253,6 +255,7 @@ sub BODY_20_39 {
 .align	6
 sha1_block_armv8:
 .Lv8_entry:
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
diff --git a/crypto/openssl/crypto/sha/asm/sha512-armv8.pl b/crypto/openssl/crypto/sha/asm/sha512-armv8.pl
index 6bcff0b7d3f3..f900882fee8b 100755
--- a/crypto/openssl/crypto/sha/asm/sha512-armv8.pl
+++ b/crypto/openssl/crypto/sha/asm/sha512-armv8.pl
@@ -190,8 +190,8 @@ sub BODY_00_xx {
 }
 
 $code.=<<___;
+#include "arm_arch.h"
 #ifndef	__KERNEL__
-# include "arm_arch.h"
 .extern	OPENSSL_armcap_P
 .hidden	OPENSSL_armcap_P
 #endif
@@ -202,6 +202,7 @@ sub BODY_00_xx {
 .type	$func,%function
 .align	6
 $func:
+	AARCH64_VALID_CALL_TARGET
 #ifndef	__KERNEL__
 	adrp	x16,OPENSSL_armcap_P
 	ldr	w16,[x16,#:lo12:OPENSSL_armcap_P]
@@ -218,7 +219,7 @@ sub BODY_00_xx {
 ___
 $code.=<<___;
 #endif
-	.inst	0xd503233f				// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 
@@ -280,7 +281,7 @@ sub BODY_00_xx {
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
-	.inst	0xd50323bf				// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	$func,.-$func
 
@@ -370,6 +371,7 @@ sub BODY_00_xx {
 .align	6
 sha256_block_armv8:
 .Lv8_entry:
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp		x29,x30,[sp,#-16]!
 	add		x29,sp,#0
 
@@ -632,7 +634,9 @@ ()
 .type	sha256_block_neon,%function
 .align	4
 sha256_block_neon:
+	AARCH64_VALID_CALL_TARGET
 .Lneon_entry:
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later
 	stp	x29, x30, [sp, #-16]!
 	mov	x29, sp
 	sub	sp,sp,#16*4
@@ -743,6 +747,7 @@ ()
 .align	6
 sha512_block_armv8:
 .Lv8_entry:
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later
 	stp		x29,x30,[sp,#-16]!
 	add		x29,sp,#0
 
diff --git a/crypto/openssl/crypto/sha/build.info b/crypto/openssl/crypto/sha/build.info
index d61f7de9b6bd..556a658d8b55 100644
--- a/crypto/openssl/crypto/sha/build.info
+++ b/crypto/openssl/crypto/sha/build.info
@@ -153,6 +153,7 @@ INCLUDE[sha256-armv8.o]=..
 GENERATE[sha512-armv8.S]=asm/sha512-armv8.pl
 INCLUDE[sha512-armv8.o]=..
 GENERATE[keccak1600-armv8.S]=asm/keccak1600-armv8.pl
+INCLUDE[keccak1600-armv8.o]=..
 
 GENERATE[sha1-s390x.S]=asm/sha1-s390x.pl
 INCLUDE[sha1-s390x.o]=..
diff --git a/crypto/openssl/crypto/srp/srp_vfy.c b/crypto/openssl/crypto/srp/srp_vfy.c
index e8beb60d278a..96d511ffe636 100644
--- a/crypto/openssl/crypto/srp/srp_vfy.c
+++ b/crypto/openssl/crypto/srp/srp_vfy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2004, EdelKey Project. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -283,6 +283,7 @@ SRP_VBASE *SRP_VBASE_new(char *seed_key)
         return NULL;
     if ((vb->users_pwd = sk_SRP_user_pwd_new_null()) == NULL
         || (vb->gN_cache = sk_SRP_gN_cache_new_null()) == NULL) {
+        sk_SRP_user_pwd_free(vb->users_pwd);
         OPENSSL_free(vb);
         return NULL;
     }
diff --git a/crypto/openssl/crypto/store/store_lib.c b/crypto/openssl/crypto/store/store_lib.c
index 5ff927862916..bc12d8dd13a2 100644
--- a/crypto/openssl/crypto/store/store_lib.c
+++ b/crypto/openssl/crypto/store/store_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -424,14 +424,14 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx)
 
             load_data.v = NULL;
             load_data.ctx = ctx;
+            ctx->error_flag = 0;
 
             if (!ctx->fetched_loader->p_load(ctx->loader_ctx,
                                              ossl_store_handle_load_result,
                                              &load_data,
                                              ossl_pw_passphrase_callback_dec,
                                              &ctx->pwdata)) {
-                if (!OSSL_STORE_eof(ctx))
-                    ctx->error_flag = 1;
+                ctx->error_flag = 1;
                 return NULL;
             }
             v = load_data.v;
diff --git a/crypto/openssl/crypto/threads_pthread.c b/crypto/openssl/crypto/threads_pthread.c
index bfc05a4e878c..801855c9306e 100644
--- a/crypto/openssl/crypto/threads_pthread.c
+++ b/crypto/openssl/crypto/threads_pthread.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -72,8 +72,6 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
 #  if !defined (__TANDEM) && !defined (_SPT_MODEL_)
 #   if !defined(NDEBUG) && !defined(OPENSSL_NO_MUTEX_ERRORCHECK)
     pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
-#   else
-    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
 #   endif
 #  else
     /* The SPT Thread Library does not define MUTEX attributes. */
diff --git a/crypto/openssl/crypto/x509/v3_ist.c b/crypto/openssl/crypto/x509/v3_ist.c
index e6fef0153c8e..4a3cfa12a471 100644
--- a/crypto/openssl/crypto/x509/v3_ist.c
+++ b/crypto/openssl/crypto/x509/v3_ist.c
@@ -51,25 +51,25 @@ static ISSUER_SIGN_TOOL *v2i_issuer_sign_tool(X509V3_EXT_METHOD *method, X509V3_
         if (strcmp(cnf->name, "signTool") == 0) {
             ist->signTool = ASN1_UTF8STRING_new();
             if (ist->signTool == NULL || !ASN1_STRING_set(ist->signTool, cnf->value, strlen(cnf->value))) {
-                ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
+                ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE);
                 goto err;
             }
         } else if (strcmp(cnf->name, "cATool") == 0) {
             ist->cATool = ASN1_UTF8STRING_new();
             if (ist->cATool == NULL || !ASN1_STRING_set(ist->cATool, cnf->value, strlen(cnf->value))) {
-                ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
+                ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE);
                 goto err;
             }
         } else if (strcmp(cnf->name, "signToolCert") == 0) {
             ist->signToolCert = ASN1_UTF8STRING_new();
             if (ist->signToolCert == NULL || !ASN1_STRING_set(ist->signToolCert, cnf->value, strlen(cnf->value))) {
-                ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
+                ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE);
                 goto err;
             }
         } else if (strcmp(cnf->name, "cAToolCert") == 0) {
             ist->cAToolCert = ASN1_UTF8STRING_new();
             if (ist->cAToolCert == NULL || !ASN1_STRING_set(ist->cAToolCert, cnf->value, strlen(cnf->value))) {
-                ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
+                ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE);
                 goto err;
             }
         } else {
diff --git a/crypto/openssl/crypto/x509/x509_cmp.c b/crypto/openssl/crypto/x509/x509_cmp.c
index 1027bed82e69..989fb8faa9f4 100644
--- a/crypto/openssl/crypto/x509/x509_cmp.c
+++ b/crypto/openssl/crypto/x509/x509_cmp.c
@@ -292,12 +292,13 @@ unsigned long X509_NAME_hash_ex(const X509_NAME *x, OSSL_LIB_CTX *libctx,
     unsigned long ret = 0;
     unsigned char md[SHA_DIGEST_LENGTH];
     EVP_MD *sha1 = EVP_MD_fetch(libctx, "SHA1", propq);
+    int i2d_ret;
 
     /* Make sure X509_NAME structure contains valid cached encoding */
-    i2d_X509_NAME(x, NULL);
+    i2d_ret = i2d_X509_NAME(x, NULL);
     if (ok != NULL)
         *ok = 0;
-    if (sha1 != NULL
+    if (i2d_ret >= 0 && sha1 != NULL
         && EVP_Digest(x->canon_enc, x->canon_enclen, md, NULL, sha1, NULL)) {
         ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) |
                ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)
@@ -325,7 +326,9 @@ unsigned long X509_NAME_hash_old(const X509_NAME *x)
         goto end;
 
     /* Make sure X509_NAME structure contains valid cached encoding */
-    i2d_X509_NAME(x, NULL);
+    if (i2d_X509_NAME(x, NULL) < 0)
+        goto end;
+
     if (EVP_DigestInit_ex(md_ctx, md5, NULL)
         && EVP_DigestUpdate(md_ctx, x->bytes->data, x->bytes->length)
         && EVP_DigestFinal_ex(md_ctx, md, NULL))
diff --git a/crypto/openssl/doc/man1/openssl-cmp.pod.in b/crypto/openssl/doc/man1/openssl-cmp.pod.in
index 4250deb426fc..9240916fce40 100644
--- a/crypto/openssl/doc/man1/openssl-cmp.pod.in
+++ b/crypto/openssl/doc/man1/openssl-cmp.pod.in
@@ -659,11 +659,12 @@ is typically used when authenticating with pre-shared key (password-based MAC).
 
 =item B<-secret> I<arg>
 
-Prefer PBM-based message protection with given source of a secret value.
-The secret is used for creating PBM-based protection of outgoing messages
-and (as far as needed) for validating PBM-based protection of incoming messages.
-PBM stands for Password-Based Message Authentication Code.
+Provides the source of a secret value to use with MAC-based message protection.
 This takes precedence over the B<-cert> and B<-key> options.
+The secret is used for creating MAC-based protection of outgoing messages
+and for validating incoming messages that have MAC-based protection.
+The algorithm used by default is Password-Based Message Authentication Code (PBM)
+as defined in RFC 4210 section 5.1.3.1.
 
 For more information about the format of I<arg> see
 L<openssl-passphrase-options(1)>.
@@ -682,7 +683,8 @@ while the subject of B<-oldcert> or B<-subjectName> may provide fallback values.
 The issuer of this certificate is used as one of the recipient fallback values
 and as fallback issuer entry in the certificate template of IR/CR/KUR messages.
 
-When using signature-based message protection, this "protection certificate"
+When performing signature-based message protection,
+this "protection certificate", also called "signer certificate",
 will be included first in the extraCerts field of outgoing messages
 and the signature is done with the corresponding key.
 In Initialization Request (IR) messages this can be used for authenticating
@@ -713,8 +715,8 @@ have no effect on the certificate verification enabled via this option.
 
 The corresponding private key file for the client's current certificate given in
 the B<-cert> option.
-This will be used for signature-based message protection unless
-the B<-secret> option indicating PBM or B<-unprotected_requests> is given.
+This will be used for signature-based message protection unless the B<-secret>
+option indicating MAC-based protection or B<-unprotected_requests> is given.
 
 It is also used as a fallback for the B<-newkey> option with IR/CR/KUR messages.
 
@@ -730,7 +732,7 @@ L<openssl-passphrase-options(1)>.
 =item B<-digest> I<name>
 
 Specifies name of supported digest to use in RFC 4210's MSG_SIG_ALG
-and as the one-way function (OWF) in MSG_MAC_ALG.
+and as the one-way function (OWF) in C<MSG_MAC_ALG>.
 If applicable, this is used for message protection and
 proof-of-possession (POPO) signatures.
 To see the list of supported digests, use C<openssl list -digest-commands>.
@@ -738,7 +740,7 @@ Defaults to C<sha256>.
 
 =item B<-mac> I<name>
 
-Specifies the name of the MAC algorithm in MSG_MAC_ALG.
+Specifies the name of the MAC algorithm in C<MSG_MAC_ALG>.
 To get the names of supported MAC algorithms use C<openssl list -mac-algorithms>
 and possibly combine such a name with the name of a supported digest algorithm,
 e.g., hmacWithSHA256.
@@ -1097,6 +1099,13 @@ only affect the certificate verification enabled via the B<-out_trusted> option.
 
 =head1 NOTES
 
+When a client obtains from a CMP server CA certificates that it is going to
+trust, for instance via the C<caPubs> field of a certificate response,
+authentication of the CMP server is particularly critical.
+So special care must be taken setting up server authentication
+using B<-trusted> and related options for certificate-based authentication
+or B<-secret> for MAC-based protection.
+
 When setting up CMP configurations and experimenting with enrollment options
 typically various errors occur until the configuration is correct and complete.
 When the CMP server reports an error the client will by default
@@ -1166,7 +1175,7 @@ In order to update the enrolled certificate one may call
 
   openssl cmp -section insta,kur
 
-using with PBM-based protection or
+using MAC-based protection with PBM or
 
   openssl cmp -section insta,kur,signature
 
@@ -1225,7 +1234,7 @@ Then it can start using the new cert and key.
     -newkey cl_key_new.pem -certout cl_cert.pem
   cp cl_key_new.pem cl_key.pem
 
-This command sequence can be repated as often as needed.
+This command sequence can be repeated as often as needed.
 
 =head2 Requesting information from CMP server
 
diff --git a/crypto/openssl/doc/man1/openssl-cms.pod.in b/crypto/openssl/doc/man1/openssl-cms.pod.in
index c63a7f330ba6..65a61ee97f1d 100644
--- a/crypto/openssl/doc/man1/openssl-cms.pod.in
+++ b/crypto/openssl/doc/man1/openssl-cms.pod.in
@@ -391,7 +391,7 @@ option.
 =item I<recipient-cert> ...
 
 This is an alternative to using the B<-recip> option when encrypting a message.
-One or more certificate filennames may be given.
+One or more certificate filenames may be given.
 
 =item B<-I<cipher>>
 
@@ -902,7 +902,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man1/openssl-ts.pod.in b/crypto/openssl/doc/man1/openssl-ts.pod.in
index 6f7182020247..3e7f7c4be94b 100644
--- a/crypto/openssl/doc/man1/openssl-ts.pod.in
+++ b/crypto/openssl/doc/man1/openssl-ts.pod.in
@@ -490,7 +490,7 @@ Default is no.  (Optional)
 =item B<ess_cert_id_alg>
 
 This option specifies the hash function to be used to calculate the TSA's
-public key certificate identifier. Default is sha256. (Optional)
+public key certificate identifier. Default is sha1. (Optional)
 
 =back
 
@@ -652,7 +652,7 @@ L<ossl_store-file(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man3/BIO_s_mem.pod b/crypto/openssl/doc/man3/BIO_s_mem.pod
index 6b3cc6a2dae9..3bbc3e7fcf02 100644
--- a/crypto/openssl/doc/man3/BIO_s_mem.pod
+++ b/crypto/openssl/doc/man3/BIO_s_mem.pod
@@ -59,6 +59,8 @@ positive return value B<v> should be set to a negative value, typically -1.
 
 BIO_get_mem_data() sets *B<pp> to a pointer to the start of the memory BIOs data
 and returns the total amount of data available. It is implemented as a macro.
+Note the pointer returned by this call is informative, no transfer of ownership
+of this memory is implied.  See notes on BIO_set_close().
 
 BIO_set_mem_buf() sets the internal BUF_MEM structure to B<bm> and sets the
 close flag to B<c>, that is B<c> should be either BIO_CLOSE or BIO_NOCLOSE.
@@ -114,6 +116,10 @@ preceding that write operation cannot be undone.
 Calling BIO_get_mem_ptr() prior to a BIO_reset() call with
 BIO_FLAGS_NONCLEAR_RST set has the same effect as a write operation.
 
+Calling BIO_set_close() with BIO_NOCLOSE orphans the BUF_MEM internal to the
+BIO, _not_ its actual data buffer. See the examples section for the proper
+method for claiming ownership of the data pointer for a deferred free operation.
+
 =head1 BUGS
 
 There should be an option to set the maximum size of a memory BIO.
@@ -151,10 +157,24 @@ Extract the BUF_MEM structure from a memory BIO and then free up the BIO:
  BIO_set_close(mem, BIO_NOCLOSE); /* So BIO_free() leaves BUF_MEM alone */
  BIO_free(mem);
 
+Extract the BUF_MEM ptr, claim ownership of the internal data and free the BIO
+and BUF_MEM structure:
+
+ BUF_MEM *bptr;
+ char *data;
+
+ BIO_get_mem_data(bio, &data);
+ BIO_get_mem_ptr(bio, &bptr);
+ BIO_set_close(mem, BIO_NOCLOSE); /* So BIO_free orphans BUF_MEM */
+ BIO_free(bio);
+ bptr->data = NULL; /* Tell BUF_MEM to orphan data */
+ BUF_MEM_free(bptr);
+ ...
+ free(data);
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man3/CMS_sign.pod b/crypto/openssl/doc/man3/CMS_sign.pod
index 0d812756aef5..03bfc6fce16a 100644
--- a/crypto/openssl/doc/man3/CMS_sign.pod
+++ b/crypto/openssl/doc/man3/CMS_sign.pod
@@ -105,7 +105,7 @@ The function CMS_sign() is a basic CMS signing function whose output will be
 suitable for many purposes. For finer control of the output format the
 B<certs>, B<signcert> and B<pkey> parameters can all be B<NULL> and the
 B<CMS_PARTIAL> flag set. Then one or more signers can be added using the
-function CMS_sign_add1_signer(), non default digests can be used and custom
+function CMS_add1_signer(), non default digests can be used and custom
 attributes added. CMS_final() must then be called to finalize the
 structure if streaming is not enabled.
 
@@ -132,7 +132,7 @@ The CMS_sign_ex() method was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man3/EVP_MAC.pod b/crypto/openssl/doc/man3/EVP_MAC.pod
index 13482ac5e188..56ac92a48672 100644
--- a/crypto/openssl/doc/man3/EVP_MAC.pod
+++ b/crypto/openssl/doc/man3/EVP_MAC.pod
@@ -181,7 +181,7 @@ EVP_MAC_CTX_set_params() passes chosen parameters to the underlying
 context, given a context I<ctx>.
 The set of parameters given with I<params> determine exactly what
 parameters are passed down.
-If I<params> are NULL, the unterlying context should do nothing and return 1.
+If I<params> are NULL, the underlying context should do nothing and return 1.
 Note that a parameter that is unknown in the underlying context is
 simply ignored.
 Also, what happens when a needed parameter isn't passed down is
@@ -481,7 +481,7 @@ These functions were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2018-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man3/EVP_SIGNATURE.pod b/crypto/openssl/doc/man3/EVP_SIGNATURE.pod
index 600522085398..1f534ef33810 100644
--- a/crypto/openssl/doc/man3/EVP_SIGNATURE.pod
+++ b/crypto/openssl/doc/man3/EVP_SIGNATURE.pod
@@ -61,7 +61,7 @@ EVP_SIGNATURE_get0_provider() returns the provider that I<signature> was
 fetched from.
 
 EVP_SIGNATURE_do_all_provided() traverses all SIGNATURE implemented by all
-activated roviders in the given library context I<libctx>, and for each of the
+activated providers in the given library context I<libctx>, and for each of the
 implementations, calls the given function I<fn> with the implementation method
 and the given I<arg> as argument.
 
@@ -106,7 +106,7 @@ The functions described here were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man3/OSSL_CMP_CTX_new.pod b/crypto/openssl/doc/man3/OSSL_CMP_CTX_new.pod
index e81fb08b00d6..ce7db8f2f086 100644
--- a/crypto/openssl/doc/man3/OSSL_CMP_CTX_new.pod
+++ b/crypto/openssl/doc/man3/OSSL_CMP_CTX_new.pod
@@ -182,7 +182,7 @@ clearing the internal CMP transaction (aka session) status, PKIStatusInfo,
 and any previous results (newCert, newChain, caPubs, and extraCertsIn)
 from the last executed transaction.
 It also clears any ITAVs that were added by OSSL_CMP_CTX_push0_genm_ITAV().
-All other field values (i.e., CMP options) are retained for potential re-use.
+All other field values (i.e., CMP options) are retained for potential reuse.
 
 OSSL_CMP_CTX_set_option() sets the given value for the given option
 (e.g., OSSL_CMP_OPT_IMPLICIT_CONFIRM) in the given OSSL_CMP_CTX structure.
@@ -260,12 +260,12 @@ The following options can be set:
 
 =item B<OSSL_CMP_OPT_OWF_ALGNID>
         The NID of the digest algorithm to be used as one-way function (OWF)
-        in RFC 4210's MSG_MAC_ALG for PBM-based message protection.
+        for MAC-based message protection with password-based MAC (PBM).
+        See RFC 4210 section 5.1.3.1 for details.
         Default is SHA256.
 
 =item B<OSSL_CMP_OPT_MAC_ALGNID>
-        The NID of the MAC algorithm to be used in RFC 4210's MSG_MAC_ALG
-        for PBM-based message protection.
+        The NID of the MAC algorithm to be used for message protection with PBM.
         Default is HMAC-SHA1 as per RFC 4210.
 
 =item B<OSSL_CMP_OPT_REVOCATION_REASON>
@@ -450,8 +450,8 @@ The reference counts of those certificates handled successfully are increased.
 OSSL_CMP_CTX_get0_untrusted(OSSL_CMP_CTX *ctx) returns a pointer to the
 list of untrusted certs, which may be empty if unset.
 
-OSSL_CMP_CTX_set1_cert() sets the CMP signer certificate
-related to the private key used for CMP message protection.
+OSSL_CMP_CTX_set1_cert() sets the CMP signer certificate, also called protection
+certificate, related to the private key for signature-based message protection.
 Therefore the public key of this I<cert> must correspond to
 the private key set before or thereafter via OSSL_CMP_CTX_set1_pkey().
 When using signature-based protection of CMP request messages
@@ -481,15 +481,15 @@ OSSL_CMP_CTX_set1_pkey() sets the client's private key corresponding to the
 CMP signer certificate set via OSSL_CMP_CTX_set1_cert().
 This key is used create signature-based protection (protectionAlg = MSG_SIG_ALG)
 of outgoing messages
-unless a PBM secret has been set via OSSL_CMP_CTX_set1_secretValue().
+unless a symmetric secret has been set via OSSL_CMP_CTX_set1_secretValue().
 The I<pkey> argument may be NULL to clear the entry.
 
-OSSL_CMP_CTX_set1_secretValue() sets the byte string I<sec> with length I<len>
-as PBM secret in the given I<ctx> or clears it if the I<sec> argument is NULL.
-If present, this secret is used to create PBM-based protection of outgoing
-messages and to verify any PBM-based protection of incoming messages
-(protectionAlg = MSG_MAC_ALG). PBM stands for Password-Based MAC.
-PBM-based protection takes precedence over signature-based protection.
+OSSL_CMP_CTX_set1_secretValue() sets in I<ctx> the byte string I<sec> of length
+I<len> to use as pre-shared secret, or clears it if the I<sec> argument is NULL.
+If present, this secret is used to create MAC-based authentication and integrity
+protection (rather than applying signature-based protection)
+of outgoing messages and to verify authenticity and integrity of incoming
+messages that have MAC-based protection (protectionAlg = C<MSG_MAC_ALG>).
 
 OSSL_CMP_CTX_set1_referenceValue() sets the given referenceValue I<ref> with
 length I<len> in the given I<ctx> or clears it if the I<ref> argument is NULL.
@@ -500,7 +500,7 @@ then the sender field will contain the NULL-DN
 and the senderKID field of the CMP message header must be set.
 When signature-based protection is used the senderKID will be set to
 the subjectKeyIdentifier of the CMP signer certificate as far as present.
-If not present or when PBM-based protection is used
+If not present or when MAC-based protection is used
 the I<ref> value is taken as the fallback value for the senderKID.
 
 OSSL_CMP_CTX_set1_recipient() sets the recipient name that will be used in the
@@ -731,7 +731,7 @@ Set up a CMP client context for sending requests and verifying responses:
     OSSL_CMP_CTX_set1_serverPath(cmp_ctx, path_or_alias);
     OSSL_CMP_CTX_set0_trustedStore(cmp_ctx, ts);
 
-Set up client credentials for password-based protection (PBM):
+Set up symmetric credentials for MAC-based message protection such as PBM:
 
     OSSL_CMP_CTX_set1_referenceValue(cmp_ctx, ref, ref_len);
     OSSL_CMP_CTX_set1_secretValue(cmp_ctx, sec, sec_len);
diff --git a/crypto/openssl/doc/man3/OSSL_CMP_exec_certreq.pod b/crypto/openssl/doc/man3/OSSL_CMP_exec_certreq.pod
index b0d81c7c41a9..0cabc3bad5ac 100644
--- a/crypto/openssl/doc/man3/OSSL_CMP_exec_certreq.pod
+++ b/crypto/openssl/doc/man3/OSSL_CMP_exec_certreq.pod
@@ -42,7 +42,7 @@ client-server transactions, i.e., sequences of CMP requests and responses.
 
 All functions take a populated OSSL_CMP_CTX structure as their first argument.
 Usually the server name, port, and path ("CMP alias") need to be set, as well as
-credentials the client can use for authenticating itself to the client.
+credentials the client can use for authenticating itself to the server.
 In order to authenticate the server the client typically needs a trust store.
 The functions return their respective main results directly, while there are
 also accessor functions for retrieving various results and status information
@@ -72,7 +72,7 @@ and need to be filled in using L<OSSL_CMP_CTX_set1_subjectName(3)>,
 L<OSSL_CMP_CTX_set0_newPkey(3)>, L<OSSL_CMP_CTX_set1_oldCert(3)>, etc.
 For P10CR, L<OSSL_CMP_CTX_set1_p10CSR(3)> needs to be used instead.
 The enrollment session may be blocked by sleeping until the addressed
-CA (or an intermedate PKI component) can fully process and answer the request.
+CA (or an intermediate PKI component) can fully process and answer the request.
 
 OSSL_CMP_try_certreq() is an alternative to the above functions that is
 more flexible regarding what to do after receiving a checkAfter value.
@@ -119,9 +119,17 @@ See RFC 4210 section 5.3.19 and appendix E.5 for details.
 
 CMP is defined in RFC 4210 (and CRMF in RFC 4211).
 
-So far the CMP client implementation is limited to one request per CMP message
+The CMP client implementation is limited to one request per CMP message
 (and consequently to at most one response component per CMP message).
 
+When a client obtains from a CMP server CA certificates that it is going to
+trust, for instance via the caPubs field of a certificate response,
+authentication of the CMP server is particularly critical.
+So special care must be taken setting up server authentication in I<ctx>
+using functions such as
+L<OSSL_CMP_CTX_set0_trustedStore(3)> (for certificate-based authentication) or
+L<OSSL_CMP_CTX_set1_secretValue(3)> (for MAC-based protection).
+
 =head1 RETURN VALUES
 
 OSSL_CMP_exec_certreq(), OSSL_CMP_exec_IR_ses(), OSSL_CMP_exec_CR_ses(),
@@ -163,7 +171,7 @@ The OpenSSL CMP support was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man3/OSSL_HTTP_REQ_CTX.pod b/crypto/openssl/doc/man3/OSSL_HTTP_REQ_CTX.pod
index ee61034aa731..6216420e4ffe 100644
--- a/crypto/openssl/doc/man3/OSSL_HTTP_REQ_CTX.pod
+++ b/crypto/openssl/doc/man3/OSSL_HTTP_REQ_CTX.pod
@@ -72,12 +72,16 @@ which collects the HTTP request header lines.
 OSSL_HTTP_REQ_CTX_free() frees up the HTTP request context I<rctx>.
 The I<rbio> is not free'd, I<wbio> will be free'd if I<free_wbio> is set.
 
-OSSL_HTTP_REQ_CTX_set_request_line() adds the HTTP request line to the context.
+OSSL_HTTP_REQ_CTX_set_request_line() adds the 1st HTTP request line to I<rctx>.
 The HTTP method is determined by I<method_POST>,
 which should be 1 to indicate C<POST> or 0 to indicate C<GET>.
-I<server> and I<port> may be set to indicate a proxy server and port
-that the request should go through, otherwise they should be left NULL.
-I<path> is the HTTP request path; if left NULL, C</> is used.
+I<server> and I<port> may be set to give the server and the optional port that
+an HTTP proxy shall forward the request to, otherwise they must be left NULL.
+I<path> provides the HTTP request path; if left NULL, C</> is used.
+For backward compatibility, I<path> may begin with C<http://> and thus convey
+an absoluteURI. In this case it indicates HTTP proxy use and provides also the
+server (and optionally the port) that the proxy shall forward the request to.
+In this case the I<server> and I<port> arguments must be NULL.
 
 OSSL_HTTP_REQ_CTX_add1_header() adds header I<name> with value I<value> to the
 context I<rctx>. It can be called more than once to add multiple header lines.
diff --git a/crypto/openssl/doc/man3/OSSL_HTTP_transfer.pod b/crypto/openssl/doc/man3/OSSL_HTTP_transfer.pod
index 3337f6d4a35e..716e365ef50d 100644
--- a/crypto/openssl/doc/man3/OSSL_HTTP_transfer.pod
+++ b/crypto/openssl/doc/man3/OSSL_HTTP_transfer.pod
@@ -161,8 +161,11 @@ NULL) to print additional diagnostic information in a user-oriented way.
 
 OSSL_HTTP_set1_request() sets up in I<rctx> the request header and content data
 and expectations on the response using the following parameters.
-If <rctx> indicates using a proxy for HTTP (but not HTTPS), the server hostname
-(and optionally port) needs to be placed in the header and thus must be present.
+If <rctx> indicates using a proxy for HTTP (but not HTTPS), the server host
+(and optionally port) needs to be placed in the header; thus it must be present
+in I<rctx>.
+For backward compatibility, the server (and optional port) may also be given in
+the I<path> argument beginning with C<http://> (thus giving an absoluteURI).
 If I<path> is NULL it defaults to "/".
 If I<req> is NULL the HTTP GET method will be used to send the request
 else HTTP POST with the contents of I<req> and optional I<content_type>, where
@@ -274,7 +277,7 @@ All the functions described here were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man3/PKCS12_create.pod b/crypto/openssl/doc/man3/PKCS12_create.pod
index dc0f06d9d323..92e588062a36 100644
--- a/crypto/openssl/doc/man3/PKCS12_create.pod
+++ b/crypto/openssl/doc/man3/PKCS12_create.pod
@@ -42,7 +42,8 @@ can all be set to zero and sensible defaults will be used.
 These defaults are: AES password based encryption (PBES2 with PBKDF2 and
 AES-256-CBC) for private keys and certificates, the PBKDF2 and MAC key
 derivation iteration count of B<PKCS12_DEFAULT_ITER> (currently 2048), and
-MAC algorithm HMAC with SHA2-256.
+MAC algorithm HMAC with SHA2-256. The MAC key derivation algorithm used
+for the outer PKCS#12 structure is PKCS12KDF.
 
 The default MAC iteration count is 1 in order to retain compatibility with
 old software which did not interpret MAC iteration counts. If such compatibility
@@ -68,6 +69,8 @@ I<nid_key> or I<nid_cert> can be set to -1 indicating that no encryption
 should be used.
 
 I<mac_iter> can be set to -1 and the MAC will then be omitted entirely.
+This can be useful when running with the FIPS provider as the PKCS12KDF
+is not a FIPS approvable algorithm.
 
 PKCS12_create() makes assumptions regarding the encoding of the given pass
 phrase.
@@ -83,7 +86,9 @@ IETF RFC 7292 (L<https://tools.ietf.org/html/rfc7292>)
 
 =head1 SEE ALSO
 
+L<EVP_KDF-PKCS12KDF(7)>,
 L<d2i_PKCS12(3)>,
+L<OSSL_PROVIDER-FIPS(7)>,
 L<passphrase-encoding(7)>
 
 =head1 HISTORY
@@ -96,7 +101,7 @@ standards.
 
 =head1 COPYRIGHT
 
-Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man3/PKCS12_gen_mac.pod b/crypto/openssl/doc/man3/PKCS12_gen_mac.pod
index 37bcd572d841..a72df145fedd 100644
--- a/crypto/openssl/doc/man3/PKCS12_gen_mac.pod
+++ b/crypto/openssl/doc/man3/PKCS12_gen_mac.pod
@@ -22,6 +22,7 @@ PKCS12_verify_mac - Functions to create and manipulate a PKCS#12 structure
 
 PKCS12_gen_mac() generates an HMAC over the entire PKCS#12 object using the
 supplied password along with a set of already configured parameters.
+The default key generation mechanism used is PKCS12KDF.
 
 PKCS12_verify_mac() verifies the PKCS#12 object's HMAC using the supplied
 password.
@@ -57,6 +58,7 @@ IETF RFC 7292 (L<https://tools.ietf.org/html/rfc7292>)
 =head1 SEE ALSO
 
 L<d2i_PKCS12(3)>,
+L<EVP_KDF-PKCS12KDF(7)>,
 L<PKCS12_create(3)>,
 L<passphrase-encoding(7)>
 
diff --git a/crypto/openssl/doc/man3/SSL_new.pod b/crypto/openssl/doc/man3/SSL_new.pod
index 59d275523f98..2b522769169b 100644
--- a/crypto/openssl/doc/man3/SSL_new.pod
+++ b/crypto/openssl/doc/man3/SSL_new.pod
@@ -35,7 +35,7 @@ MUST NOT have yet started the SSL handshake.  For connections that are not in
 their initial state SSL_dup() just increments an internal
 reference count and returns the I<same> handle.  It may be possible to
 use L<SSL_clear(3)> to recycle an SSL handle that is not in its initial
-state for re-use, but this is best avoided.  Instead, save and restore
+state for reuse, but this is best avoided.  Instead, save and restore
 the session, if desired, and construct a fresh handle for each connection.
 
 The subset of settings in I<s> that are duplicated are:
@@ -124,7 +124,7 @@ L<ssl(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man3/d2i_RSAPrivateKey.pod b/crypto/openssl/doc/man3/d2i_RSAPrivateKey.pod
index b4f5b4660900..08cd2c85e5bd 100644
--- a/crypto/openssl/doc/man3/d2i_RSAPrivateKey.pod
+++ b/crypto/openssl/doc/man3/d2i_RSAPrivateKey.pod
@@ -28,7 +28,6 @@ d2i_RSA_PUBKEY_fp,
 d2i_DHparams,
 d2i_DHparams_bio,
 d2i_DHparams_fp,
-d2i_ECPKParameters,
 d2i_ECParameters,
 d2i_ECPrivateKey,
 d2i_ECPrivateKey_bio,
@@ -56,7 +55,6 @@ i2d_DSA_PUBKEY,
 i2d_DSA_PUBKEY_bio,
 i2d_DSA_PUBKEY_fp,
 i2d_DSAparams,
-i2d_ECPKParameters,
 i2d_ECParameters,
 i2d_ECPrivateKey,
 i2d_ECPrivateKey_bio,
@@ -205,7 +203,7 @@ I<selection> and I<structure> as follows:
 
 =item B<i2d_I<TYPE>PrivateKey>() translates into:
 
- int selection = EVP_PKEY_PRIVATE_KEY;
+ int selection = EVP_PKEY_KEYPAIR;
  const char *structure = "type-specific";
 
 =item B<i2d_I<TYPE>PublicKey>() translates into:
@@ -309,7 +307,7 @@ L<i2d_PUBKEY(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man3/d2i_X509.pod b/crypto/openssl/doc/man3/d2i_X509.pod
index c79a964e6d7f..9226ef77c394 100644
--- a/crypto/openssl/doc/man3/d2i_X509.pod
+++ b/crypto/openssl/doc/man3/d2i_X509.pod
@@ -53,6 +53,7 @@ d2i_DIST_POINT,
 d2i_DIST_POINT_NAME,
 d2i_DSA_SIG,
 d2i_ECDSA_SIG,
+d2i_ECPKParameters,
 d2i_EDIPARTYNAME,
 d2i_ESS_CERT_ID,
 d2i_ESS_CERT_ID_V2,
@@ -223,6 +224,7 @@ i2d_DIST_POINT,
 i2d_DIST_POINT_NAME,
 i2d_DSA_SIG,
 i2d_ECDSA_SIG,
+i2d_ECPKParameters,
 i2d_EDIPARTYNAME,
 i2d_ESS_CERT_ID,
 i2d_ESS_CERT_ID_V2,
diff --git a/crypto/openssl/doc/man5/x509v3_config.pod b/crypto/openssl/doc/man5/x509v3_config.pod
index 1830092394bc..044904022d89 100644
--- a/crypto/openssl/doc/man5/x509v3_config.pod
+++ b/crypto/openssl/doc/man5/x509v3_config.pod
@@ -93,7 +93,7 @@ numeric identifier, as shown here:
  email.2 = steve@example.org
 
 The syntax of raw extensions is defined by the source code that parses
-the extension but should be documened.
+the extension but should be documented.
 See L</Certificate Policies> for an example of a raw extension.
 
 If an extension type is unsupported, then the I<arbitrary> extension syntax
@@ -590,7 +590,7 @@ L<ASN1_generate_nconf(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2004-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man7/EVP_KDF-PKCS12KDF.pod b/crypto/openssl/doc/man7/EVP_KDF-PKCS12KDF.pod
index 7edde1dc9bf7..986536569864 100644
--- a/crypto/openssl/doc/man7/EVP_KDF-PKCS12KDF.pod
+++ b/crypto/openssl/doc/man7/EVP_KDF-PKCS12KDF.pod
@@ -46,6 +46,9 @@ RFC 7292 section B.3.
 
 =head1 NOTES
 
+This algorithm is not available in the FIPS provider as it is not FIPS
+approvable.
+
 A typical application of this algorithm is to derive keying material for an
 encryption algorithm from a password in the "pass", a salt in "salt",
 and an iteration count.
@@ -68,7 +71,8 @@ L<EVP_KDF_CTX_new(3)>,
 L<EVP_KDF_CTX_free(3)>,
 L<EVP_KDF_CTX_set_params(3)>,
 L<EVP_KDF_derive(3)>,
-L<EVP_KDF(3)/PARAMETERS>
+L<EVP_KDF(3)/PARAMETERS>,
+L<OSSL_PROVIDER-FIPS(7)>
 
 =head1 HISTORY
 
@@ -76,7 +80,7 @@ This functionality was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/crypto/openssl/doc/man7/migration_guide.pod b/crypto/openssl/doc/man7/migration_guide.pod
index 1847e9813cbb..61641324a7fc 100644
--- a/crypto/openssl/doc/man7/migration_guide.pod
+++ b/crypto/openssl/doc/man7/migration_guide.pod
@@ -306,6 +306,15 @@ context and property query and will call an extended version of the key/IV
 derivation function which supports these parameters. This includes
 L<EVP_PBE_CipherInit_ex(3)>, L<EVP_PBE_find_ex(3)> and L<EVP_PBE_scrypt_ex(3)>.
 
+=head4 PKCS#12 KDF versus FIPS
+
+Unlike in 1.x.y, the PKCS12KDF algorithm used when a PKCS#12 structure
+is created with a MAC that does not work with the FIPS provider as the PKCS12KDF
+is not a FIPS approvable mechanism.
+
+See L<EVP_KDF-PKCS12KDF(7)>, L<PKCS12_create(3)>, L<openssl-pkcs12(1)>,
+L<OSSL_PROVIDER-FIPS(7)>.
+
 =head4 Windows thread synchronization changes
 
 Windows thread synchronization uses read/write primitives (SRWLock) when
diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h
index 3c221e1ac231..0bf61ce6a9d7 100644
--- a/crypto/openssl/include/openssl/opensslv.h
+++ b/crypto/openssl/include/openssl/opensslv.h
@@ -29,7 +29,7 @@ extern "C" {
  */
 # define OPENSSL_VERSION_MAJOR  3
 # define OPENSSL_VERSION_MINOR  0
-# define OPENSSL_VERSION_PATCH  10
+# define OPENSSL_VERSION_PATCH  11
 
 /*
  * Additional version information
@@ -74,21 +74,21 @@ extern "C" {
  * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
  * OPENSSL_VERSION_BUILD_METADATA_STR appended.
  */
-# define OPENSSL_VERSION_STR "3.0.10"
-# define OPENSSL_FULL_VERSION_STR "3.0.10"
+# define OPENSSL_VERSION_STR "3.0.11"
+# define OPENSSL_FULL_VERSION_STR "3.0.11"
 
 /*
  * SECTION 3: ADDITIONAL METADATA
  *
  * These strings are defined separately to allow them to be parsable.
  */
-# define OPENSSL_RELEASE_DATE "1 Aug 2023"
+# define OPENSSL_RELEASE_DATE "19 Sep 2023"
 
 /*
  * SECTION 4: BACKWARD COMPATIBILITY
  */
 
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.10 1 Aug 2023"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.11 19 Sep 2023"
 
 /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
 # ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/crypto/openssl/providers/fips-sources.checksums b/crypto/openssl/providers/fips-sources.checksums
index 42785c33a0d2..f55fa914be7f 100644
--- a/crypto/openssl/providers/fips-sources.checksums
+++ b/crypto/openssl/providers/fips-sources.checksums
@@ -259,12 +259,12 @@ a0097ff2da8955fe15ba204cb54f3fd48a06f846e2b9826f507b26acf65715c3  crypto/params_
 97cb7414dc2f165d5849ee3b46cdfff0afb067729435d9c01a747e0ca41e230c  crypto/ppccap.c
 3ca43596a7528dec8ff9d1a3cd0d68b62640f84b1d6a8b5e4842cfd0be1133ad  crypto/ppccpuid.pl
 b4d34272a0bd1fbe6562022bf7ea6259b6a5a021a48222d415be47ef5ef2a905  crypto/property/defn_cache.c
-7da6ae864beb1a4daa4be31eb41d48141a3a7eb7a263a4937a6889e05656a595  crypto/property/property.c
+3c4ade2fed4605e374d85ec1134a98da34e7124f89f44b81a754e8cfe81f14ba  crypto/property/property.c
 66da4f28d408133fb544b14aeb9ad4913e7c5c67e2826e53f0dc5bf4d8fada26  crypto/property/property_local.h
 921305e62749aec22da4843738bee3448b61e7e30d5309beddc7141ad07a8004  crypto/property/property_parse.c
 a7cefda6a117550e2c76e0f307565ce1e11640b11ba10c80e469a837fd1212a3  crypto/property/property_query.c
 065698c8d88a5facc0cbc02a3bd0c642c94687a8c5dd79901c942138b406067d  crypto/property/property_string.c
-9653ec9c1476350a94b9cc7f8be3d99961fd803870c9ac03315298d2909a6a8e  crypto/provider_core.c
+0ba5d0297837940c972224c97cbbf3ea4a723c1eed9ce1112538c9bb26208639  crypto/provider_core.c
 d0af10d4091b2032aac1b7db80f8c2e14fa7176592716b25b9437ab6b53c0a89  crypto/provider_local.h
 5ba2e1c74ddcd0453d02e32612299d1eef18eff8493a7606c15d0dc3738ad1d9  crypto/provider_predefined.c
 a5a4472636b8b0095ad8d4acd37e275ad79da1a67ecff7b7b5c3e46c9ebc65b7  crypto/rand/rand_lib.c
@@ -344,7 +344,7 @@ c50c584c55e56347bb43aca4b796b5344d70daece3061f586b79c871c21f5d1a  crypto/sparse_
 8da78169fa8c09dc3c29c9bf1602b22e88c5eac4815e274ba1864c166e31584b  crypto/stack/stack.c
 7b4efa594d8d1f3ecbf4605cf54f72fb296a3b1d951bdc69e415aaa08f34e5c8  crypto/threads_lib.c
 a41ae93a755e2ec89b3cb5b4932e2b508fdda92ace2e025a2650a6da0e9e972c  crypto/threads_none.c
-2637a8727dee790812b000f2e02b336f7907949df633dda72938bbaafdb204fe  crypto/threads_pthread.c
+3729e2bd36f945808b578e0d89fac0fcb3114e4fc9381614bcbd8a9869991716  crypto/threads_pthread.c
 88423960f0414f6fd41fba4f4c67f9f7260c2741e4788adcd52493e895ec8027  crypto/threads_win.c
 fd6c27cf7c6b5449b17f2b725f4203c4c10207f1973db09fd41571efe5de08fd  crypto/x86_64cpuid.pl
 bbec287bb9bf35379885f8f8998b7fd9e8fc22efee9e1b299109af0f33a7ee16  crypto/x86cpuid.pl
@@ -567,13 +567,13 @@ abe2b0f3711eaa34846e155cffc9242e4051c45de896f747afd5ac9d87f637dc  providers/impl
 589f6133799da80760e8bc3ab0191a341ab6d4d2706e92e6eb4a24b0250fefa6  providers/implementations/kdfs/tls1_prf.c
 4d4a6d9a562d2dcfec941d3f113a544663b5ac2fbe4accd89ec70c1cc11751d0  providers/implementations/kdfs/x942kdf.c
 6b6c776b12664164f3cb54c21df61e1c4477c7855d89431a16fb338cdae58d43  providers/implementations/kem/rsa_kem.c
-37120f8a420de0e44b7dc1f31b50d59520e5318cf546e83684e0c3de5c7b76c5  providers/implementations/keymgmt/dh_kmgmt.c
-2a4493c9e68f41d37d7ec69c272005c6df7b1a34db2d49663f52e836e4fd888c  providers/implementations/keymgmt/dsa_kmgmt.c
+9d5eb7e056e790b1b4292ec7af03fbf0b26e34625c70eb36643451965bcfc696  providers/implementations/keymgmt/dh_kmgmt.c
+a329f57cb041cd03907e9d996fbc2f378ee116c7f8d7fbf1ea08b7a5df7e0304  providers/implementations/keymgmt/dsa_kmgmt.c
 9bc88451d3ae110c7a108ee73d3b3b6bda801ec3494d2dfb9c9970b85c2d34fe  providers/implementations/keymgmt/ec_kmgmt.c
 258ae17bb2dd87ed1511a8eb3fe99eed9b77f5c2f757215ff6b3d0e8791fc251  providers/implementations/keymgmt/ec_kmgmt_imexport.inc
-d77ece2494e6b12a6201a2806ee5fb24a6dc2fa3e1891a46012a870e0b781ab1  providers/implementations/keymgmt/ecx_kmgmt.c
+011c36aad6834729043f23eacab417732541ee23916d9afa5bb9164862be00bb  providers/implementations/keymgmt/ecx_kmgmt.c
 053a2be39a87f50b877ebdbbf799cf5faf8b2de33b04311d819d212ee1ea329b  providers/implementations/keymgmt/kdf_legacy_kmgmt.c
-e30357311e4a3e1c78266af6315fd1fc99584bfb09f4a7cd0ddc7261cf1e17e1  providers/implementations/keymgmt/mac_legacy_kmgmt.c
+1646b477fa231dd0f6c22444c99098f9b447cab0d39ff69b811262469d4dbe09  providers/implementations/keymgmt/mac_legacy_kmgmt.c
 19f22fc70a6321441e56d5bd4aab3d01d52d17069d4e4b5cefce0f411ecece75  providers/implementations/keymgmt/rsa_kmgmt.c
 aeb42590728ca87b916b8a3d337351b1c82ee0747213e5ce740c2350b3db7185  providers/implementations/macs/cmac_prov.c
 e69aa06f8f3c6f5a26702b9f44a844b8589b99dc0ee590953a29e8b9ef10acbe  providers/implementations/macs/gmac_prov.c
diff --git a/crypto/openssl/providers/fips.checksum b/crypto/openssl/providers/fips.checksum
index ec1978c7fede..db5ddc6cb7c6 100644
--- a/crypto/openssl/providers/fips.checksum
+++ b/crypto/openssl/providers/fips.checksum
@@ -1 +1 @@
-f07990ec634ec6ea3c8c42a664768debcf92a1b0c39bde7041c24df33dd7f052  providers/fips-sources.checksums
+8d97c837eeb1288f74788f0e48cb0cbc8498d4cf7ddc25c89344df7d5309ffc8  providers/fips-sources.checksums
diff --git a/crypto/openssl/providers/implementations/ciphers/cipher_chacha20.c b/crypto/openssl/providers/implementations/ciphers/cipher_chacha20.c
index 386c865d832e..ef80a515d756 100644
--- a/crypto/openssl/providers/implementations/ciphers/cipher_chacha20.c
+++ b/crypto/openssl/providers/implementations/ciphers/cipher_chacha20.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -21,6 +21,7 @@
 
 static OSSL_FUNC_cipher_newctx_fn chacha20_newctx;
 static OSSL_FUNC_cipher_freectx_fn chacha20_freectx;
+static OSSL_FUNC_cipher_dupctx_fn chacha20_dupctx;
 static OSSL_FUNC_cipher_get_params_fn chacha20_get_params;
 static OSSL_FUNC_cipher_get_ctx_params_fn chacha20_get_ctx_params;
 static OSSL_FUNC_cipher_set_ctx_params_fn chacha20_set_ctx_params;
@@ -64,6 +65,25 @@ static void chacha20_freectx(void *vctx)
     }
 }
 
+static void *chacha20_dupctx(void *vctx)
+{
+    PROV_CHACHA20_CTX *ctx = (PROV_CHACHA20_CTX *)vctx;
+    PROV_CHACHA20_CTX *dupctx = NULL;
+
+    if (ctx != NULL) {
+        dupctx = OPENSSL_memdup(ctx, sizeof(*dupctx));
+        if (dupctx != NULL && dupctx->base.tlsmac != NULL && dupctx->base.alloced) {
+            dupctx->base.tlsmac = OPENSSL_memdup(dupctx->base.tlsmac,
+                                                 dupctx->base.tlsmacsize);
+            if (dupctx->base.tlsmac == NULL) {
+                OPENSSL_free(dupctx);
+                dupctx = NULL;
+            }
+        }
+    }
+    return dupctx;
+}
+
 static int chacha20_get_params(OSSL_PARAM params[])
 {
     return ossl_cipher_generic_get_params(params, 0, CHACHA20_FLAGS,
@@ -187,6 +207,7 @@ int ossl_chacha20_dinit(void *vctx, const unsigned char *key, size_t keylen,
 const OSSL_DISPATCH ossl_chacha20_functions[] = {
     { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))chacha20_newctx },
     { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))chacha20_freectx },
+    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))chacha20_dupctx },
     { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_chacha20_einit },
     { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_chacha20_dinit },
     { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))chacha20_update },
diff --git a/crypto/openssl/providers/implementations/encode_decode/decode_der2key.c b/crypto/openssl/providers/implementations/encode_decode/decode_der2key.c
index b9cee2571bf3..d598f7eba1ac 100644
--- a/crypto/openssl/providers/implementations/encode_decode/decode_der2key.c
+++ b/crypto/openssl/providers/implementations/encode_decode/decode_der2key.c
@@ -316,10 +316,14 @@ static int der2key_export_object(void *vctx,
     void *keydata;
 
     if (reference_sz == sizeof(keydata) && export != NULL) {
+        int selection = ctx->selection;
+
+        if (selection == 0)
+            selection = OSSL_KEYMGMT_SELECT_ALL;
         /* The contents of the reference is the address to our object */
         keydata = *(void **)reference;
 
-        return export(keydata, ctx->selection, export_cb, export_cbarg);
+        return export(keydata, selection, export_cb, export_cbarg);
     }
     return 0;
 }
diff --git a/crypto/openssl/providers/implementations/encode_decode/decode_msblob2key.c b/crypto/openssl/providers/implementations/encode_decode/decode_msblob2key.c
index 501957faba01..b9d0cabadae2 100644
--- a/crypto/openssl/providers/implementations/encode_decode/decode_msblob2key.c
+++ b/crypto/openssl/providers/implementations/encode_decode/decode_msblob2key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -79,6 +79,18 @@ static void msblob2key_freectx(void *vctx)
     OPENSSL_free(ctx);
 }
 
+static int msblob2key_does_selection(void *provctx, int selection)
+{
+    if (selection == 0)
+        return 1;
+
+    if ((selection & (OSSL_KEYMGMT_SELECT_PRIVATE_KEY
+                      | OSSL_KEYMGMT_SELECT_PUBLIC_KEY))  != 0)
+        return 1;
+
+    return 0;
+}
+
 static int msblob2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
                              OSSL_CALLBACK *data_cb, void *data_cbarg,
                              OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
@@ -211,10 +223,14 @@ msblob2key_export_object(void *vctx,
     void *keydata;
 
     if (reference_sz == sizeof(keydata) && export != NULL) {
+        int selection = ctx->selection;
+
+        if (selection == 0)
+            selection = OSSL_KEYMGMT_SELECT_ALL;
         /* The contents of the reference is the address to our object */
         keydata = *(void **)reference;
 
-        return export(keydata, ctx->selection, export_cb, export_cbarg);
+        return export(keydata, selection, export_cb, export_cbarg);
     }
     return 0;
 }
@@ -260,6 +276,8 @@ static void rsa_adjust(void *key, struct msblob2key_ctx_st *ctx)
           (void (*)(void))msblob2##keytype##_newctx },                  \
         { OSSL_FUNC_DECODER_FREECTX,                                    \
           (void (*)(void))msblob2key_freectx },                         \
+        { OSSL_FUNC_DECODER_DOES_SELECTION,                             \
+          (void (*)(void))msblob2key_does_selection },                  \
         { OSSL_FUNC_DECODER_DECODE,                                     \
           (void (*)(void))msblob2key_decode },                          \
         { OSSL_FUNC_DECODER_EXPORT_OBJECT,                              \
diff --git a/crypto/openssl/providers/implementations/encode_decode/decode_pvk2key.c b/crypto/openssl/providers/implementations/encode_decode/decode_pvk2key.c
index c6424165b03b..2d7cb15e53e0 100644
--- a/crypto/openssl/providers/implementations/encode_decode/decode_pvk2key.c
+++ b/crypto/openssl/providers/implementations/encode_decode/decode_pvk2key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -79,6 +79,17 @@ static void pvk2key_freectx(void *vctx)
     OPENSSL_free(ctx);
 }
 
+static int pvk2key_does_selection(void *provctx, int selection)
+{
+    if (selection == 0)
+        return 1;
+
+    if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY)  != 0)
+        return 1;
+
+    return 0;
+}
+
 static int pvk2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
                          OSSL_CALLBACK *data_cb, void *data_cbarg,
                          OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
@@ -179,10 +190,14 @@ static int pvk2key_export_object(void *vctx,
     void *keydata;
 
     if (reference_sz == sizeof(keydata) && export != NULL) {
+        int selection = ctx->selection;
+
+        if (selection == 0)
+            selection = OSSL_KEYMGMT_SELECT_ALL;
         /* The contents of the reference is the address to our object */
         keydata = *(void **)reference;
 
-        return export(keydata, ctx->selection, export_cb, export_cbarg);
+        return export(keydata, selection, export_cb, export_cbarg);
     }
     return 0;
 }
@@ -226,6 +241,8 @@ static void rsa_adjust(void *key, struct pvk2key_ctx_st *ctx)
           (void (*)(void))pvk2##keytype##_newctx },                     \
         { OSSL_FUNC_DECODER_FREECTX,                                    \
           (void (*)(void))pvk2key_freectx },                            \
+        { OSSL_FUNC_DECODER_DOES_SELECTION,                             \
+          (void (*)(void))pvk2key_does_selection },                     \
         { OSSL_FUNC_DECODER_DECODE,                                     \
           (void (*)(void))pvk2key_decode },                             \
         { OSSL_FUNC_DECODER_EXPORT_OBJECT,                              \
diff --git a/crypto/openssl/providers/implementations/encode_decode/encode_key2any.c b/crypto/openssl/providers/implementations/encode_decode/encode_key2any.c
index c7b01cb2b3e5..0f4c62962ddc 100644
--- a/crypto/openssl/providers/implementations/encode_decode/encode_key2any.c
+++ b/crypto/openssl/providers/implementations/encode_decode/encode_key2any.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -858,14 +858,17 @@ static int prepare_rsa_params(const void *rsa, int nid, int save,
                 case 1:
                     if ((str = OPENSSL_malloc(str_sz)) == NULL
                         || !WPACKET_init_der(&pkt, str, str_sz)) {
+                        WPACKET_cleanup(&pkt);
                         goto err;
                     }
                     break;
                 }
                 if (!ossl_DER_w_RSASSA_PSS_params(&pkt, -1, pss)
                     || !WPACKET_finish(&pkt)
-                    || !WPACKET_get_total_written(&pkt, &str_sz))
+                    || !WPACKET_get_total_written(&pkt, &str_sz)) {
+                    WPACKET_cleanup(&pkt);
                     goto err;
+                }
                 WPACKET_cleanup(&pkt);
 
                 /*
diff --git a/crypto/openssl/providers/implementations/keymgmt/dh_kmgmt.c b/crypto/openssl/providers/implementations/keymgmt/dh_kmgmt.c
index 9a7dde7c6627..4ca9c1a3fad8 100644
--- a/crypto/openssl/providers/implementations/keymgmt/dh_kmgmt.c
+++ b/crypto/openssl/providers/implementations/keymgmt/dh_kmgmt.c
@@ -222,6 +222,9 @@ static int dh_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
     if (!ossl_prov_is_running() || dh == NULL)
         return 0;
 
+    if ((selection & DH_POSSIBLE_SELECTIONS) == 0)
+        return 0;
+
     tmpl = OSSL_PARAM_BLD_new();
     if (tmpl == NULL)
         return 0;
diff --git a/crypto/openssl/providers/implementations/keymgmt/dsa_kmgmt.c b/crypto/openssl/providers/implementations/keymgmt/dsa_kmgmt.c
index cd8b4410b0db..2f5742cfcc07 100644
--- a/crypto/openssl/providers/implementations/keymgmt/dsa_kmgmt.c
+++ b/crypto/openssl/providers/implementations/keymgmt/dsa_kmgmt.c
@@ -223,6 +223,9 @@ static int dsa_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
     if (!ossl_prov_is_running() || dsa == NULL)
         return 0;
 
+    if ((selection & DSA_POSSIBLE_SELECTIONS) == 0)
+        return 0;
+
     tmpl = OSSL_PARAM_BLD_new();
     if (tmpl == NULL)
         return 0;
diff --git a/crypto/openssl/providers/implementations/keymgmt/ecx_kmgmt.c b/crypto/openssl/providers/implementations/keymgmt/ecx_kmgmt.c
index 2a7f867aa56b..987d38456fba 100644
--- a/crypto/openssl/providers/implementations/keymgmt/ecx_kmgmt.c
+++ b/crypto/openssl/providers/implementations/keymgmt/ecx_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -238,6 +238,9 @@ static int ecx_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
     if (!ossl_prov_is_running() || key == NULL)
         return 0;
 
+    if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) == 0)
+        return 0;
+
     tmpl = OSSL_PARAM_BLD_new();
     if (tmpl == NULL)
         return 0;
diff --git a/crypto/openssl/providers/implementations/keymgmt/mac_legacy_kmgmt.c b/crypto/openssl/providers/implementations/keymgmt/mac_legacy_kmgmt.c
index c934ff164094..1fae4407fca6 100644
--- a/crypto/openssl/providers/implementations/keymgmt/mac_legacy_kmgmt.c
+++ b/crypto/openssl/providers/implementations/keymgmt/mac_legacy_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -281,6 +281,9 @@ static int mac_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
     if (!ossl_prov_is_running() || key == NULL)
         return 0;
 
+    if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) == 0)
+        return 0;
+
     tmpl = OSSL_PARAM_BLD_new();
     if (tmpl == NULL)
         return 0;
diff --git a/crypto/openssl/ssl/ssl_lib.c b/crypto/openssl/ssl/ssl_lib.c
index 214884b0f1ef..81a9f0728dbf 100644
--- a/crypto/openssl/ssl/ssl_lib.c
+++ b/crypto/openssl/ssl/ssl_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -582,7 +582,7 @@ int SSL_clear(SSL *s)
     OPENSSL_free(s->psksession_id);
     s->psksession_id = NULL;
     s->psksession_id_len = 0;
-    s->hello_retry_request = 0;
+    s->hello_retry_request = SSL_HRR_NONE;
     s->sent_tickets = 0;
 
     s->error = 0;
@@ -2809,14 +2809,14 @@ char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size)
         if (sk_SSL_CIPHER_find(srvrsk, c) < 0)
             continue;
 
-        n = strlen(c->name);
-        if (n + 1 > size) {
+        n = OPENSSL_strnlen(c->name, size);
+        if (n >= size) {
             if (p != buf)
                 --p;
             *p = '\0';
             return buf;
         }
-        strcpy(p, c->name);
+        memcpy(p, c->name, n);
         p += n;
         *(p++) = ':';
         size -= n + 1;
diff --git a/crypto/openssl/ssl/ssl_sess.c b/crypto/openssl/ssl/ssl_sess.c
index c322a11d9c52..d836b33ed0e8 100644
--- a/crypto/openssl/ssl/ssl_sess.c
+++ b/crypto/openssl/ssl/ssl_sess.c
@@ -198,8 +198,11 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket)
     dest->references = 1;
 
     dest->lock = CRYPTO_THREAD_lock_new();
-    if (dest->lock == NULL)
+    if (dest->lock == NULL) {
+        OPENSSL_free(dest);
+        dest = NULL;
         goto err;
+    }
 
     if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, dest, &dest->ex_data))
         goto err;
diff --git a/crypto/openssl/ssl/statem/extensions_srvr.c b/crypto/openssl/ssl/statem/extensions_srvr.c
index 16765a5a5b6f..1fab5a3d1295 100644
--- a/crypto/openssl/ssl/statem/extensions_srvr.c
+++ b/crypto/openssl/ssl/statem/extensions_srvr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -883,7 +883,7 @@ int tls_parse_ctos_cookie(SSL *s, PACKET *pkt, unsigned int context, X509 *x,
     }
 
     /* Act as if this ClientHello came after a HelloRetryRequest */
-    s->hello_retry_request = 1;
+    s->hello_retry_request = SSL_HRR_PENDING;
 
     s->ext.cookieok = 1;
 #endif
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 2650c2f594dc..3b8252460642 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -352,6 +352,8 @@
                 print
                 ..
             ..
+            sound
+            ..
             sunrpc
                 dir
                 ..
diff --git a/include/Makefile b/include/Makefile
index 991c43ace9ec..e40c8fca06de 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -216,7 +216,8 @@ IPFILTERDIR=	${INCLUDEDIR}/netinet
 .PATH: ${SRCTOP}/sys/netpfil/pf
 PF=		pf.h \
 		pf_altq.h \
-		pf_mtag.h
+		pf_mtag.h \
+		pf_nl.h
 PFPACKAGE=	pf
 PFDIR=	${INCLUDEDIR}/netpfil/pf
 
diff --git a/include/rpc/rpcb_prot.x b/include/rpc/rpcb_prot.x
index a34bcc12502a..b5de5c6d865d 100644
--- a/include/rpc/rpcb_prot.x
+++ b/include/rpc/rpcb_prot.x
@@ -1,6 +1,4 @@
 %/*-
-% * $FreeBSD$
-% *
 % * Copyright (c) 2009, Sun Microsystems, Inc.
 % * All rights reserved.
 % *
diff --git a/lib/libblacklist/Makefile b/lib/libblacklist/Makefile
index e8d25ac7f1b8..932e186e3172 100644
--- a/lib/libblacklist/Makefile
+++ b/lib/libblacklist/Makefile
@@ -3,6 +3,7 @@ BLACKLIST_DIR=${SRCTOP}/contrib/blacklist
 
 .PATH: ${BLACKLIST_DIR}/lib ${BLACKLIST_DIR}/include
 
+PACKAGE=	blocklist
 LIB=	blacklist
 SHLIB_MAJOR= 0
 
diff --git a/lib/libbsddialog/Makefile b/lib/libbsddialog/Makefile
index ddb7e08f71ba..2ec633b25147 100644
--- a/lib/libbsddialog/Makefile
+++ b/lib/libbsddialog/Makefile
@@ -6,9 +6,8 @@ LIB=	bsddialog
 PRIVATELIB=	yes
 SHLIB_MAJOR=	0
 SRCS=	barbox.c \
-	calendarbox.c \
+	datebox.c \
 	formbox.c \
-	infobox.c \
 	lib_util.c \
 	lib_util.h \
 	libbsddialog.c \
@@ -22,7 +21,7 @@ INCS=	bsddialog.h \
 	bsddialog_progressview.h
 MAN=	bsddialog.3
 
-LIBADD=	ncursesw tinfow formw
+LIBADD=	ncursesw tinfow
 CFLAGS+=	-D_XOPEN_SOURCE_EXTENDED
 
 .include <bsd.lib.mk>
diff --git a/lib/libc/stdlib/ptsname.3 b/lib/libc/stdlib/ptsname.3
index 532ce9e92ae0..df23e9ae6129 100644
--- a/lib/libc/stdlib/ptsname.3
+++ b/lib/libc/stdlib/ptsname.3
@@ -29,7 +29,7 @@
 .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 17, 2020
+.Dd October 14, 2023
 .Dt PTSNAME 3
 .Os
 .Sh NAME
@@ -104,7 +104,7 @@ function clears the lock held on the pseudo-terminal pair
 for the master device specified with
 .Fa fildes .
 .Sh RETURN VALUES
-.Rv -std grantpt ptsname_r unlockpt
+.Rv -std grantpt unlockpt
 .Pp
 The
 .Fn ptsname
@@ -112,6 +112,19 @@ function returns a pointer to the name
 of the slave device on success; otherwise a
 .Dv NULL
 pointer is returned.
+.Pp
+The
+.Fn ptsname_r
+function returns the value 0 if successful;
+otherwise a nonzero value is returned and the global variable
+.Va errno
+is set to indicate the error.
+Note:
+.Fn ptsname_r
+was previously documented as returning -1 on error.
+In the future it will be changed to return an error number, for POSIX
+compatibility.
+Therefore, callers should not check for -1.
 .Sh ERRORS
 The
 .Fn grantpt ,
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index 8c7d07761aff..a3810009d472 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -147,7 +147,7 @@ The following
 tunables influence the behaviour of
 .Fn ktrace :
 .Bl -tag -width indent
-.It Va kern.ktrace.geniosize
+.It Va kern.ktrace.genio_size
 bounds the amount of data a traced I/O request will log
 to the trace file.
 .It Va kern.ktrace.request_pool
diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile
index 1994b128ab57..e312787c8831 100644
--- a/lib/libc/tests/string/Makefile
+++ b/lib/libc/tests/string/Makefile
@@ -2,6 +2,7 @@
 # ensure libc functions are tested, not clang's builtins
 CFLAGS+=	-fno-builtin
 
+ATF_TESTS_C+=		bcmp_test
 ATF_TESTS_C+=		ffs_test
 ATF_TESTS_C+=		ffsl_test
 ATF_TESTS_C+=		ffsll_test
@@ -16,6 +17,8 @@ ATF_TESTS_C+=		strerror2_test
 ATF_TESTS_C+=		strspn_test
 ATF_TESTS_C+=		strverscmp_test
 ATF_TESTS_C+=		strxfrm_test
+ATF_TESTS_C+=		timingsafe_bcmp_test
+ATF_TESTS_C+=		timingsafe_memcmp_test
 ATF_TESTS_C+=		wcscasecmp_test
 ATF_TESTS_C+=		wcscoll_test
 ATF_TESTS_C+=		wcsnlen_test
diff --git a/contrib/bsddialog/util_theme.h b/lib/libc/tests/string/bcmp_test.c
similarity index 69%
rename from contrib/bsddialog/util_theme.h
rename to lib/libc/tests/string/bcmp_test.c
index bf51447dfb2c..fdf5e48b3eb4 100644
--- a/contrib/bsddialog/util_theme.h
+++ b/lib/libc/tests/string/bcmp_test.c
@@ -1,7 +1,8 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
+ * Copyright (c) 2023 The FreeBSD Foundation
  *
- * Copyright (c) 2022 Alfonso Sabato Siciliano
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,25 +13,20 @@
  *    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
+ * 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
+ * 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.
+ * SUCH DAMAGE
  */
 
-#ifndef _BSDDIALOG_UTILITY_THEME_H_
-#define _BSDDIALOG_UTILITY_THEME_H_
+#define MEMCMP bcmp
+#define RES(x) ((x) != 0)
 
-void savetheme(const char *file, const char *version);
-void loadtheme(const char *file);
-void setdeftheme(enum bsddialog_default_theme theme);
-void bikeshed(struct bsddialog_conf *conf);
-
-#endif
+#include "memcmp_test.c"
diff --git a/lib/libc/tests/string/memcmp_test.c b/lib/libc/tests/string/memcmp_test.c
index ab782c92f255..487abe68f421 100644
--- a/lib/libc/tests/string/memcmp_test.c
+++ b/lib/libc/tests/string/memcmp_test.c
@@ -1,7 +1,11 @@
 /*-
  * Copyright (c) 2016 Jilles Tjoelker <jilles@FreeBSD.org>
+ * Copyright (c) 2023 The FreeBSD Foundation
  * All rights reserved.
  *
+ * Portions of this software were developed by Robert Clausecker
+ * <fuz@FreeBSD.org> under sponsorship from the FreeBSD Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -26,18 +30,47 @@
 
 #include <sys/cdefs.h>
 #include <assert.h>
+#include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <atf-c.h>
 
+#ifndef MEMCMP
+#define MEMCMP memcmp
+#endif
+
+/*
+ * On FreeBSD we demand that memcmp returns the difference between the
+ * characters at the first site of mismatch.  However, ISO/IEC 9899:1990
+ * only specifies that a number greater than, equal to, or less than
+ * zero shall be returned.  If a unit test for this less strict
+ * behaviour is desired, define RES(x) to be (((x) > 0) - ((x) < 0)).
+ */
+#ifndef RES
+#define RES(x) (x)
+#endif
+
+static int (*memcmp_fn)(const void *, const void *, size_t);
+
+static void
+check_memcmp(const char *a, const char *b, size_t len, int expected)
+{
+	int got;
+
+	got = memcmp_fn(a, b, len);
+	ATF_CHECK_EQ_MSG(RES(expected), RES(got),
+	    "%s(%p, %p, %zu) gave %d, but wanted %d",
+	    __XSTRING(MEMCMP), a, b, len, got, expected);
+}
+
 ATF_TC_WITHOUT_HEAD(zero);
 ATF_TC_BODY(zero, tc)
 {
 
-	assert(memcmp("a", "b", 0) == 0);
-	assert(memcmp("", "", 0) == 0);
+	check_memcmp("a", "b", 0, 0);
+	check_memcmp("", "", 0, 0);
 }
 
 ATF_TC_WITHOUT_HEAD(eq);
@@ -49,9 +82,9 @@ ATF_TC_BODY(eq, tc)
 	for (i = 0; i < 256; i++)
 		data1[i] = data2[i] = i ^ 0x55;
 	for (i = 1; i < 256; i++)
-		assert(memcmp(data1, data2, i) == 0);
+		check_memcmp(data1, data2, i, 0);
 	for (i = 1; i < 256; i++)
-		assert(memcmp(data1 + i, data2 + i, 256 - i) == 0);
+		check_memcmp(data1 + i, data2 + i, 256 - i, 0);
 }
 
 ATF_TC_WITHOUT_HEAD(neq);
@@ -65,9 +98,9 @@ ATF_TC_BODY(neq, tc)
 		data2[i] = i ^ 0x55;
 	}
 	for (i = 1; i < 256; i++)
-		assert(memcmp(data1, data2, i) != 0);
+		check_memcmp(data1, data2, i, -0x55);
 	for (i = 1; i < 256; i++)
-		assert(memcmp(data1 + i, data2 + i, 256 - i) != 0);
+		check_memcmp(data1 + i, data2 + i, 256 - i, i - (i ^ 0x55));
 }
 
 ATF_TC_WITHOUT_HEAD(diff);
@@ -81,37 +114,43 @@ ATF_TC_BODY(diff, tc)
 	data1[128] = 255;
 	data2[128] = 0;
 	for (i = 1; i < 66; i++) {
-		assert(memcmp(data1 + 128, data2 + 128, i) == 255);
-		assert(memcmp(data2 + 128, data1 + 128, i) == -255);
-		assert(memcmp(data1 + 129 - i, data2 + 129 - i, i) == 255);
-		assert(memcmp(data2 + 129 - i, data1 + 129 - i, i) == -255);
-		assert(memcmp(data1 + 129 - i, data2 + 129 - i, i * 2) == 255);
-		assert(memcmp(data2 + 129 - i, data1 + 129 - i, i * 2) == -255);
+		check_memcmp(data1 + 128, data2 + 128, i, 255);
+		check_memcmp(data2 + 128, data1 + 128, i, -255);
+		check_memcmp(data1 + 129 - i, data2 + 129 - i, i, 255);
+		check_memcmp(data2 + 129 - i, data1 + 129 - i, i, -255);
+		check_memcmp(data1 + 129 - i, data2 + 129 - i, i * 2, 255);
+		check_memcmp(data2 + 129 - i, data1 + 129 - i, i * 2, -255);
 	}
 	data1[128] = 'c';
 	data2[128] = 'e';
 	for (i = 1; i < 66; i++) {
-		assert(memcmp(data1 + 128, data2 + 128, i) == -2);
-		assert(memcmp(data2 + 128, data1 + 128, i) == 2);
-		assert(memcmp(data1 + 129 - i, data2 + 129 - i, i) == -2);
-		assert(memcmp(data2 + 129 - i, data1 + 129 - i, i) == 2);
-		assert(memcmp(data1 + 129 - i, data2 + 129 - i, i * 2) == -2);
-		assert(memcmp(data2 + 129 - i, data1 + 129 - i, i * 2) == 2);
+		check_memcmp(data1 + 128, data2 + 128, i, -2);
+		check_memcmp(data2 + 128, data1 + 128, i, 2);
+		check_memcmp(data1 + 129 - i, data2 + 129 - i, i, -2);
+		check_memcmp(data2 + 129 - i, data1 + 129 - i, i, 2);
+		check_memcmp(data1 + 129 - i, data2 + 129 - i, i * 2, -2);
+		check_memcmp(data2 + 129 - i, data1 + 129 - i, i * 2, 2);
 	}
 	memset(data1 + 129, 'A', sizeof(data1) - 129);
 	memset(data2 + 129, 'Z', sizeof(data2) - 129);
 	for (i = 1; i < 66; i++) {
-		assert(memcmp(data1 + 128, data2 + 128, i) == -2);
-		assert(memcmp(data2 + 128, data1 + 128, i) == 2);
-		assert(memcmp(data1 + 129 - i, data2 + 129 - i, i) == -2);
-		assert(memcmp(data2 + 129 - i, data1 + 129 - i, i) == 2);
-		assert(memcmp(data1 + 129 - i, data2 + 129 - i, i * 2) == -2);
-		assert(memcmp(data2 + 129 - i, data1 + 129 - i, i * 2) == 2);
+		check_memcmp(data1 + 128, data2 + 128, i, -2);
+		check_memcmp(data2 + 128, data1 + 128, i, 2);
+		check_memcmp(data1 + 129 - i, data2 + 129 - i, i, -2);
+		check_memcmp(data2 + 129 - i, data1 + 129 - i, i, 2);
+		check_memcmp(data1 + 129 - i, data2 + 129 - i, i * 2, -2);
+		check_memcmp(data2 + 129 - i, data1 + 129 - i, i * 2, 2);
 	}
 }
 
 ATF_TP_ADD_TCS(tp)
 {
+	void *dl_handle;
+
+	dl_handle = dlopen(NULL, RTLD_LAZY);
+	memcmp_fn = dlsym(dl_handle, "test_" __XSTRING(MEMCMP));
+	if (memcmp_fn == NULL)
+		memcmp_fn = MEMCMP;
 
 	ATF_TP_ADD_TC(tp, zero);
 	ATF_TP_ADD_TC(tp, eq);
diff --git a/lib/libc/tests/string/timingsafe_bcmp_test.c b/lib/libc/tests/string/timingsafe_bcmp_test.c
new file mode 100644
index 000000000000..96bf789633f2
--- /dev/null
+++ b/lib/libc/tests/string/timingsafe_bcmp_test.c
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * 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
+ */
+
+#define MEMCMP timingsafe_bcmp
+#define RES(x) ((x) != 0)
+
+#include "memcmp_test.c"
diff --git a/lib/libc/tests/string/timingsafe_memcmp_test.c b/lib/libc/tests/string/timingsafe_memcmp_test.c
new file mode 100644
index 000000000000..5f97e41fcf8a
--- /dev/null
+++ b/lib/libc/tests/string/timingsafe_memcmp_test.c
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * 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
+ */
+
+#define MEMCMP timingsafe_memcmp
+#define RES(x) (((x) > 0) - ((x) < 0))
+
+#include "memcmp_test.c"
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index fd2091791620..dfa742577585 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -1055,8 +1055,6 @@ fetch_ssl_setup_transport_layer(SSL_CTX *ctx, int verbose)
 /*
  * Configure peer verification based on environment.
  */
-#define LOCAL_CERT_FILE	_PATH_LOCALBASE "/etc/ssl/cert.pem"
-#define BASE_CERT_FILE	"/etc/ssl/cert.pem"
 static int
 fetch_ssl_setup_peer_verification(SSL_CTX *ctx, int verbose)
 {
@@ -1066,12 +1064,6 @@ fetch_ssl_setup_peer_verification(SSL_CTX *ctx, int verbose)
 
 	if (getenv("SSL_NO_VERIFY_PEER") == NULL) {
 		ca_cert_file = getenv("SSL_CA_CERT_FILE");
-		if (ca_cert_file == NULL &&
-		    access(LOCAL_CERT_FILE, R_OK) == 0)
-			ca_cert_file = LOCAL_CERT_FILE;
-		if (ca_cert_file == NULL &&
-		    access(BASE_CERT_FILE, R_OK) == 0)
-			ca_cert_file = BASE_CERT_FILE;
 		ca_cert_path = getenv("SSL_CA_CERT_PATH");
 		if (verbose) {
 			fetch_info("Peer verification enabled");
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 9082f338f7c1..5f7489799cf6 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd November 24, 2020
+.Dd October 7, 2023
 .Dt FETCH 3
 .Os
 .Sh NAME
@@ -409,19 +409,6 @@ library,
 is currently unimplemented.
 .Sh HTTPS SCHEME
 Based on HTTP SCHEME.
-By default the peer is verified using the CA bundle located in
-.Pa /usr/local/etc/ssl/cert.pem .
-If this file does not exist,
-.Pa /etc/ssl/cert.pem
-is used instead.
-If neither file exists, and
-.Ev SSL_CA_CERT_PATH
-has not been set,
-OpenSSL's default CA cert and path settings apply.
-The certificate bundle can contain multiple CA certificates.
-A common source of a current CA bundle is
-.Pa \%security/ca_root_nss .
-.Pp
 The CA bundle used for peer verification can be changed by setting the
 environment variables
 .Ev SSL_CA_CERT_FILE
diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c
index 1eccf3dfbcdf..51276d8bb343 100644
--- a/lib/libpfctl/libpfctl.c
+++ b/lib/libpfctl/libpfctl.c
@@ -40,6 +40,13 @@
 #include <net/pfvar.h>
 #include <netinet/in.h>
 
+#include <netpfil/pf/pf_nl.h>
+#include <netlink/netlink.h>
+#include <netlink/netlink_generic.h>
+#include <netlink/netlink_snl.h>
+#include <netlink/netlink_snl_generic.h>
+#include <netlink/netlink_snl_route.h>
+
 #include <assert.h>
 #include <err.h>
 #include <errno.h>
@@ -170,6 +177,34 @@ pf_nvuint_64_array(const nvlist_t *nvl, const char *name, size_t maxelems,
 		*nelems = elems;
 }
 
+int
+pfctl_startstop(int start)
+{
+	struct snl_state ss = {};
+	struct snl_errmsg_data e = {};
+	struct snl_writer nw;
+	struct nlmsghdr *hdr;
+	uint32_t seq_id;
+	int family_id;
+
+	snl_init(&ss, NETLINK_GENERIC);
+	family_id = snl_get_genl_family(&ss, PFNL_FAMILY_NAME);
+
+	snl_init_writer(&ss, &nw);
+	hdr = snl_create_genl_msg_request(&nw, family_id,
+	    start ? PFNL_CMD_START : PFNL_CMD_STOP);
+
+	snl_finalize_msg(&nw);
+	seq_id = hdr->nlmsg_seq;
+
+	snl_send_message(&ss, hdr);
+
+	while ((hdr = snl_read_reply_multi(&ss, seq_id, &e)) != NULL) {
+	}
+
+	return (e.error);
+}
+
 static void
 _pfctl_get_status_counters(const nvlist_t *nvl,
     struct pfctl_status_counters *counters)
@@ -1099,6 +1134,71 @@ pfctl_set_keepcounters(int dev, bool keep)
 	return (ret);
 }
 
+struct pfctl_creator {
+	uint32_t id;
+};
+#define	_IN(_field)	offsetof(struct genlmsghdr, _field)
+#define	_OUT(_field)	offsetof(struct pfctl_creator, _field)
+static struct snl_attr_parser ap_creators[] = {
+	{ .type = PF_ST_CREATORID, .off = _OUT(id), .cb = snl_attr_get_uint32 },
+};
+static struct snl_field_parser fp_creators[] = {
+};
+#undef _IN
+#undef _OUT
+SNL_DECLARE_PARSER(creator_parser, struct genlmsghdr, fp_creators, ap_creators);
+
+static int
+pfctl_get_creators_nl(struct snl_state *ss, uint32_t *creators, size_t *len)
+{
+
+	int family_id = snl_get_genl_family(ss, PFNL_FAMILY_NAME);
+	size_t i = 0;
+
+	struct nlmsghdr *hdr;
+	struct snl_writer nw;
+
+	snl_init_writer(ss, &nw);
+	hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETCREATORS);
+	hdr->nlmsg_flags |= NLM_F_DUMP;
+	snl_finalize_msg(&nw);
+	uint32_t seq_id = hdr->nlmsg_seq;
+
+	snl_send_message(ss, hdr);
+
+	struct snl_errmsg_data e = {};
+	while ((hdr = snl_read_reply_multi(ss, seq_id, &e)) != NULL) {
+		struct pfctl_creator c;
+		bzero(&c, sizeof(c));
+
+		if (!snl_parse_nlmsg(ss, hdr, &creator_parser, &c))
+			continue;
+
+		creators[i] = c.id;
+		i++;
+		if (i > *len)
+			return (E2BIG);
+	}
+
+	*len = i;
+
+	return (0);
+}
+
+int
+pfctl_get_creatorids(uint32_t *creators, size_t *len)
+{
+	struct snl_state ss = {};
+	int error;
+
+	snl_init(&ss, NETLINK_GENERIC);
+	error = pfctl_get_creators_nl(&ss, creators, len);
+	snl_free(&ss);
+
+	return (error);
+
+}
+
 static void
 pfctl_nv_add_state_cmp(nvlist_t *nvl, const char *name,
     const struct pfctl_state_cmp *cmp)
@@ -1115,126 +1215,168 @@ pfctl_nv_add_state_cmp(nvlist_t *nvl, const char *name,
 	nvlist_destroy(nv);
 }
 
-static void
-pf_state_key_export_to_state_key(struct pfctl_state_key *ps,
-    const struct pf_state_key_export *s)
+static inline bool
+snl_attr_get_pfaddr(struct snl_state *ss __unused, struct nlattr *nla,
+    const void *arg __unused, void *target)
 {
-	bcopy(s->addr, ps->addr, sizeof(ps->addr[0]) * 2);
-	ps->port[0] = s->port[0];
-	ps->port[1] = s->port[1];
+	memcpy(target, NLA_DATA(nla), NLA_DATA_LEN(nla));
+	return (true);
 }
 
-static void
-pf_state_peer_export_to_state_peer(struct pfctl_state_peer *ps,
-    const struct pf_state_peer_export *s)
+static inline bool
+snl_attr_store_ifname(struct snl_state *ss __unused, struct nlattr *nla,
+    const void *arg __unused, void *target)
 {
-	/* Ignore scrub. */
-	ps->seqlo = s->seqlo;
-	ps->seqhi = s->seqhi;
-	ps->seqdiff = s->seqdiff;
-	/* Ignore max_win & mss */
-	ps->state = s->state;
-	ps->wscale = s->wscale;
+	size_t maxlen = NLA_DATA_LEN(nla);
+
+	if (strnlen((char *)NLA_DATA(nla), maxlen) < maxlen) {
+		strlcpy(target, (char *)NLA_DATA(nla), maxlen);
+		return (true);
+	}
+	return (false);
 }
 
-static void
-pf_state_export_to_state(struct pfctl_state *ps, const struct pf_state_export *s)
-{
-	assert(s->version >= PF_STATE_VERSION);
-
-	ps->id = s->id;
-	strlcpy(ps->ifname, s->ifname, sizeof(ps->ifname));
-	strlcpy(ps->orig_ifname, s->orig_ifname, sizeof(ps->orig_ifname));
-	strlcpy(ps->rt_ifname, s->rt_ifname, sizeof(ps->rt_ifname));
-	pf_state_key_export_to_state_key(&ps->key[0], &s->key[0]);
-	pf_state_key_export_to_state_key(&ps->key[1], &s->key[1]);
-	pf_state_peer_export_to_state_peer(&ps->src, &s->src);
-	pf_state_peer_export_to_state_peer(&ps->dst, &s->dst);
-	bcopy(&s->rt_addr, &ps->rt_addr, sizeof(ps->rt_addr));
-	ps->rule = ntohl(s->rule);
-	ps->anchor = ntohl(s->anchor);
-	ps->nat_rule = ntohl(s->nat_rule);
-	ps->creation = ntohl(s->creation);
-	ps->expire = ntohl(s->expire);
-	ps->packets[0] = s->packets[0];
-	ps->packets[1] = s->packets[1];
-	ps->bytes[0] = s->bytes[0];
-	ps->bytes[1] = s->bytes[1];
-	ps->creatorid = ntohl(s->creatorid);
-	ps->key[0].proto = s->proto;
-	ps->key[1].proto = s->proto;
-	ps->key[0].af = s->af;
-	ps->key[1].af = s->af;
-	ps->direction = s->direction;
-	ps->state_flags = ntohs(s->state_flags);
-	ps->sync_flags = ntohs(s->sync_flags);
-	ps->qid = ntohs(s->qid);
-	ps->pqid = ntohs(s->pqid);
-	ps->dnpipe = ntohs(s->dnpipe);
-	ps->dnrpipe = ntohs(s->dnrpipe);
-	ps->rtableid = ntohl(s->rtableid);
-	ps->min_ttl = s->min_ttl;
-	ps->set_tos = s->set_tos;
-	ps->max_mss = ntohs(s->max_mss);
-	ps->rt = s->rt;
-	ps->set_prio[0] = s->set_prio[0];
-	ps->set_prio[1] = s->set_prio[1];
+#define	_OUT(_field)	offsetof(struct pfctl_state_peer, _field)
+static const struct snl_attr_parser nla_p_speer[] = {
+	{ .type = PF_STP_SEQLO, .off = _OUT(seqlo), .cb = snl_attr_get_uint32 },
+	{ .type = PF_STP_SEQHI, .off = _OUT(seqhi), .cb = snl_attr_get_uint32 },
+	{ .type = PF_STP_SEQDIFF, .off = _OUT(seqdiff), .cb = snl_attr_get_uint32 },
+	{ .type = PF_STP_STATE, .off = _OUT(state), .cb = snl_attr_get_uint8 },
+	{ .type = PF_STP_WSCALE, .off = _OUT(wscale), .cb = snl_attr_get_uint8 },
+};
+SNL_DECLARE_ATTR_PARSER(speer_parser, nla_p_speer);
+#undef _OUT
+
+#define	_OUT(_field)	offsetof(struct pf_state_key_export, _field)
+static const struct snl_attr_parser nla_p_skey[] = {
+	{ .type = PF_STK_ADDR0, .off = _OUT(addr[0]), .cb = snl_attr_get_pfaddr },
+	{ .type = PF_STK_ADDR1, .off = _OUT(addr[1]), .cb = snl_attr_get_pfaddr },
+	{ .type = PF_STK_PORT0, .off = _OUT(port[0]), .cb = snl_attr_get_uint16 },
+	{ .type = PF_STK_PORT1, .off = _OUT(port[1]), .cb = snl_attr_get_uint16 },
+};
+SNL_DECLARE_ATTR_PARSER(skey_parser, nla_p_skey);
+#undef _OUT
+
+#define	_IN(_field)	offsetof(struct genlmsghdr, _field)
+#define	_OUT(_field)	offsetof(struct pfctl_state, _field)
+static struct snl_attr_parser ap_state[] = {
+	{ .type = PF_ST_ID, .off = _OUT(id), .cb = snl_attr_get_uint64 },
+	{ .type = PF_ST_CREATORID, .off = _OUT(creatorid), .cb = snl_attr_get_uint32 },
+	{ .type = PF_ST_IFNAME, .off = _OUT(ifname), .cb = snl_attr_store_ifname },
+	{ .type = PF_ST_ORIG_IFNAME, .off = _OUT(orig_ifname), .cb = snl_attr_store_ifname },
+	{ .type = PF_ST_KEY_WIRE, .off = _OUT(key[0]), .arg = &skey_parser, .cb = snl_attr_get_nested },
+	{ .type = PF_ST_KEY_STACK, .off = _OUT(key[1]), .arg = &skey_parser, .cb = snl_attr_get_nested },
+	{ .type = PF_ST_PEER_SRC, .off = _OUT(src), .arg = &speer_parser, .cb = snl_attr_get_nested },
+	{ .type = PF_ST_PEER_DST, .off = _OUT(dst), .arg = &speer_parser, .cb = snl_attr_get_nested },
+	{ .type = PF_ST_RT_ADDR, .off = _OUT(rt_addr), .cb = snl_attr_get_pfaddr },
+	{ .type = PF_ST_RULE, .off = _OUT(rule), .cb = snl_attr_get_uint32 },
+	{ .type = PF_ST_ANCHOR, .off = _OUT(anchor), .cb = snl_attr_get_uint32 },
+	{ .type = PF_ST_NAT_RULE, .off = _OUT(nat_rule), .cb = snl_attr_get_uint32 },
+	{ .type = PF_ST_CREATION, .off = _OUT(creation), .cb = snl_attr_get_uint32 },
+	{ .type = PF_ST_EXPIRE, .off = _OUT(expire), .cb = snl_attr_get_uint32 },
+	{ .type = PF_ST_PACKETS0, .off = _OUT(packets[0]), .cb = snl_attr_get_uint64 },
+	{ .type = PF_ST_PACKETS1, .off = _OUT(packets[1]), .cb = snl_attr_get_uint64 },
+	{ .type = PF_ST_BYTES0, .off = _OUT(bytes[0]), .cb = snl_attr_get_uint64 },
+	{ .type = PF_ST_BYTES1, .off = _OUT(bytes[1]), .cb = snl_attr_get_uint64 },
+	{ .type = PF_ST_AF, .off = _OUT(key[0].af), .cb = snl_attr_get_uint8 },
+	{ .type = PF_ST_PROTO, .off = _OUT(key[0].proto), .cb = snl_attr_get_uint8 },
+	{ .type = PF_ST_DIRECTION, .off = _OUT(direction), .cb = snl_attr_get_uint8 },
+	{ .type = PF_ST_LOG, .off = _OUT(log), .cb = snl_attr_get_uint8 },
+	{ .type = PF_ST_STATE_FLAGS, .off = _OUT(state_flags), .cb = snl_attr_get_uint16 },
+	{ .type = PF_ST_SYNC_FLAGS, .off = _OUT(sync_flags), .cb = snl_attr_get_uint8 },
+};
+static struct snl_field_parser fp_state[] = {
+};
+#undef _IN
+#undef _OUT
+SNL_DECLARE_PARSER(state_parser, struct genlmsghdr, fp_state, ap_state);
+
+static const struct snl_hdr_parser *all_parsers[] = {
+	&state_parser, &skey_parser, &speer_parser,
+	&creator_parser,
+};
+
+static int
+pfctl_get_states_nl(struct snl_state *ss, pfctl_get_state_fn f, void *arg)
+{
+	SNL_VERIFY_PARSERS(all_parsers);
+	int family_id = snl_get_genl_family(ss, PFNL_FAMILY_NAME);
+	int ret;
+
+	struct nlmsghdr *hdr;
+	struct snl_writer nw;
+
+	snl_init_writer(ss, &nw);
+	hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETSTATES);
+	hdr->nlmsg_flags |= NLM_F_DUMP;
+	snl_finalize_msg(&nw);
+	uint32_t seq_id = hdr->nlmsg_seq;
+
+	snl_send_message(ss, hdr);
+
+	struct snl_errmsg_data e = {};
+	while ((hdr = snl_read_reply_multi(ss, seq_id, &e)) != NULL) {
+		struct pfctl_state s;
+		bzero(&s, sizeof(s));
+		if (!snl_parse_nlmsg(ss, hdr, &state_parser, &s))
+			continue;
+
+		s.key[1].af = s.key[0].af;
+		s.key[1].proto = s.key[0].proto;
+
+		ret = f(&s, arg);
+		if (ret != 0)
+			return (ret);
+	}
+
+	return (0);
 }
 
 int
-pfctl_get_states(int dev, struct pfctl_states *states)
+pfctl_get_states_iter(pfctl_get_state_fn f, void *arg)
+{
+	struct snl_state ss = {};
+	int error;
+
+	snl_init(&ss, NETLINK_GENERIC);
+	error = pfctl_get_states_nl(&ss, f, arg);
+	snl_free(&ss);
+
+	return (error);
+}
+
+static int
+pfctl_append_states(struct pfctl_state *s, void *arg)
 {
-	struct pfioc_states_v2 ps;
-	struct pf_state_export *p;
-	char *inbuf = NULL, *newinbuf = NULL;
-	unsigned int len = 0;
-	int i, error;
+	struct pfctl_state *new;
+	struct pfctl_states *states = (struct pfctl_states *)arg;
+
+	new = malloc(sizeof(*s));
+	if (new == NULL)
+		return (ENOMEM);
+
+	memcpy(new, s, sizeof(*s));
+
+	TAILQ_INSERT_TAIL(&states->states, s, entry);
+
+	return (0);
+}
 
-	bzero(&ps, sizeof(ps));
-	ps.ps_req_version = PF_STATE_VERSION;
+int
+pfctl_get_states(int dev __unused, struct pfctl_states *states)
+{
+	int ret;
 
 	bzero(states, sizeof(*states));
 	TAILQ_INIT(&states->states);
 
-	for (;;) {
-		ps.ps_len = len;
-		if (len) {
-			newinbuf = realloc(inbuf, len);
-			if (newinbuf == NULL)
-				return (ENOMEM);
-			ps.ps_buf = inbuf = newinbuf;
-		}
-		if ((error = ioctl(dev, DIOCGETSTATESV2, &ps)) < 0) {
-			free(inbuf);
-			return (error);
-		}
-		if (ps.ps_len + sizeof(struct pfioc_states_v2) < len)
-			break;
-		if (len == 0 && ps.ps_len == 0)
-			goto out;
-		if (len == 0 && ps.ps_len != 0)
-			len = ps.ps_len;
-		if (ps.ps_len == 0)
-			goto out;      /* no states */
-		len *= 2;
-	}
-	p = ps.ps_states;
-
-	for (i = 0; i < ps.ps_len; i += sizeof(*p), p++) {
-		struct pfctl_state *s = malloc(sizeof(*s));
-		if (s == NULL) {
-			pfctl_free_states(states);
-			error = ENOMEM;
-			goto out;
-		}
-
-		pf_state_export_to_state(s, p);
-		TAILQ_INSERT_TAIL(&states->states, s, entry);
+	ret = pfctl_get_states_iter(pfctl_append_states, states);
+	if (ret != 0) {
+		pfctl_free_states(states);
+		return (ret);
 	}
 
-out:
-	free(inbuf);
-	return (error);
+	return (0);
 }
 
 void
diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h
index 2559fc9c4843..06cd25e82c08 100644
--- a/lib/libpfctl/libpfctl.h
+++ b/lib/libpfctl/libpfctl.h
@@ -384,6 +384,7 @@ struct pfctl_syncookies {
 	uint8_t				lowwater;	/* Percent */
 };
 
+int	pfctl_startstop(int start);
 struct pfctl_status* pfctl_get_status(int dev);
 uint64_t pfctl_status_counter(struct pfctl_status *status, int id);
 uint64_t pfctl_status_fcounter(struct pfctl_status *status, int id);
@@ -413,6 +414,9 @@ int	pfctl_add_rule(int dev, const struct pfctl_rule *r,
 	    const char *anchor, const char *anchor_call, uint32_t ticket,
 	    uint32_t pool_ticket);
 int	pfctl_set_keepcounters(int dev, bool keep);
+int	pfctl_get_creatorids(uint32_t *creators, size_t *len);
+typedef int (*pfctl_get_state_fn)(struct pfctl_state *, void *);
+int pfctl_get_states_iter(pfctl_get_state_fn f, void *arg);
 int	pfctl_get_states(int dev, struct pfctl_states *states);
 void	pfctl_free_states(struct pfctl_states *states);
 int	pfctl_clear_states(int dev, const struct pfctl_kill *kill,
diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c
index 545637187dbe..914ef32e09d2 100644
--- a/lib/libprocstat/libprocstat.c
+++ b/lib/libprocstat/libprocstat.c
@@ -360,7 +360,7 @@ struct filestat_list *
 procstat_getfiles(struct procstat *procstat, struct kinfo_proc *kp, int mmapped)
 {
 
-	switch(procstat->type) {
+	switch (procstat->type) {
 	case PROCSTAT_KVM:
 		return (procstat_getfiles_kvm(procstat, kp, mmapped));
 	case PROCSTAT_SYSCTL:
@@ -1540,7 +1540,7 @@ procstat_get_socket_info_kvm(kvm_t *kd, struct filestat *fst,
 	/*
 	 * Protocol specific data.
 	 */
-	switch(dom.dom_family) {
+	switch (dom.dom_family) {
 	case AF_INET:
 	case AF_INET6:
 		if (proto.pr_protocol == IPPROTO_TCP) {
@@ -1613,7 +1613,7 @@ procstat_get_socket_info_sysctl(struct filestat *fst, struct sockstat *sock,
 	/*
 	 * Protocol specific data.
 	 */
-	switch(sock->dom_family) {
+	switch (sock->dom_family) {
 	case AF_INET:
 	case AF_INET6:
 		if (sock->proto == IPPROTO_TCP) {
@@ -1974,7 +1974,7 @@ procstat_getvmmap(struct procstat *procstat, struct kinfo_proc *kp,
     unsigned int *cntp)
 {
 
-	switch(procstat->type) {
+	switch (procstat->type) {
 	case PROCSTAT_KVM:
 		warnx("kvm method is not supported");
 		return (NULL);
@@ -2079,7 +2079,7 @@ gid_t *
 procstat_getgroups(struct procstat *procstat, struct kinfo_proc *kp,
     unsigned int *cntp)
 {
-	switch(procstat->type) {
+	switch (procstat->type) {
 	case PROCSTAT_KVM:
 		return (procstat_getgroups_kvm(procstat->kd, kp, cntp));
 	case PROCSTAT_SYSCTL:
@@ -2157,7 +2157,7 @@ int
 procstat_getumask(struct procstat *procstat, struct kinfo_proc *kp,
     unsigned short *maskp)
 {
-	switch(procstat->type) {
+	switch (procstat->type) {
 	case PROCSTAT_KVM:
 		return (procstat_getumask_kvm(procstat->kd, kp, maskp));
 	case PROCSTAT_SYSCTL:
@@ -2361,7 +2361,7 @@ int
 procstat_getrlimit(struct procstat *procstat, struct kinfo_proc *kp, int which,
     struct rlimit* rlimit)
 {
-	switch(procstat->type) {
+	switch (procstat->type) {
 	case PROCSTAT_KVM:
 		return (procstat_getrlimit_kvm(procstat->kd, kp, which,
 		    rlimit));
@@ -2420,7 +2420,7 @@ int
 procstat_getpathname(struct procstat *procstat, struct kinfo_proc *kp,
     char *pathname, size_t maxlen)
 {
-	switch(procstat->type) {
+	switch (procstat->type) {
 	case PROCSTAT_KVM:
 		/* XXX: Return empty string. */
 		if (maxlen > 0)
@@ -2493,7 +2493,7 @@ procstat_getosrel_core(struct procstat_core *core, int *osrelp)
 int
 procstat_getosrel(struct procstat *procstat, struct kinfo_proc *kp, int *osrelp)
 {
-	switch(procstat->type) {
+	switch (procstat->type) {
 	case PROCSTAT_KVM:
 		return (procstat_getosrel_kvm(procstat->kd, kp, osrelp));
 	case PROCSTAT_SYSCTL:
@@ -2715,7 +2715,7 @@ Elf_Auxinfo *
 procstat_getauxv(struct procstat *procstat, struct kinfo_proc *kp,
     unsigned int *cntp)
 {
-	switch(procstat->type) {
+	switch (procstat->type) {
 	case PROCSTAT_KVM:
 		warnx("kvm method is not supported");
 		return (NULL);
@@ -2829,7 +2829,7 @@ struct kinfo_kstack *
 procstat_getkstack(struct procstat *procstat, struct kinfo_proc *kp,
     unsigned int *cntp)
 {
-	switch(procstat->type) {
+	switch (procstat->type) {
 	case PROCSTAT_KVM:
 		warnx("kvm method is not supported");
 		return (NULL);
@@ -2958,7 +2958,7 @@ procstat_getadvlock_sysctl(struct procstat *procstat __unused)
 struct advlock_list *
 procstat_getadvlock(struct procstat *procstat)
 {
-	switch(procstat->type) {
+	switch (procstat->type) {
 	case PROCSTAT_KVM:
 		warnx("kvm method is not supported");
 		return (NULL);
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index e71d38d2d93b..aeda7d5e828b 100644
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -650,10 +650,8 @@ login_getcaptime(login_cap_t *lc, const char *cap, rlim_t def, rlim_t error)
 
     if ((r = cgetstr(lc->lc_cap, cap, &res)) == -1)
 	return def;
-    else if (r < 0) {
-	errno = ERANGE;
+    else if (r < 0)
 	return error;
-    }
 
     /* "inf" and "infinity" are special cases */
     if (isinfinite(res))
@@ -735,19 +733,18 @@ login_getcapnum(login_cap_t *lc, const char *cap, rlim_t def, rlim_t error)
     /*
      * For BSDI compatibility, try for the tag=<val> first
      */
-    if ((r = cgetstr(lc->lc_cap, cap, &res)) == -1) {
+    r = cgetstr(lc->lc_cap, cap, &res);
+    if (r == -1) {
 	long	lval;
 	/* string capability not present, so try for tag#<val> as numeric */
 	if ((r = cgetnum(lc->lc_cap, cap, &lval)) == -1)
 	    return def; /* Not there, so return default */
-	else if (r >= 0)
+	else if (r < 0)
+	    return error;
+	else
 	    return (rlim_t)lval;
-    }
-
-    if (r < 0) {
-	errno = ERANGE;
+    } else if (r < 0)
 	return error;
-    }
 
     if (isinfinite(res))
 	return RLIM_INFINITY;
@@ -786,10 +783,8 @@ login_getcapsize(login_cap_t *lc, const char *cap, rlim_t def, rlim_t error)
 
     if ((r = cgetstr(lc->lc_cap, cap, &res)) == -1)
 	return def;
-    else if (r < 0) {
-	errno = ERANGE;
+    else if (r < 0)
 	return error;
-    }
 
     if (isinfinite(res))
 	return RLIM_INFINITY;
diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index f561479690c1..1036e9f9208c 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -452,7 +452,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in
 
 	if (p > PRIO_MAX) {
 	    rtp.type = RTP_PRIO_IDLE;
-	    p -= PRIO_MAX + 1;
+	    p += RTP_PRIO_MIN - (PRIO_MAX + 1);
 	    rtp.prio = p > RTP_PRIO_MAX ? RTP_PRIO_MAX : p;
 	    if (rtprio(RTP_SET, 0, &rtp))
 		syslog(LOG_WARNING, "rtprio '%s' (%s): %m",
@@ -460,7 +460,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in
 		    lc ? lc->lc_class : LOGIN_DEFCLASS);
 	} else if (p < PRIO_MIN) {
 	    rtp.type = RTP_PRIO_REALTIME;
-	    p -= PRIO_MIN - RTP_PRIO_MAX;
+	    p += RTP_PRIO_MAX - (PRIO_MIN - 1);
 	    rtp.prio = p < RTP_PRIO_MIN ? RTP_PRIO_MIN : p;
 	    if (rtprio(RTP_SET, 0, &rtp))
 		syslog(LOG_WARNING, "rtprio '%s' (%s): %m",
@@ -546,7 +546,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in
     /*
      * Now, we repeat some of the above for the user's private entries
      */
-    if (getuid() == uid && (lc = login_getuserclass(pwd)) != NULL) {
+    if (geteuid() == uid && (lc = login_getuserclass(pwd)) != NULL) {
 	mymask = setlogincontext(lc, pwd, mymask, flags);
 	login_close(lc);
     }
diff --git a/lib/ofed/libirdma/Makefile b/lib/ofed/libirdma/Makefile
index 368bd536c587..349590672b44 100644
--- a/lib/ofed/libirdma/Makefile
+++ b/lib/ofed/libirdma/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD: releng/12.1/lib/ofed/libirdma/Makefile 336568 2018-07-20 23:49:57Z kib $
-
 _spath=	${SRCTOP}/contrib/ofed/libirdma
 _ipath=	${SRCTOP}/contrib/ofed/include
 lin_inc=/usr/src/sys/compat/linuxkpi/common/include
diff --git a/libexec/tftp-proxy/Makefile b/libexec/tftp-proxy/Makefile
index 88029fae413a..52ee90c537ab 100644
--- a/libexec/tftp-proxy/Makefile
+++ b/libexec/tftp-proxy/Makefile
@@ -8,6 +8,9 @@ MAN=	tftp-proxy.8
 CFLAGS+= -I${SRCTOP}/lib/libpfctl -I${OBJTOP}/lib/libpfctl
 LIBADD= pfctl
 
+# ld.lld: error: could not determine size of cap reloc against local object nla_p_donemsg
+LD_FATAL_WARNINGS=no
+
 WARNS?=	3
 
 .include <bsd.prog.mk>
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index cf91873fd8cf..255ef648329d 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -17,6 +17,8 @@ bhyve_COMMENT= 		Bhyve Utilities
 bhyve_DESC= 		Bhyve Utilities
 binutils_COMMENT= 	Binutils
 binutils_DESC= 		Binutils
+blocklist_COMMENT=	Blocklist Utilities
+blocklist_DESC=		Blocklist Utilities
 bluetooth_COMMENT=	Bluetooth Utilities
 bluetooth_DESC=		Bluetooth Utilities
 bootloader_COMMENT=	Bootloader
diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8
index 718f4e2597ae..19cd867df56b 100644
--- a/sbin/bectl/bectl.8
+++ b/sbin/bectl/bectl.8
@@ -15,7 +15,7 @@
 .\"
 .\"     @(#)be.1
 .\"
-.Dd June 28, 2023
+.Dd October 5, 2023
 .Dt BECTL 8
 .Os
 .Sh NAME
@@ -114,12 +114,12 @@ For instance, booting into the recovery media and manually importing a pool from
 one of the system's resident disks will require the
 .Fl r
 flag to work.
-.Pp
 .Ss Supported Subcommands and Flags
 .Bl -tag -width activate
 .It Xo
 .Fl h |
 .Fl \&?
+.Xc
 Print usage information.
 .It Xo
 .Cm activate
@@ -396,7 +396,6 @@ will force the unmount if busy.
 .Pp
 Unmount will not remove the mount point.
 .El
-.Pp
 .Ss Boot Environment Structures
 The traditional
 .Fx
@@ -482,11 +481,11 @@ A future version of
 may default to handling both styles and deprecate the various
 .Fl r
 flags.
-\" .Sh EXAMPLES
-\" .Bl -bullet
-\" .It
-\" To fill in with jail upgrade example when behavior is firm.
-\" .El
+.\" .Sh EXAMPLES
+.\" .Bl -bullet
+.\" .It
+.\" To fill in with jail upgrade example when behavior is firm.
+.\" .El
 .Sh SEE ALSO
 .Xr libbe 3 ,
 .Xr zfsprops 7 ,
diff --git a/sbin/growfs/growfs.8 b/sbin/growfs/growfs.8
index f83c3c00cf1f..9a6076017c74 100644
--- a/sbin/growfs/growfs.8
+++ b/sbin/growfs/growfs.8
@@ -36,7 +36,7 @@
 .\"
 .\" $TSHeader: src/sbin/growfs/growfs.8,v 1.3 2000/12/12 19:31:00 tomsoft Exp $
 .\"
-.Dd December 13, 2017
+.Dd October 3, 2023
 .Dt GROWFS 8
 .Os
 .Sh NAME
@@ -88,6 +88,10 @@ This value defaults to the size of the raw partition specified in
 .Nm
 will enlarge the file system to the size of the entire partition).
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, and >= 1 on errors.
+Errors recoverable by user action are indicated by 2.
+OS errors, which are usually not recoverable, are indicated by 3 or greater.
 .Sh EXAMPLES
 Expand root file system to fill up available space:
 .Dl growfs /
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index 7427ec596c65..f84e3492ce65 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -151,7 +151,7 @@ growfs(int fsi, int fso, unsigned int Nflag)
 	 */
 	fscs = (struct csum *)calloc((size_t)1, (size_t)sblock.fs_cssize);
 	if (fscs == NULL)
-		errx(1, "calloc failed");
+		errx(3, "calloc failed");
 	memcpy(fscs, osblock.fs_csp, osblock.fs_cssize);
 	free(osblock.fs_csp);
 	osblock.fs_csp = NULL;
@@ -263,7 +263,7 @@ growfs(int fsi, int fso, unsigned int Nflag)
 	 * and all the alternates back to disk.
 	 */
 	if (!Nflag && sbput(fso, &sblock, sblock.fs_ncg) != 0)
-		errc(2, EIO, "could not write updated superblock");
+		errc(3, EIO, "could not write updated superblock");
 	DBG_PRINT0("fscs written\n");
 
 #ifdef FS_DEBUG
@@ -1343,7 +1343,7 @@ main(int argc, char **argv)
 				size <<= 30;
 				size <<= 10;
 			} else
-				errx(1, "unknown suffix on -s argument");
+				errx(2, "unknown suffix on -s argument");
 			break;
 		case 'v': /* for compatibility to newfs */
 			break;
@@ -1368,23 +1368,23 @@ main(int argc, char **argv)
 	statfsp = getmntpoint(*argv);
 	device = getdev(*argv, statfsp);
 	if (device == NULL)
-		errx(1, "cannot find special device for %s", *argv);
+		errx(2, "cannot find special device for %s", *argv);
 
 	fsi = open(device, O_RDONLY);
 	if (fsi < 0)
-		err(1, "%s", device);
+		err(3, "%s", device);
 
 	/*
 	 * Try to guess the slice size if not specified.
 	 */
 	if (ioctl(fsi, DIOCGMEDIASIZE, &mediasize) == -1)
-		err(1,"DIOCGMEDIASIZE");
+		err(3,"DIOCGMEDIASIZE");
 
 	/*
 	 * Check if that partition is suitable for growing a file system.
 	 */
 	if (mediasize < 1)
-		errx(1, "partition is unavailable");
+		errx(2, "partition is unavailable");
 
 	/*
 	 * Read the current superblock, and take a backup.
@@ -1392,16 +1392,16 @@ main(int argc, char **argv)
 	if ((ret = sbget(fsi, &fs, UFS_STDSB, 0)) != 0) {
 		switch (ret) {
 		case ENOENT:
-			errx(1, "superblock not recognized");
+			errx(2, "superblock not recognized");
 		default:
-			errc(1, ret, "unable to read superblock");
+			errc(3, ret, "unable to read superblock");
 		}
 	}
 	/*
 	 * Check for filesystem that was unclean at mount time.
 	 */
 	if ((fs->fs_flags & (FS_UNCLEAN | FS_NEEDSFSCK)) != 0)
-		errx(1, "%s is not clean - run fsck.\n", *argv);
+		errx(2, "%s is not clean - run fsck.\n", *argv);
 	memcpy(&osblock, fs, fs->fs_sbsize);
 	osblock.fs_si = &osblock_summary_info;
 	memcpy(osblock.fs_si, fs->fs_si, sizeof(*fs->fs_si));
@@ -1427,7 +1427,7 @@ main(int argc, char **argv)
 			    mediasize,
 			    "B", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
 
-			errx(1, "requested size %s is larger "
+			errx(2, "requested size %s is larger "
 			    "than the available %s", oldsizebuf, newsizebuf);
 		}
 	}
@@ -1448,7 +1448,7 @@ main(int argc, char **argv)
 		if (size == (uint64_t)(osblock.fs_size * osblock.fs_fsize))
 			errx(0, "requested size %s is equal to the current "
 			    "filesystem size %s", newsizebuf, oldsizebuf);
-		errx(1, "requested size %s is smaller than the current "
+		errx(2, "requested size %s is smaller than the current "
 		   "filesystem size %s", newsizebuf, oldsizebuf);
 	}
 
@@ -1460,7 +1460,7 @@ main(int argc, char **argv)
 	 * Are we really growing?
 	 */
 	if (osblock.fs_size >= sblock.fs_size) {
-		errx(1, "we are not growing (%jd->%jd)",
+		errx(3, "we are not growing (%jd->%jd)",
 		    (intmax_t)osblock.fs_size, (intmax_t)sblock.fs_size);
 	}
 
@@ -1470,7 +1470,7 @@ main(int argc, char **argv)
 	if (yflag == 0) {
 		for (j = 0; j < FSMAXSNAP; j++) {
 			if (sblock.fs_snapinum[j]) {
-				errx(1, "active snapshot found in file system; "
+				errx(2, "active snapshot found in file system; "
 				    "please remove all snapshots before "
 				    "using growfs");
 			}
@@ -1515,14 +1515,14 @@ main(int argc, char **argv)
 		if (statfsp != NULL && (statfsp->f_flags & MNT_RDONLY) == 0) {
 			fso = open(_PATH_UFSSUSPEND, O_RDWR);
 			if (fso == -1)
-				err(1, "unable to open %s", _PATH_UFSSUSPEND);
+				err(3, "unable to open %s", _PATH_UFSSUSPEND);
 			error = ioctl(fso, UFSSUSPEND, &statfsp->f_fsid);
 			if (error != 0)
-				err(1, "UFSSUSPEND");
+				err(3, "UFSSUSPEND");
 		} else {
 			fso = open(device, O_WRONLY);
 			if (fso < 0)
-				err(1, "%s", device);
+				err(3, "%s", device);
 		}
 	}
 
@@ -1531,7 +1531,7 @@ main(int argc, char **argv)
 	 */
 	testbuf = malloc(sblock.fs_fsize);
 	if (testbuf == NULL)
-		err(1, "malloc");
+		err(3, "malloc");
 	rdfs((ufs2_daddr_t)((size - sblock.fs_fsize) / DEV_BSIZE),
 	    sblock.fs_fsize, testbuf, fsi);
 	wtfs((ufs2_daddr_t)((size - sblock.fs_fsize) / DEV_BSIZE),
@@ -1586,7 +1586,7 @@ main(int argc, char **argv)
 	    fragroundup(&sblock, sblock.fs_ncg * sizeof(struct csum));
 
 	if (osblock.fs_size >= sblock.fs_size)
-		errx(1, "not enough new space");
+		errx(3, "not enough new space");
 
 	DBG_PRINT0("sblock calculated\n");
 
@@ -1600,11 +1600,11 @@ main(int argc, char **argv)
 		if (statfsp != NULL && (statfsp->f_flags & MNT_RDONLY) == 0) {
 			error = ioctl(fso, UFSRESUME);
 			if (error != 0)
-				err(1, "UFSRESUME");
+				err(3, "UFSRESUME");
 		}
 		error = close(fso);
 		if (error != 0)
-			err(1, "close");
+			err(3, "close");
 		if (statfsp != NULL && (statfsp->f_flags & MNT_RDONLY) != 0 &&
 		    chkdoreload(statfsp, warn) != 0)
 			exit(9);
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 5632ad678ffb..91e697bdc3b8 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -27,7 +27,7 @@
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
 .\"
-.Dd March 17, 2022
+.Dd October 4, 2023
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -569,6 +569,7 @@ support for a particular file system might be provided either on a static
 .Xr ext2fs 5 ,
 .Xr fstab 5 ,
 .Xr procfs 5 ,
+.Xr tarfs 5 ,
 .Xr tmpfs 5 ,
 .Xr automount 8 ,
 .Xr fstyp 8 ,
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 7afbc6f691a0..d7b1ffdb7543 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -27,7 +27,7 @@
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
 .\"
-.Dd June 14, 2023
+.Dd October 8, 2023
 .Dt MOUNT_NFS 8
 .Os
 .Sh NAME
@@ -635,6 +635,7 @@ Same as
 .It Fl t
 Same as
 .Fl o Cm retransmit Ns = Ns Aq Ar value
+(deprecated)
 .It Fl w
 Same as
 .Fl o Cm wsize Ns = Ns Aq Ar value
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
index c9108f702f29..53d41dd5adb8 100644
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
@@ -29,6 +29,9 @@ YFLAGS=
 
 LIBADD=	m md pfctl
 
+# ld.lld: error: could not determine size of cap reloc against local object nla_p_donemsg
+LD_FATAL_WARNINGS=no
+
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 041dcb0587b3..17227b674814 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -4720,6 +4720,10 @@ natrule		: nataction interface af proto fromto tag tagged rtable
 				remove_invalid_hosts(&$9->host, &r.af);
 				if (invalid_redirect($9->host, r.af))
 					YYERROR;
+				if ($9->host->addr.type == PF_ADDR_DYNIFTL) {
+					if (($9->host = gen_dynnode($9->host, r.af)) == NULL)
+						err(1, "calloc");
+				}
 				if (check_netmask($9->host, r.af))
 					YYERROR;
 
@@ -4936,6 +4940,10 @@ binatrule	: no BINAT natpasslog interface af proto FROM ipspec toipspec tag
 					yyerror("binat ip versions must match");
 					YYERROR;
 				}
+				if ($8->addr.type == PF_ADDR_DYNIFTL) {
+					if (($8 = gen_dynnode($8, binat.af)) == NULL)
+						err(1, "calloc");
+				}
 				if (check_netmask($8, binat.af))
 					YYERROR;
 				memcpy(&binat.src.addr, &$8->addr,
@@ -4951,6 +4959,10 @@ binatrule	: no BINAT natpasslog interface af proto FROM ipspec toipspec tag
 					yyerror("binat ip versions must match");
 					YYERROR;
 				}
+				if ($9->addr.type == PF_ADDR_DYNIFTL) {
+					if (($9 = gen_dynnode($9, binat.af)) == NULL)
+						err(1, "calloc");
+				}
 				if (check_netmask($9, binat.af))
 					YYERROR;
 				memcpy(&binat.dst.addr, &$9->addr,
@@ -4980,6 +4992,10 @@ binatrule	: no BINAT natpasslog interface af proto FROM ipspec toipspec tag
 					    "a single address");
 					YYERROR;
 				}
+				if ($13->host->addr.type == PF_ADDR_DYNIFTL) {
+					if (($13->host = gen_dynnode($13->host, binat.af)) == NULL)
+						err(1, "calloc");
+				}
 				if (check_netmask($13->host, binat.af))
 					YYERROR;
 
@@ -5982,7 +5998,7 @@ expand_rule(struct pfctl_rule *r,
 	char			 tagname[PF_TAG_NAME_SIZE];
 	char			 match_tagname[PF_TAG_NAME_SIZE];
 	struct pf_pooladdr	*pa;
-	struct node_host	*h;
+	struct node_host	*h, *osrch, *odsth;
 	u_int8_t		 flags, flagset, keep_state;
 
 	memcpy(label, r->label, sizeof(r->label));
@@ -6043,6 +6059,18 @@ expand_rule(struct pfctl_rule *r,
 		    sizeof(r->match_tagname)) >= sizeof(r->match_tagname))
 			errx(1, "expand_rule: strlcpy");
 
+		osrch = odsth = NULL;
+		if (src_host->addr.type == PF_ADDR_DYNIFTL) {
+			osrch = src_host;
+			if ((src_host = gen_dynnode(src_host, r->af)) == NULL)
+				err(1, "expand_rule: calloc");
+		}
+		if (dst_host->addr.type == PF_ADDR_DYNIFTL) {
+			odsth = dst_host;
+			if ((dst_host = gen_dynnode(dst_host, r->af)) == NULL)
+				err(1, "expand_rule: calloc");
+		}
+
 		error += check_netmask(src_host, r->af);
 		error += check_netmask(dst_host, r->af);
 
@@ -6121,6 +6149,15 @@ expand_rule(struct pfctl_rule *r,
 			added++;
 		}
 
+		if (osrch && src_host->addr.type == PF_ADDR_DYNIFTL) {
+			free(src_host);
+			src_host = osrch;
+		}
+		if (odsth && dst_host->addr.type == PF_ADDR_DYNIFTL) {
+			free(dst_host);
+			dst_host = odsth;
+		}
+
 	))))))))));
 
 	FREE_LIST(struct node_if, interfaces);
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index bfa76b299a02..56b1d28c6fd6 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -233,7 +233,7 @@ static const char * const clearopt_list[] = {
 static const char * const showopt_list[] = {
 	"ether", "nat", "queue", "rules", "Anchors", "Sources", "states",
 	"info", "Interfaces", "labels", "timeouts", "memory", "Tables",
-	"osfp", "Running", "all", NULL
+	"osfp", "Running", "all", "creatorids", NULL
 };
 
 static const char * const tblcmdopt_list[] = {
@@ -310,10 +310,12 @@ pfctl_proto2name(int proto)
 int
 pfctl_enable(int dev, int opts)
 {
-	if (ioctl(dev, DIOCSTART)) {
-		if (errno == EEXIST)
+	int ret;
+
+	if ((ret = pfctl_startstop(1)) != 0) {
+		if (ret == EEXIST)
 			errx(1, "pf already enabled");
-		else if (errno == ESRCH)
+		else if (ret == ESRCH)
 			errx(1, "pfil registeration failed");
 		else
 			err(1, "DIOCSTART");
@@ -331,8 +333,10 @@ pfctl_enable(int dev, int opts)
 int
 pfctl_disable(int dev, int opts)
 {
-	if (ioctl(dev, DIOCSTOP)) {
-		if (errno == ENOENT)
+	int ret;
+
+	if ((ret = pfctl_startstop(0)) != 0) {
+		if (ret == ENOENT)
 			errx(1, "pf not enabled");
 		else
 			err(1, "DIOCSTOP");
@@ -1514,30 +1518,41 @@ pfctl_show_src_nodes(int dev, int opts)
 	return (0);
 }
 
+struct pfctl_show_state_arg {
+	int opts;
+	int dotitle;
+	const char *iface;
+};
+
+static int
+pfctl_show_state(struct pfctl_state *s, void *arg)
+{
+	struct pfctl_show_state_arg *a = (struct pfctl_show_state_arg *)arg;
+
+	if (a->iface != NULL && strcmp(s->ifname, a->iface))
+		return (0);
+
+	if (a->dotitle) {
+		pfctl_print_title("STATES:");
+		a->dotitle = 0;
+	}
+	print_state(s, a->opts);
+
+	return (0);
+}
+
 int
 pfctl_show_states(int dev, const char *iface, int opts)
 {
-	struct pfctl_states states;
-	struct pfctl_state *s;
-	int dotitle = (opts & PF_OPT_SHOWALL);
+	struct pfctl_show_state_arg arg;
 
-	memset(&states, 0, sizeof(states));
+	arg.opts = opts;
+	arg.dotitle = opts & PF_OPT_SHOWALL;
+	arg.iface = iface;
 
-	if (pfctl_get_states(dev, &states))
+	if (pfctl_get_states_iter(pfctl_show_state, &arg))
 		return (-1);
 
-	TAILQ_FOREACH(s, &states.states, entry) {
-		if (iface != NULL && strcmp(s->ifname, iface))
-			continue;
-		if (dotitle) {
-			pfctl_print_title("STATES:");
-			dotitle = 0;
-		}
-		print_state(s, opts);
-	}
-
-	pfctl_free_states(&states);
-
 	return (0);
 }
 
@@ -1628,6 +1643,22 @@ pfctl_show_limits(int dev, int opts)
 	return (0);
 }
 
+void
+pfctl_show_creators(int opts)
+{
+	int ret;
+	uint32_t creators[16];
+	size_t count = nitems(creators);
+
+	ret = pfctl_get_creatorids(creators, &count);
+	if (ret != 0)
+		errx(ret, "Failed to retrieve creators");
+
+	printf("Creator IDs:\n");
+	for (size_t i = 0; i < count; i++)
+		printf("%08x\n", creators[i]);
+}
+
 /* callbacks for rule/nat/rdr/addr */
 int
 pfctl_add_pool(struct pfctl *pf, struct pfctl_pool *p, sa_family_t af)
@@ -3110,6 +3141,9 @@ main(int argc, char *argv[])
 		case 'I':
 			pfctl_show_ifaces(ifaceopt, opts);
 			break;
+		case 'c':
+			pfctl_show_creators(opts);
+			break;
 		}
 	}
 
diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h
index b9da5e96a90e..cf198d557299 100644
--- a/sbin/pfctl/pfctl.h
+++ b/sbin/pfctl/pfctl.h
@@ -88,6 +88,7 @@ int	 pfctl_command_tables(int, char *[], char *, const char *, char *,
 int	 pfctl_show_altq(int, const char *, int, int);
 void	 warn_namespace_collision(const char *);
 int	 pfctl_show_ifaces(const char *, int);
+void	pfctl_show_creators(int);
 FILE	*pfctl_fopen(const char *, const char *);
 
 #ifdef __FreeBSD__
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index 936c5ec53759..925848055bba 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1306,16 +1306,12 @@ int
 check_netmask(struct node_host *h, sa_family_t af)
 {
 	struct node_host	*n = NULL;
-	struct pf_addr	*m;
+	struct pf_addr		*m;
 
 	for (n = h; n != NULL; n = n->next) {
 		if (h->addr.type == PF_ADDR_TABLE)
 			continue;
 		m = &h->addr.v.a.mask;
-		/* fix up netmask for dynaddr */
-		if (af == AF_INET && h->addr.type == PF_ADDR_DYNIFTL &&
-		    unmask(m, AF_INET6) > 32)
-			set_ipmask(n, 32);
 		/* netmasks > 32 bit are invalid on v4 */
 		if (af == AF_INET &&
 		    (m->addr32[1] || m->addr32[2] || m->addr32[3])) {
@@ -1327,6 +1323,30 @@ check_netmask(struct node_host *h, sa_family_t af)
 	return (0);
 }
 
+struct node_host *
+gen_dynnode(struct node_host *h, sa_family_t af)
+{
+	struct node_host	*n;
+	struct pf_addr		*m;
+
+	if (h->addr.type != PF_ADDR_DYNIFTL)
+		return (NULL);
+
+	if ((n = calloc(1, sizeof(*n))) == NULL)
+		return (NULL);
+	bcopy(h, n, sizeof(*n));
+	n->ifname = NULL;
+	n->next = NULL;
+	n->tail = NULL;
+
+	/* fix up netmask */
+	m = &n->addr.v.a.mask;
+	if (af == AF_INET && unmask(m, AF_INET6) > 32)
+		set_ipmask(n, 32);
+
+	return (n);
+}
+
 /* interface lookup routines */
 
 static struct node_host	*iftab;
diff --git a/sbin/pfctl/pfctl_parser.h b/sbin/pfctl/pfctl_parser.h
index 83a4880106a8..d0f3bc3c303c 100644
--- a/sbin/pfctl/pfctl_parser.h
+++ b/sbin/pfctl/pfctl_parser.h
@@ -360,6 +360,7 @@ extern const struct pf_timeout pf_timeouts[];
 void			 set_ipmask(struct node_host *, u_int8_t);
 int			 check_netmask(struct node_host *, sa_family_t);
 int			 unmask(struct pf_addr *, sa_family_t);
+struct node_host	*gen_dynnode(struct node_host *, sa_family_t);
 void			 ifa_load(void);
 int			 get_query_socket(void);
 struct node_host	*ifa_exists(char *);
diff --git a/sbin/pfctl/tests/files/pf0102.ok b/sbin/pfctl/tests/files/pf0102.ok
index 3233ca5a2643..1c76ec2725ba 100644
--- a/sbin/pfctl/tests/files/pf0102.ok
+++ b/sbin/pfctl/tests/files/pf0102.ok
@@ -1,8 +1,8 @@
 pass inet from 1.1.1.1 to (self) flags S/SA keep state
-pass inet6 from 2002:: to (self)/32 flags S/SA keep state
+pass inet6 from 2002:: to (self) flags S/SA keep state
 pass inet6 from 2002:: to (self) flags S/SA keep state
 pass inet from 1.1.1.1 to (self) flags S/SA keep state
 pass inet from 1.1.1.1 to (self) flags S/SA keep state
-pass inet6 from 2002:: to (self)/32 flags S/SA keep state
+pass inet6 from 2002:: to (self)/40 flags S/SA keep state
 pass inet6 from 2002:: to (self)/40 flags S/SA keep state
 pass inet from 1.1.1.1 to (self) flags S/SA keep state
diff --git a/sbin/pfctl/tests/files/pf1018.in b/sbin/pfctl/tests/files/pf1018.in
new file mode 100644
index 000000000000..90f0a3a0bab7
--- /dev/null
+++ b/sbin/pfctl/tests/files/pf1018.in
@@ -0,0 +1 @@
+pass from { 192.0.2.1 2001:db8::1 } to (pppoe0)
diff --git a/sbin/pfctl/tests/files/pf1018.ok b/sbin/pfctl/tests/files/pf1018.ok
new file mode 100644
index 000000000000..04950f0035b8
--- /dev/null
+++ b/sbin/pfctl/tests/files/pf1018.ok
@@ -0,0 +1,2 @@
+pass inet from 192.0.2.1 to (pppoe0) flags S/SA keep state
+pass inet6 from 2001:db8::1 to (pppoe0) flags S/SA keep state
diff --git a/sbin/pfctl/tests/pfctl_test_list.inc b/sbin/pfctl/tests/pfctl_test_list.inc
index 98ea3257d492..4a63c0ba48b7 100644
--- a/sbin/pfctl/tests/pfctl_test_list.inc
+++ b/sbin/pfctl/tests/pfctl_test_list.inc
@@ -126,3 +126,4 @@ PFCTL_TEST(1014, "Ethernet rule with one label")
 PFCTL_TEST(1015, "Ethernet rule with several labels")
 PFCTL_TEST(1016, "Ethernet rule with ridentifier and one label")
 PFCTL_TEST(1017, "Ethernet rule with ridentifier and several labels")
+PFCTL_TEST(1018, "Test dynamic address mask")
diff --git a/sbin/ping/main.c b/sbin/ping/main.c
index 6321178e1228..65896a5dba7b 100644
--- a/sbin/ping/main.c
+++ b/sbin/ping/main.c
@@ -35,10 +35,13 @@
 #include <netinet/in.h>
 
 #include <err.h>
+#include <math.h>
+#include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sysexits.h>
 #include <unistd.h>
 
 #include "main.h"
@@ -59,115 +62,186 @@
 #error At least one of INET and INET6 is required
 #endif
 
+/* various options */
+u_int options;
+
+char *hostname;
+
+/* counters */
+long nreceived;		/* # of packets we got back */
+long nrepeats;		/* number of duplicates */
+long ntransmitted;	/* sequence # for outbound packets = #sent */
+long nrcvtimeout = 0;	/* # of packets we got back after waittime */
+
+/* nonzero if we've been told to finish up */
+volatile sig_atomic_t seenint;
+volatile sig_atomic_t seeninfo;
+
+/* timing */
+int timing;		/* flag to do timing */
+double tmin = 999999999.0;	/* minimum round trip time */
+double tmax = 0.0;	/* maximum round trip time */
+double tsum = 0.0;	/* sum of all times, for doing average */
+double tsumsq = 0.0;	/* sum of all times squared, for std. dev. */
+
 int
 main(int argc, char *argv[])
 {
-#if defined(INET) && defined(INET6)
+#if defined(INET)
 	struct in_addr a;
-	struct in6_addr a6;
 #endif
-#if defined(INET) || defined(INET6)
-	struct addrinfo hints;
+#if defined(INET6)
+	struct in6_addr a6;
 #endif
-	int ch;
-#ifdef INET
-	bool ipv4 = false;
+#if defined(INET) && defined(INET6)
+	struct addrinfo hints, *res, *ai;
+	const char *target;
+	int error;
 #endif
-#ifdef INET6
-	bool ipv6 = false;
+	int opt;
 
+#ifdef INET6
 	if (strcmp(getprogname(), "ping6") == 0)
-		ipv6 = true;
+		return ping6(argc, argv);
 #endif
 
-	while ((ch = getopt(argc, argv, ":" OPTSTR)) != -1) {
-		switch(ch) {
+	while ((opt = getopt(argc, argv, ":" OPTSTR)) != -1) {
+		switch (opt) {
 #ifdef INET
 		case '4':
-			ipv4 = true;
-			break;
+			goto ping4;
 #endif
 #ifdef INET6
 		case '6':
-			ipv6 = true;
-			break;
+			goto ping6;
 #endif
-#if defined(INET) && defined(INET6)
 		case 'S':
 			/*
 			 * If -S is given with a numeric parameter,
 			 * force use of the corresponding version.
 			 */
+#ifdef INET
 			if (inet_pton(AF_INET, optarg, &a) == 1)
-				ipv4 = true;
-			else if (inet_pton(AF_INET6, optarg, &a6) == 1)
-				ipv6 = true;
-			break;
+				goto ping4;
 #endif
+#ifdef INET6
+			if (inet_pton(AF_INET6, optarg, &a6) == 1)
+				goto ping6;
+#endif
+			break;
 		default:
 			break;
 		}
 	}
 
+	/*
+	 * For IPv4, only one positional argument, the target, is allowed.
+	 * For IPv6, multiple positional argument are allowed; the last
+	 * one is the target, and preceding ones are intermediate hops.
+	 * This nuance is lost here, but the only case where it matters is
+	 * an error.
+	 */
 	if (optind >= argc)
 		usage();
 
-	optreset = 1;
-	optind = 1;
-#if defined(INET) && defined(INET6)
-	if (ipv4 && ipv6)
-		errx(1, "-4 and -6 cannot be used simultaneously");
-#endif
-
 #if defined(INET) && defined(INET6)
-	if (inet_pton(AF_INET, argv[argc - 1], &a) == 1) {
-		if (ipv6)
-			errx(1, "IPv6 requested but IPv4 target address "
-			    "provided");
+	target = argv[argc - 1];
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_socktype = SOCK_RAW;
+	if (feature_present("inet") && !feature_present("inet6"))
 		hints.ai_family = AF_INET;
-	}
-	else if (inet_pton(AF_INET6, argv[argc - 1], &a6) == 1) {
-		if (ipv4)
-			errx(1, "IPv4 requested but IPv6 target address "
-			    "provided");
+	if (feature_present("inet6") && !feature_present("inet"))
 		hints.ai_family = AF_INET6;
-	} else if (ipv6)
-		hints.ai_family = AF_INET6;
-	else if (ipv4)
-		hints.ai_family = AF_INET;
-	else {
-		if (!feature_present("inet6"))
-			hints.ai_family = AF_INET;
-		else if (!feature_present("inet"))
-			hints.ai_family = AF_INET6;
-		else {
-			struct addrinfo *res;
-
-			memset(&hints, 0, sizeof(hints));
-			hints.ai_socktype = SOCK_RAW;
-			hints.ai_family = AF_UNSPEC;
-			getaddrinfo(argv[argc - 1], NULL, &hints, &res);
-			if (res != NULL) {
-				hints.ai_family = res[0].ai_family;
-				freeaddrinfo(res);
-			}
+	else
+		hints.ai_family = AF_UNSPEC;
+	error = getaddrinfo(target, NULL, &hints, &res);
+	if (res == NULL)
+		errx(EX_NOHOST, "cannot resolve %s: %s",
+		    target, gai_strerror(error));
+	for (ai = res; ai != NULL; ai = ai->ai_next) {
+		if (ai->ai_family == AF_INET) {
+			freeaddrinfo(res);
+			goto ping4;
+		}
+		if (ai->ai_family == AF_INET6) {
+			freeaddrinfo(res);
+			goto ping6;
 		}
 	}
-#elif defined(INET)
-	hints.ai_family = AF_INET;
-#elif defined(INET6)
-	hints.ai_family = AF_INET6;
+	freeaddrinfo(res);
+	errx(EX_NOHOST, "cannot resolve %s", target);
 #endif
-
 #ifdef INET
-	if (hints.ai_family == AF_INET)
-		return ping(argc, argv);
-#endif /* INET */
+ping4:
+	optreset = 1;
+	optind = 1;
+	return ping(argc, argv);
+#endif
 #ifdef INET6
-	if (hints.ai_family == AF_INET6)
-		return ping6(argc, argv);
-#endif /* INET6 */
-	errx(1, "Unknown host");
+ping6:
+	optreset = 1;
+	optind = 1;
+	return ping6(argc, argv);
+#endif
+}
+
+/*
+ * onsignal --
+ *	Set the global bit that causes the main loop to quit.
+ */
+void
+onsignal(int sig)
+{
+	switch (sig) {
+	case SIGALRM:
+	case SIGINT:
+		/*
+		 * When doing reverse DNS lookups, the seenint flag might not
+		 * be noticed for a while.  Just exit if we get a second SIGINT.
+		 */
+		if (!(options & F_HOSTNAME) && seenint != 0)
+			_exit(nreceived ? 0 : 2);
+		seenint++;
+		break;
+	case SIGINFO:
+		seeninfo++;
+		break;
+	}
+}
+
+/*
+ * pr_summary --
+ *	Print out summary statistics to the given output stream.
+ */
+void
+pr_summary(FILE * restrict stream)
+{
+	fprintf(stream, "\n--- %s ping statistics ---\n", hostname);
+	fprintf(stream, "%ld packets transmitted, ", ntransmitted);
+	fprintf(stream, "%ld packets received, ", nreceived);
+	if (nrepeats)
+		fprintf(stream, "+%ld duplicates, ", nrepeats);
+	if (ntransmitted) {
+		if (nreceived > ntransmitted)
+			fprintf(stream, "-- somebody's duplicating packets!");
+		else
+			fprintf(stream, "%.1f%% packet loss",
+			    ((((double)ntransmitted - nreceived) * 100.0) /
+			    ntransmitted));
+	}
+	if (nrcvtimeout)
+		fprintf(stream, ", %ld packets out of wait time", nrcvtimeout);
+	fputc('\n', stream);
+	if (nreceived && timing) {
+		/* Only display average to microseconds */
+		double num = nreceived + nrepeats;
+		double avg = tsum / num;
+		double stddev = sqrt(fmax(0, tsumsq / num - avg * avg));
+		fprintf(stream,
+		    "round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n",
+		    tmin, avg, tmax, stddev);
+	}
+	fflush(stream);
 }
 
 void
diff --git a/sbin/ping/main.h b/sbin/ping/main.h
index 7084585e6bb0..9a883b61a350 100644
--- a/sbin/ping/main.h
+++ b/sbin/ping/main.h
@@ -49,6 +49,31 @@
 #endif
 #define PING6OPTS ".::6Aab:C:c:Dde:fHI:i:k:l:m:nNoOp:qS:s:t:uvyYW:z:" PING6ADDOPTS
 
+/* various options */
+extern u_int options;
+#define	F_HOSTNAME	0x0004
+
+extern char *hostname;
+
+/* counters */
+extern long nreceived;		/* # of packets we got back */
+extern long nrepeats;		/* number of duplicates */
+extern long ntransmitted;	/* sequence # for outbound packets = #sent */
+extern long nrcvtimeout;	/* # of packets we got back after waittime */
+
+/* nonzero if we've been told to finish up */
+extern volatile sig_atomic_t seenint;
+extern volatile sig_atomic_t seeninfo;
+
+/* timing */
+extern int timing;		/* flag to do timing */
+extern double tmin;		/* minimum round trip time */
+extern double tmax;		/* maximum round trip time */
+extern double tsum;		/* sum of all times, for doing average */
+extern double tsumsq;		/* sum of all times squared, for std. dev. */
+
+void onsignal(int);
+void pr_summary(FILE * __restrict);
 void usage(void) __dead2;
 
 #endif
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 072d4607f745..3b8663772e87 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -87,7 +87,6 @@ static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
-#include <math.h>
 #include <netdb.h>
 #include <stddef.h>
 #include <signal.h>
@@ -127,10 +126,8 @@ struct tv32 {
 };
 
 /* various options */
-static int options;
 #define	F_FLOOD		0x0001
 #define	F_INTERVAL	0x0002
-#define	F_NUMERIC	0x0004
 #define	F_PINGFILLED	0x0008
 #define	F_QUIET		0x0010
 #define	F_RROUTE	0x0020
@@ -178,7 +175,6 @@ static char BSPACE = '\b';	/* characters written for flood */
 static const char *DOT = ".";
 static size_t DOTlen = 1;
 static size_t DOTidx = 0;
-static char *hostname;
 static char *shostname;
 static int ident;		/* process id to identify our packets */
 static int uid;			/* cached uid for micro-optimization */
@@ -190,9 +186,6 @@ static int send_len;
 /* counters */
 static long nmissedmax;		/* max value of ntransmitted - nreceived - 1 */
 static long npackets;		/* max packets to transmit */
-static long nreceived;		/* # of packets we got back */
-static long nrepeats;		/* number of duplicates */
-static long ntransmitted;	/* sequence # for outbound packets = #sent */
 static long snpackets;			/* max packets to transmit in one sweep */
 static long sntransmitted;	/* # of packets we sent in this sweep */
 static int sweepmax;		/* max value of payload in sweep */
@@ -200,33 +193,17 @@ static int sweepmin = 0;	/* start value of payload in sweep */
 static int sweepincr = 1;	/* payload increment in sweep */
 static int interval = 1000;	/* interval between packets, ms */
 static int waittime = MAXWAIT;	/* timeout for each packet */
-static long nrcvtimeout = 0;	/* # of packets we got back after waittime */
-
-/* timing */
-static int timing;		/* flag to do timing */
-static double tmin = 999999999.0;	/* minimum round trip time */
-static double tmax = 0.0;	/* maximum round trip time */
-static double tsum = 0.0;	/* sum of all times, for doing average */
-static double tsumsq = 0.0;	/* sum of all times squared, for std. dev. */
-
-/* nonzero if we've been told to finish up */
-static volatile sig_atomic_t finish_up;
-static volatile sig_atomic_t siginfo_p;
 
 static cap_channel_t *capdns;
 
 static void fill(char *, char *);
 static cap_channel_t *capdns_setup(void);
-static void check_status(void);
-static void finish(void) __dead2;
 static void pinger(void);
 static char *pr_addr(struct in_addr);
 static char *pr_ntime(n_time);
 static void pr_icmph(struct icmp *, struct ip *, const u_char *const);
 static void pr_iph(struct ip *, const u_char *);
 static void pr_pack(char *, ssize_t, struct sockaddr_in *, struct timespec *);
-static void status(int);
-static void stopit(int);
 
 int
 ping(int argc, char *const *argv)
@@ -264,8 +241,6 @@ ping(int argc, char *const *argv)
 #endif
 	cap_rights_t rights;
 
-	options |= F_NUMERIC;
-
 	/*
 	 * Do the stuff that we need root priv's for *first*, and
 	 * then drop our setuid bit.  Save error reporting for
@@ -379,7 +354,7 @@ ping(int argc, char *const *argv)
 			options |= F_SWEEP;
 			break;
 		case 'H':
-			options &= ~F_NUMERIC;
+			options |= F_HOSTNAME;
 			break;
 		case 'h': /* Packet size increment for ping sweep */
 			ltmp = strtonum(optarg, 1, INT_MAX, &errstr);
@@ -452,7 +427,7 @@ ping(int argc, char *const *argv)
 			options |= F_TTL;
 			break;
 		case 'n':
-			options |= F_NUMERIC;
+			options &= ~F_HOSTNAME;
 			break;
 		case 'o':
 			options |= F_ONCE;
@@ -882,22 +857,17 @@ ping(int argc, char *const *argv)
 
 	sigemptyset(&si_sa.sa_mask);
 	si_sa.sa_flags = 0;
-
-	si_sa.sa_handler = stopit;
-	if (sigaction(SIGINT, &si_sa, 0) == -1) {
+	si_sa.sa_handler = onsignal;
+	if (sigaction(SIGINT, &si_sa, 0) == -1)
 		err(EX_OSERR, "sigaction SIGINT");
-	}
-
-	si_sa.sa_handler = status;
-	if (sigaction(SIGINFO, &si_sa, 0) == -1) {
-		err(EX_OSERR, "sigaction");
-	}
-
-        if (alarmtimeout > 0) {
-		si_sa.sa_handler = stopit;
+	seenint = 0;
+	if (sigaction(SIGINFO, &si_sa, 0) == -1)
+		err(EX_OSERR, "sigaction SIGINFO");
+	seeninfo = 0;
+	if (alarmtimeout > 0) {
 		if (sigaction(SIGALRM, &si_sa, 0) == -1)
 			err(EX_OSERR, "sigaction SIGALRM");
-        }
+	}
 
 	bzero(&msg, sizeof(msg));
 	msg.msg_name = (caddr_t)&from;
@@ -929,13 +899,18 @@ ping(int argc, char *const *argv)
 	}
 
 	almost_done = 0;
-	while (!finish_up) {
+	while (seenint == 0) {
 		struct timespec now, timeout;
 		fd_set rfds;
 		int n;
 		ssize_t cc;
 
-		check_status();
+		/* signal handling */
+		if (seeninfo) {
+			pr_summary(stderr);
+			seeninfo = 0;
+			continue;
+		}
 		if ((unsigned)srecv >= FD_SETSIZE)
 			errx(EX_OSERR, "descriptor too large");
 		FD_ZERO(&rfds);
@@ -945,9 +920,10 @@ ping(int argc, char *const *argv)
 		timespecsub(&timeout, &now, &timeout);
 		if (timeout.tv_sec < 0)
 			timespecclear(&timeout);
+
 		n = pselect(srecv + 1, &rfds, NULL, NULL, &timeout, NULL);
 		if (n < 0)
-			continue;	/* Must be EINTR. */
+			continue;	/* EINTR */
 		if (n == 1) {
 			struct timespec *tv = NULL;
 #ifdef SO_TIMESTAMP
@@ -982,7 +958,7 @@ ping(int argc, char *const *argv)
 			    (npackets && nreceived >= npackets))
 				break;
 		}
-		if (n == 0 || options & F_FLOOD) {
+		if (n == 0 || (options & F_FLOOD)) {
 			if (sweepmax && sntransmitted == snpackets) {
 				if (datalen + sweepincr > sweepmax)
 					break;
@@ -998,14 +974,21 @@ ping(int argc, char *const *argv)
 				if (almost_done)
 					break;
 				almost_done = 1;
+				/*
+				 * If we're not transmitting any more packets,
+				 * change the timer to wait two round-trip times
+				 * if we've received any packets or (waittime)
+				 * milliseconds if we haven't.
+				 */
 				intvl.tv_nsec = 0;
 				if (nreceived) {
 					intvl.tv_sec = 2 * tmax / 1000;
-					if (!intvl.tv_sec)
+					if (intvl.tv_sec == 0)
 						intvl.tv_sec = 1;
 				} else {
 					intvl.tv_sec = waittime / 1000;
-					intvl.tv_nsec = waittime % 1000 * 1000000;
+					intvl.tv_nsec =
+					    waittime % 1000 * 1000000;
 				}
 			}
 			(void)clock_gettime(CLOCK_MONOTONIC, &last);
@@ -1016,28 +999,9 @@ ping(int argc, char *const *argv)
 			}
 		}
 	}
-	finish();
-	/* NOTREACHED */
-	exit(0);	/* Make the compiler happy */
-}
+	pr_summary(stdout);
 
-/*
- * stopit --
- *	Set the global bit that causes the main loop to quit.
- * Do NOT call finish() from here, since finish() does far too much
- * to be called from a signal handler.
- */
-void
-stopit(int sig __unused)
-{
-
-	/*
-	 * When doing reverse DNS lookups, the finish_up flag might not
-	 * be noticed for a while.  Just exit if we get a second SIGINT.
-	 */
-	if (!(options & F_NUMERIC) && finish_up)
-		_exit(nreceived ? 0 : 2);
-	finish_up = 1;
+	exit(nreceived ? 0 : 2);
 }
 
 /*
@@ -1297,14 +1261,14 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv)
 					for (i = 0; i < datalen; ++i, ++cp) {
 						if ((i % 16) == 8)
 							(void)printf("\n\t");
-						(void)printf("%2x ", *cp);
+						(void)printf(" %2x", *cp);
 					}
 					(void)printf("\ndp:");
 					cp = &outpack[ICMP_MINLEN];
 					for (i = 0; i < datalen; ++i, ++cp) {
 						if ((i % 16) == 8)
 							(void)printf("\n\t");
-						(void)printf("%2x ", *cp);
+						(void)printf(" %2x", *cp);
 					}
 					break;
 				}
@@ -1406,7 +1370,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv)
 					(void)putchar('\n');
 				}
 			} else
-				(void)printf("\t(truncated route)\n");
+				(void)printf("\t(truncated route)");
 			break;
 		case IPOPT_RR:
 			j = cp[IPOPT_OLEN];		/* get length */
@@ -1463,77 +1427,6 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv)
 	}
 }
 
-/*
- * status --
- *	Print out statistics when SIGINFO is received.
- */
-
-static void
-status(int sig __unused)
-{
-
-	siginfo_p = 1;
-}
-
-static void
-check_status(void)
-{
-
-	if (siginfo_p) {
-		siginfo_p = 0;
-		(void)fprintf(stderr, "\r%ld/%ld packets received (%.1f%%)",
-		    nreceived, ntransmitted,
-		    ntransmitted ? nreceived * 100.0 / ntransmitted : 0.0);
-		if (nreceived && timing)
-			(void)fprintf(stderr, " %.3f min / %.3f avg / %.3f max",
-			    tmin, tsum / (nreceived + nrepeats), tmax);
-		(void)fprintf(stderr, "\n");
-	}
-}
-
-/*
- * finish --
- *	Print out statistics, and give up.
- */
-static void
-finish(void)
-{
-
-	(void)signal(SIGINT, SIG_IGN);
-	(void)signal(SIGALRM, SIG_IGN);
-	(void)putchar('\n');
-	(void)fflush(stdout);
-	(void)printf("--- %s ping statistics ---\n", hostname);
-	(void)printf("%ld packets transmitted, ", ntransmitted);
-	(void)printf("%ld packets received, ", nreceived);
-	if (nrepeats)
-		(void)printf("+%ld duplicates, ", nrepeats);
-	if (ntransmitted) {
-		if (nreceived > ntransmitted)
-			(void)printf("-- somebody's printing up packets!");
-		else
-			(void)printf("%.1f%% packet loss",
-			    ((ntransmitted - nreceived) * 100.0) /
-			    ntransmitted);
-	}
-	if (nrcvtimeout)
-		(void)printf(", %ld packets out of wait time", nrcvtimeout);
-	(void)putchar('\n');
-	if (nreceived && timing) {
-		double n = nreceived + nrepeats;
-		double avg = tsum / n;
-		double vari = tsumsq / n - avg * avg;
-		(void)printf(
-		    "round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n",
-		    tmin, avg, tmax, sqrt(vari));
-	}
-
-	if (nreceived)
-		exit(0);
-	else
-		exit(2);
-}
-
 /*
  * pr_icmph --
  *	Print a descriptive string about an ICMP header.
@@ -1668,13 +1561,21 @@ pr_icmph(struct icmp *icp, struct ip *oip, const u_char *const oicmp_raw)
 static void
 pr_iph(struct ip *ip, const u_char *cp)
 {
-	struct in_addr ina;
+	struct in_addr dst_ina, src_ina;
 	int hlen;
 
 	hlen = ip->ip_hl << 2;
 	cp = cp + sizeof(struct ip);		/* point to options */
 
-	(void)printf("Vr HL TOS  Len   ID Flg  off TTL Pro  cks      Src      Dst\n");
+	memcpy(&src_ina, &ip->ip_src.s_addr, sizeof(src_ina));
+	memcpy(&dst_ina, &ip->ip_dst.s_addr, sizeof(dst_ina));
+
+	(void)printf("Vr HL TOS  Len   ID Flg  off TTL Pro  cks %*s %*s",
+	    (int)strlen(inet_ntoa(src_ina)), "Src",
+	    (int)strlen(inet_ntoa(dst_ina)), "Dst");
+	if (hlen > (int)sizeof(struct ip))
+		(void)printf(" Opts");
+	(void)putchar('\n');
 	(void)printf(" %1x  %1x  %02x %04x %04x",
 	    ip->ip_v, ip->ip_hl, ip->ip_tos, ntohs(ip->ip_len),
 	    ntohs(ip->ip_id));
@@ -1683,13 +1584,14 @@ pr_iph(struct ip *ip, const u_char *cp)
 	    ntohs(ip->ip_off) & 0x1fff);
 	(void)printf("  %02x  %02x %04x", ip->ip_ttl, ip->ip_p,
 							    ntohs(ip->ip_sum));
-	memcpy(&ina, &ip->ip_src.s_addr, sizeof ina);
-	(void)printf(" %s ", inet_ntoa(ina));
-	memcpy(&ina, &ip->ip_dst.s_addr, sizeof ina);
-	(void)printf(" %s ", inet_ntoa(ina));
+	(void)printf(" %s", inet_ntoa(src_ina));
+	(void)printf(" %s", inet_ntoa(dst_ina));
 	/* dump any option bytes */
-	while (hlen-- > (int)sizeof(struct ip)) {
-		(void)printf("%02x", *cp++);
+	if (hlen > (int)sizeof(struct ip)) {
+		(void)printf(" ");
+		while (hlen-- > (int)sizeof(struct ip)) {
+			(void)printf("%02x", *cp++);
+		}
 	}
 	(void)putchar('\n');
 }
@@ -1705,7 +1607,7 @@ pr_addr(struct in_addr ina)
 	struct hostent *hp;
 	static char buf[16 + 3 + MAXHOSTNAMELEN];
 
-	if (options & F_NUMERIC)
+	if (!(options & F_HOSTNAME))
 		return inet_ntoa(ina);
 
 	hp = cap_gethostbyaddr(capdns, (char *)&ina, sizeof(ina), AF_INET);
diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c
index bd1658f9500a..10deb57ad6bc 100644
--- a/sbin/ping/ping6.c
+++ b/sbin/ping/ping6.c
@@ -124,7 +124,6 @@ static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <math.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -188,7 +187,6 @@ struct tv32 {
 #define F_FQDN		0x1000
 #define F_INTERFACE	0x2000
 #define F_SRCADDR	0x4000
-#define F_HOSTNAME	0x10000
 #define F_FQDNOLD	0x20000
 #define F_NIGROUP	0x40000
 #define F_SUPTYPES	0x80000
@@ -200,7 +198,6 @@ struct tv32 {
 #define F_NOUSERDATA	(F_NODEADDR | F_FQDN | F_FQDNOLD | F_SUPTYPES)
 #define	F_WAITTIME	0x2000000
 #define	F_DOT		0x4000000
-static u_int options;
 
 #define IN6LEN		sizeof(struct in6_addr)
 #define SA6LEN		sizeof(struct sockaddr_in6)
@@ -229,7 +226,6 @@ static char BBELL = '\a';	/* characters written for AUDIBLE */
 static const char *DOT = ".";
 static size_t DOTlen = 1;
 static size_t DOTidx = 0;
-static char *hostname;
 static int ident;		/* process id to identify our packets */
 static u_int8_t nonce[8];	/* nonce field for node information */
 static int hoplimit = -1;	/* hoplimit */
@@ -241,20 +237,9 @@ static cap_channel_t *capdns;
 /* counters */
 static long nmissedmax;		/* max value of ntransmitted - nreceived - 1 */
 static long npackets;		/* max packets to transmit */
-static long nreceived;		/* # of packets we got back */
-static long nrepeats;		/* number of duplicates */
-static long ntransmitted;	/* sequence # for outbound packets = #sent */
 static long ntransmitfailures;	/* number of transmit failures */
 static int interval = 1000;	/* interval between packets in ms */
 static int waittime = MAXWAIT;	/* timeout for each packet */
-static long nrcvtimeout = 0;	/* # of packets we got back after waittime */
-
-/* timing */
-static int timing;		/* flag to do timing */
-static double tmin = 999999999.0;	/* minimum round trip time */
-static double tmax = 0.0;	/* maximum round trip time */
-static double tsum = 0.0;	/* sum of all times, for doing average */
-static double tsumsq = 0.0;	/* sum of all times squared, for std. dev. */
 
 /* for node addresses */
 static u_short naflags;
@@ -264,18 +249,11 @@ static struct msghdr smsghdr;
 static struct iovec smsgiov;
 static char *scmsg = 0;
 
-static volatile sig_atomic_t seenint;
-#ifdef SIGINFO
-static volatile sig_atomic_t seeninfo;
-#endif
-
 static cap_channel_t *capdns_setup(void);
 static void	 fill(char *, char *);
 static int	 get_hoplim(struct msghdr *);
 static int	 get_pathmtu(struct msghdr *);
 static struct in6_pktinfo *get_rcvpktinfo(struct msghdr *);
-static void	 onsignal(int);
-static void	 onint(int);
 static size_t	 pingerlen(void);
 static int	 pinger(void);
 static const char *pr_addr(struct sockaddr *, int);
@@ -293,7 +271,6 @@ static void	 pr_ip6opt(void *, size_t);
 static void	 pr_rthdr(void *, size_t);
 static int	 pr_bitrange(u_int32_t, int, int);
 static void	 pr_retip(struct ip6_hdr *, u_char *);
-static void	 summary(void);
 #ifdef IPSEC
 #ifdef IPSEC_POLICY_IPSEC
 static int	 setpolicy(int, char *);
@@ -677,14 +654,15 @@ ping6(int argc, char *argv[])
 
 	error = cap_getaddrinfo(capdns, target, NULL, &hints, &res);
 	if (error)
-		errx(1, "%s", gai_strerror(error));
+		errx(EX_NOHOST, "cannot resolve %s: %s",
+		    target, gai_strerror(error));
 	if (res->ai_canonname)
 		hostname = strdup(res->ai_canonname);
 	else
 		hostname = target;
 
 	if (!res->ai_addr)
-		errx(1, "cap_getaddrinfo failed");
+		errx(EX_NOHOST, "cannot resolve %s", target);
 
 	(void)memcpy(&dst, res->ai_addr, res->ai_addrlen);
 
@@ -1142,7 +1120,7 @@ ping6(int argc, char *argv[])
 	if (caph_rights_limit(ssend, &rights_ssend) < 0)
 		err(1, "caph_rights_limit ssend setsockopt");
 
-	printf("PING6(%lu=40+8+%lu bytes) ", (unsigned long)(40 + pingerlen()),
+	printf("PING(%lu=40+8+%lu bytes) ", (unsigned long)(40 + pingerlen()),
 	    (unsigned long)(pingerlen() - 8));
 	printf("%s --> ", pr_addr((struct sockaddr *)&src, sizeof(src)));
 	printf("%s\n", pr_addr((struct sockaddr *)&dst, sizeof(dst)));
@@ -1163,11 +1141,9 @@ ping6(int argc, char *argv[])
 	if (sigaction(SIGINT, &si_sa, 0) == -1)
 		err(EX_OSERR, "sigaction SIGINT");
 	seenint = 0;
-#ifdef SIGINFO
 	if (sigaction(SIGINFO, &si_sa, 0) == -1)
 		err(EX_OSERR, "sigaction SIGINFO");
 	seeninfo = 0;
-#endif
 	if (alarmtimeout > 0) {
 		if (sigaction(SIGALRM, &si_sa, 0) == -1)
 			err(EX_OSERR, "sigaction SIGALRM");
@@ -1186,15 +1162,11 @@ ping6(int argc, char *argv[])
 		int n;
 
 		/* signal handling */
-		if (seenint)
-			onint(SIGINT);
-#ifdef SIGINFO
 		if (seeninfo) {
-			summary();
+			pr_summary(stderr);
 			seeninfo = 0;
 			continue;
 		}
-#endif
 		FD_ZERO(&rfds);
 		FD_SET(srecv, &rfds);
 		clock_gettime(CLOCK_MONOTONIC, &now);
@@ -1258,12 +1230,12 @@ ping6(int argc, char *argv[])
 				if (almost_done)
 					break;
 				almost_done = 1;
-			/*
-			 * If we're not transmitting any more packets,
-			 * change the timer to wait two round-trip times
-			 * if we've received any packets or (waittime)
-			 * milliseconds if we haven't.
-			 */
+				/*
+				 * If we're not transmitting any more packets,
+				 * change the timer to wait two round-trip times
+				 * if we've received any packets or (waittime)
+				 * milliseconds if we haven't.
+				 */
 				intvl.tv_nsec = 0;
 				if (nreceived) {
 					intvl.tv_sec = 2 * tmax / 1000;
@@ -1272,7 +1244,7 @@ ping6(int argc, char *argv[])
 				} else {
 					intvl.tv_sec = waittime / 1000;
 					intvl.tv_nsec =
-						waittime % 1000 * 1000000;
+					    waittime % 1000 * 1000000;
 				}
 			}
 			clock_gettime(CLOCK_MONOTONIC, &last);
@@ -1288,7 +1260,7 @@ ping6(int argc, char *argv[])
 	si_sa.sa_handler = SIG_IGN;
 	sigaction(SIGINT, &si_sa, 0);
 	sigaction(SIGALRM, &si_sa, 0);
-	summary();
+	pr_summary(stdout);
 
         if(packet != NULL)
                 free(packet);
@@ -1301,23 +1273,6 @@ ping6(int argc, char *argv[])
 		exit(EX_OSERR);
 }
 
-static void
-onsignal(int sig)
-{
-
-	switch (sig) {
-	case SIGINT:
-	case SIGALRM:
-		seenint++;
-		break;
-#ifdef SIGINFO
-	case SIGINFO:
-		seeninfo++;
-		break;
-#endif
-	}
-}
-
 /*
  * pinger --
  *	Compose and transmit an ICMP ECHO REQUEST packet.  The IP packet
@@ -1469,7 +1424,7 @@ pinger(void)
 			ntransmitfailures++;
 			warn("sendmsg");
 		}
-		(void)printf("ping6: wrote %s %d chars, ret=%d\n",
+		(void)printf("ping: wrote %s %d chars, ret=%d\n",
 		    hostname, cc, i);
 	}
 	if (!(options & F_QUIET) && options & F_DOT)
@@ -2305,59 +2260,6 @@ get_pathmtu(struct msghdr *mhdr)
 	return(0);
 }
 
-/*
- * onint --
- *	SIGINT handler.
- */
-/* ARGSUSED */
-static void
-onint(int notused __unused)
-{
-	/*
-	 * When doing reverse DNS lookups, the seenint flag might not
-	 * be noticed for a while.  Just exit if we get a second SIGINT.
-	 */
-	if ((options & F_HOSTNAME) && seenint != 0)
-		_exit(nreceived ? 0 : 2);
-}
-
-/*
- * summary --
- *	Print out statistics.
- */
-static void
-summary(void)
-{
-
-	(void)printf("\n--- %s ping6 statistics ---\n", hostname);
-	(void)printf("%ld packets transmitted, ", ntransmitted);
-	(void)printf("%ld packets received, ", nreceived);
-	if (nrepeats)
-		(void)printf("+%ld duplicates, ", nrepeats);
-	if (ntransmitted) {
-		if (nreceived > ntransmitted)
-			(void)printf("-- somebody's duplicating packets!");
-		else
-			(void)printf("%.1f%% packet loss",
-			    ((((double)ntransmitted - nreceived) * 100.0) /
-			    ntransmitted));
-	}
-	if (nrcvtimeout)
-		printf(", %ld packets out of wait time", nrcvtimeout);
-	(void)putchar('\n');
-	if (nreceived && timing) {
-		/* Only display average to microseconds */
-		double num = nreceived + nrepeats;
-		double avg = tsum / num;
-		double dev = sqrt(tsumsq / num - avg * avg);
-		(void)printf(
-		    "round-trip min/avg/max/std-dev = %.3f/%.3f/%.3f/%.3f ms\n",
-		    tmin, avg, tmax, dev);
-		(void)fflush(stdout);
-	}
-	(void)fflush(stdout);
-}
-
 /*subject type*/
 static const char *niqcode[] = {
 	"IPv6 address",
@@ -2640,7 +2542,7 @@ pr_addr(struct sockaddr *addr, int addrlen)
 	static char buf[NI_MAXHOST];
 	int flag = 0;
 
-	if ((options & F_HOSTNAME) == 0)
+	if (!(options & F_HOSTNAME))
 		flag |= NI_NUMERICHOST;
 
 	if (cap_getnameinfo(capdns, addr, addrlen, buf, sizeof(buf), NULL, 0,
diff --git a/sbin/ping/tests/ping_6_c1_s8_t1.out b/sbin/ping/tests/ping_6_c1_s8_t1.out
index 81c56e6cf586..0d207e74bc3e 100644
--- a/sbin/ping/tests/ping_6_c1_s8_t1.out
+++ b/sbin/ping/tests/ping_6_c1_s8_t1.out
@@ -1,6 +1,6 @@
-PING6(56=40+8+8 bytes) ::1 --> ::1
+PING(56=40+8+8 bytes) ::1 --> ::1
 16 bytes from ::1, icmp_seq=0 hlim= time= ms
 
---- localhost ping6 statistics ---
+--- localhost ping statistics ---
 1 packets transmitted, 1 packets received, 0.0% packet loss
-round-trip min/avg/max/std-dev = /// ms
+round-trip min/avg/max/stddev = /// ms
diff --git a/sbin/ping/tests/ping_c1_s8_t1_S1.out b/sbin/ping/tests/ping_c1_s8_t1_S1.out
index 81c56e6cf586..0d207e74bc3e 100644
--- a/sbin/ping/tests/ping_c1_s8_t1_S1.out
+++ b/sbin/ping/tests/ping_c1_s8_t1_S1.out
@@ -1,6 +1,6 @@
-PING6(56=40+8+8 bytes) ::1 --> ::1
+PING(56=40+8+8 bytes) ::1 --> ::1
 16 bytes from ::1, icmp_seq=0 hlim= time= ms
 
---- localhost ping6 statistics ---
+--- localhost ping statistics ---
 1 packets transmitted, 1 packets received, 0.0% packet loss
-round-trip min/avg/max/std-dev = /// ms
+round-trip min/avg/max/stddev = /// ms
diff --git a/sbin/ping/tests/ping_test.sh b/sbin/ping/tests/ping_test.sh
index 4a2dda0ebcce..5a12ace104d7 100644
--- a/sbin/ping/tests/ping_test.sh
+++ b/sbin/ping/tests/ping_test.sh
@@ -106,6 +106,7 @@ ping6_c1_s8_t1_body()
 	check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out
 }
 
+atf_test_case ping_c1t6
 ping_c1t6_head()
 {
 	atf_set "descr" "-t6 is not interpreted as -t -6 by ping"
@@ -116,6 +117,7 @@ ping_c1t6_body()
 	atf_check -s exit:0 -o ignore -e empty ping -c1 -t6 127.0.0.1
 }
 
+atf_test_case ping_c1t4
 ping6_c1t4_head()
 {
 	atf_set "descr" "-t4 is not interpreted as -t -4 by ping6"
@@ -126,6 +128,7 @@ ping6_c1t4_body()
 	atf_check -s exit:0 -o ignore -e empty ping6 -c1 -t4 ::1
 }
 
+atf_test_case ping_46
 ping_46_head()
 {
 	atf_set "descr" "-4 and -6 cannot be used simultaneously"
@@ -135,21 +138,69 @@ ping_46_body()
 	require_ipv4
 	require_ipv6
 	atf_check -s exit:1 \
-	    -e match:"-4 and -6 cannot be used simultaneously" \
+	    -e match:"illegal option -- 6" \
 	    ping -4 -6 localhost
 }
 
-ping6_46_head()
+atf_test_case ping_64
+ping_64_head()
 {
 	atf_set "descr" "-4 and -6 cannot be used simultaneously"
 }
-ping6_46_body()
+ping_64_body()
 {
 	require_ipv4
 	require_ipv6
 	atf_check -s exit:1 \
-	    -e match:"-4 and -6 cannot be used simultaneously" \
-	    ping6 -4 -6 localhost
+	    -e match:"illegal option -- 4" \
+	    ping -6 -4 localhost
+}
+
+atf_test_case ping6_4
+ping6_4_head()
+{
+	atf_set "descr" "ping6 does not accept -4"
+}
+ping6_4_body()
+{
+	require_ipv4
+	require_ipv6
+	atf_check -s exit:1 \
+	    -e match:"illegal option -- 4" \
+	    ping6 -4 localhost
+}
+
+atf_test_case ping_nohost
+ping_nohost_head()
+{
+	atf_set "descr" "ping a nonexistent host"
+}
+ping_nohost_body()
+{
+	atf_check -s exit:68 -e match:"cannot resolve" \
+	    ping nonexistent.in-addr.arpa.
+}
+
+atf_test_case ping4_nohost
+ping4_nohost_head()
+{
+	atf_set "descr" "ping -4 a nonexistent host"
+}
+ping4_nohost_body()
+{
+	atf_check -s exit:68 -e match:"cannot resolve" \
+	    ping -4 nonexistent.in-addr.arpa.
+}
+
+atf_test_case ping6_nohost
+ping6_nohost_head()
+{
+	atf_set "descr" "ping -6 a nonexistent host"
+}
+ping6_nohost_body()
+{
+	atf_check -s exit:68 -e match:"cannot resolve" \
+	    ping -6 nonexistent.in-addr.arpa.
 }
 
 atf_test_case "inject_opts" "cleanup"
@@ -212,7 +263,11 @@ atf_init_test_cases()
 	atf_add_test_case ping_c1t6
 	atf_add_test_case ping6_c1t4
 	atf_add_test_case ping_46
-	atf_add_test_case ping6_46
+	atf_add_test_case ping_64
+	atf_add_test_case ping6_4
+	atf_add_test_case ping_nohost
+	atf_add_test_case ping4_nohost
+	atf_add_test_case ping6_nohost
 	atf_add_test_case inject_opts
 	atf_add_test_case inject_pip
 	atf_add_test_case inject_reply
diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py
index 26a69b62f8fb..900fbf45d52d 100644
--- a/sbin/ping/tests/test_ping.py
+++ b/sbin/ping/tests/test_ping.py
@@ -275,6 +275,8 @@ def redact(output):
         ("hlim=[0-9]*", "hlim="),
         ("ttl=[0-9]*", "ttl="),
         ("time=[0-9.-]*", "time="),
+        ("cp: .*", "cp: xx xx xx xx xx xx xx xx"),
+        ("dp: .*", "dp: xx xx xx xx xx xx xx xx"),
         ("\(-[0-9\.]+[0-9]+ ms\)", "(- ms)"),
         ("[0-9\.]+/[0-9.]+", "/"),
     ]
@@ -311,12 +313,12 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -6 -c1 -s8 -t1 localhost",
                 "returncode": 0,
                 "stdout": """\
-PING6(56=40+8+8 bytes) ::1 --> ::1
+PING(56=40+8+8 bytes) ::1 --> ::1
 16 bytes from ::1, icmp_seq=0 hlim= time= ms
 
---- localhost ping6 statistics ---
+--- localhost ping statistics ---
 1 packets transmitted, 1 packets received, 0.0% packet loss
-round-trip min/avg/max/std-dev = /// ms
+round-trip min/avg/max/stddev = /// ms
 """,
                 "stderr": "",
             },
@@ -357,12 +359,12 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -A -c1 2001:db8::1",
                 "returncode": 0,
                 "stdout": """\
-PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
 16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms
 
---- 2001:db8::1 ping6 statistics ---
+--- 2001:db8::1 ping statistics ---
 1 packets transmitted, 1 packets received, 0.0% packet loss
-round-trip min/avg/max/std-dev = /// ms
+round-trip min/avg/max/stddev = /// ms
 """,
                 "stderr": "",
             },
@@ -373,9 +375,9 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -A -c1 2001:db8::2",
                 "returncode": 2,
                 "stdout": """\
-PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
 
---- 2001:db8::2 ping6 statistics ---
+--- 2001:db8::2 ping statistics ---
 1 packets transmitted, 0 packets received, 100.0% packet loss
 """,
                 "stderr": "",
@@ -419,14 +421,14 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -A -c3 2001:db8::1",
                 "returncode": 0,
                 "stdout": """\
-PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
 16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms
 16 bytes from 2001:db8::1, icmp_seq=1 hlim= time= ms
 16 bytes from 2001:db8::1, icmp_seq=2 hlim= time= ms
 
---- 2001:db8::1 ping6 statistics ---
+--- 2001:db8::1 ping statistics ---
 3 packets transmitted, 3 packets received, 0.0% packet loss
-round-trip min/avg/max/std-dev = /// ms
+round-trip min/avg/max/stddev = /// ms
 """,
                 "stderr": "",
             },
@@ -437,9 +439,9 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -A -c3 2001:db8::2",
                 "returncode": 2,
                 "stdout": """\
-\x07\x07PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+\x07\x07PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
 
---- 2001:db8::2 ping6 statistics ---
+--- 2001:db8::2 ping statistics ---
 3 packets transmitted, 0 packets received, 100.0% packet loss
 """,
                 "stderr": "",
@@ -481,12 +483,12 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -c1 2001:db8::1",
                 "returncode": 0,
                 "stdout": """\
-PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
 16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms
 
---- 2001:db8::1 ping6 statistics ---
+--- 2001:db8::1 ping statistics ---
 1 packets transmitted, 1 packets received, 0.0% packet loss
-round-trip min/avg/max/std-dev = /// ms
+round-trip min/avg/max/stddev = /// ms
 """,
                 "stderr": "",
             },
@@ -497,9 +499,9 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -c1 2001:db8::2",
                 "returncode": 2,
                 "stdout": """\
-PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
 
---- 2001:db8::2 ping6 statistics ---
+--- 2001:db8::2 ping statistics ---
 1 packets transmitted, 0 packets received, 100.0% packet loss
 """,
                 "stderr": "",
@@ -527,12 +529,12 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -c1 -S::1 -s8 -t1 localhost",
                 "returncode": 0,
                 "stdout": """\
-PING6(56=40+8+8 bytes) ::1 --> ::1
+PING(56=40+8+8 bytes) ::1 --> ::1
 16 bytes from ::1, icmp_seq=0 hlim= time= ms
 
---- localhost ping6 statistics ---
+--- localhost ping statistics ---
 1 packets transmitted, 1 packets received, 0.0% packet loss
-round-trip min/avg/max/std-dev = /// ms
+round-trip min/avg/max/stddev = /// ms
 """,
                 "stderr": "",
             },
@@ -575,14 +577,14 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -c3 2001:db8::1",
                 "returncode": 0,
                 "stdout": """\
-PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
 16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms
 16 bytes from 2001:db8::1, icmp_seq=1 hlim= time= ms
 16 bytes from 2001:db8::1, icmp_seq=2 hlim= time= ms
 
---- 2001:db8::1 ping6 statistics ---
+--- 2001:db8::1 ping statistics ---
 3 packets transmitted, 3 packets received, 0.0% packet loss
-round-trip min/avg/max/std-dev = /// ms
+round-trip min/avg/max/stddev = /// ms
 """,
                 "stderr": "",
             },
@@ -593,9 +595,9 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -c3 2001:db8::2",
                 "returncode": 2,
                 "stdout": """\
-PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
 
---- 2001:db8::2 ping6 statistics ---
+--- 2001:db8::2 ping statistics ---
 3 packets transmitted, 0 packets received, 100.0% packet loss
 """,
                 "stderr": "",
@@ -636,11 +638,11 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -q -c1 2001:db8::1",
                 "returncode": 0,
                 "stdout": """\
-PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
 
---- 2001:db8::1 ping6 statistics ---
+--- 2001:db8::1 ping statistics ---
 1 packets transmitted, 1 packets received, 0.0% packet loss
-round-trip min/avg/max/std-dev = /// ms
+round-trip min/avg/max/stddev = /// ms
 """,
                 "stderr": "",
             },
@@ -651,9 +653,9 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -q -c1 2001:db8::2",
                 "returncode": 2,
                 "stdout": """\
-PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
 
---- 2001:db8::2 ping6 statistics ---
+--- 2001:db8::2 ping statistics ---
 1 packets transmitted, 0 packets received, 100.0% packet loss
 """,
                 "stderr": "",
@@ -694,11 +696,11 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -q -c3 2001:db8::1",
                 "returncode": 0,
                 "stdout": """\
-PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
 
---- 2001:db8::1 ping6 statistics ---
+--- 2001:db8::1 ping statistics ---
 3 packets transmitted, 3 packets received, 0.0% packet loss
-round-trip min/avg/max/std-dev = /// ms
+round-trip min/avg/max/stddev = /// ms
 """,
                 "stderr": "",
             },
@@ -709,9 +711,9 @@ class TestPing(SingleVnetTestTemplate):
                 "args": "ping -q -c3 2001:db8::2",
                 "returncode": 2,
                 "stdout": """\
-PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
 
---- 2001:db8::2 ping6 statistics ---
+--- 2001:db8::2 ping statistics ---
 3 packets transmitted, 0 packets received, 100.0% packet loss
 """,
                 "stderr": "",
@@ -721,6 +723,7 @@ class TestPing(SingleVnetTestTemplate):
     ]
 
     @pytest.mark.parametrize("expected", testdata)
+    @pytest.mark.require_user("root")
     def test_ping(self, expected):
         """Test ping"""
         ping = subprocess.run(
@@ -749,6 +752,7 @@ def test_ping(self, expected):
     ]
 
     @pytest.mark.parametrize("expected", ping46_testdata)
+    @pytest.mark.require_user("root")
     def test_ping_46(self, expected):
         """Test ping -4/ping -6"""
         for version in [4, 6]:
@@ -859,7 +863,6 @@ def test_ping_46(self, expected):
 64 bytes from: icmp_seq=0 ttl= time= ms
 LSRR: 	(truncated route)
 
-
 --- 192.0.2.2 ping statistics ---
 1 packets transmitted, 1 packets received, 0.0% packet loss
 round-trip min/avg/max/stddev = /// ms
@@ -916,7 +919,6 @@ def test_ping_46(self, expected):
 64 bytes from: icmp_seq=0 ttl= time= ms
 SSRR: 	(truncated route)
 
-
 --- 192.0.2.2 ping statistics ---
 1 packets transmitted, 1 packets received, 0.0% packet loss
 round-trip min/avg/max/stddev = /// ms
@@ -1030,6 +1032,118 @@ def test_ping_46(self, expected):
             },
             id="_0_0_opts_NOP",
         ),
+        pytest.param(
+            {
+                "src": "192.0.2.1",
+                "dst": "192.0.2.2",
+                "icmp_type": 3,
+                "icmp_code": 1,
+                "ihl": 0x4,
+            },
+            {
+                "returncode": 2,
+                "stdout": """\
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+                "stderr": "",  # "IHL too short" message not shown
+                "redacted": False,
+            },
+            id="_IHL_too_short",
+        ),
+        pytest.param(
+            {
+                "src": "192.0.2.1",
+                "dst": "192.0.2.2",
+                "icmp_type": 3,
+                "icmp_code": 1,
+                "special": "no-payload",
+            },
+            {
+                "returncode": 2,
+                "stdout": """\
+PATTERN: 0x01
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+                "stderr": """\
+ping: quoted data too short (28 bytes) from 192.0.2.2
+""",
+                "redacted": False,
+            },
+            id="_quoted_data_too_short",
+        ),
+        pytest.param(
+            {
+                "src": "192.0.2.1",
+                "dst": "192.0.2.2",
+                "icmp_type": 3,
+                "icmp_code": 1,
+                "oip_ihl": 0x4,
+            },
+            {
+                "returncode": 2,
+                "stdout": """\
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+                "stderr": "",  # "inner IHL too short" message not shown
+                "redacted": False,
+            },
+            id="_inner_IHL_too_short",
+        ),
+        pytest.param(
+            {
+                "src": "192.0.2.1",
+                "dst": "192.0.2.2",
+                "icmp_type": 3,
+                "icmp_code": 1,
+                "oip_ihl": 0xF,
+            },
+            {
+                "returncode": 2,
+                "stdout": """\
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+                "stderr": """\
+ping: inner packet too short (84 bytes) from 192.0.2.2
+""",
+                "redacted": False,
+            },
+            id="_inner_packet_too_short",
+        ),
+        pytest.param(
+            {
+                "src": "192.0.2.1",
+                "dst": "192.0.2.2",
+                "icmp_type": 3,
+                "icmp_code": 1,
+                "oip_ihl": 0xF,
+                "special": "no-payload",
+            },
+            {
+                "returncode": 2,
+                "stdout": """\
+PATTERN: 0x01
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+                "stderr": "",
+                "redacted": False,
+            },
+            id="_max_inner_packet_ihl_without_payload",
+        ),
         pytest.param(
             {
                 "src": "192.0.2.1",
@@ -1132,8 +1246,8 @@ def test_ping_46(self, expected):
                 "stdout": """\
 PING 192.0.2.2 (192.0.2.2): 56 data bytes
 132 bytes from 192.0.2.2: Destination Host Unreachable
-Vr HL TOS  Len   ID Flg  off TTL Pro  cks      Src      Dst
- 4  f  00 007c 0001   0 0000  40  01 d868 192.0.2.1  192.0.2.2 01010101010101010101010101010101010101010101010101010101010101010101010101010101
+Vr HL TOS  Len   ID Flg  off TTL Pro  cks       Src       Dst Opts
+ 4  f  00 007c 0001   0 0000  40  01 d868 192.0.2.1 192.0.2.2 01010101010101010101010101010101010101010101010101010101010101010101010101010101
 
 
 --- 192.0.2.2 ping statistics ---
@@ -1157,8 +1271,8 @@ def test_ping_46(self, expected):
                 "stdout": """\
 PING 192.0.2.2 (192.0.2.2): 56 data bytes
 92 bytes from 192.0.2.2: Destination Host Unreachable
-Vr HL TOS  Len   ID Flg  off TTL Pro  cks      Src      Dst
- 4  5  00 0054 0001   2 0000  40  01 b6a4 192.0.2.1  192.0.2.2 
+Vr HL TOS  Len   ID Flg  off TTL Pro  cks       Src       Dst
+ 4  5  00 0054 0001   2 0000  40  01 b6a4 192.0.2.1 192.0.2.2
 
 
 --- 192.0.2.2 ping statistics ---
@@ -1230,8 +1344,8 @@ def test_ping_46(self, expected):
                 "stdout": """\
 PING 192.0.2.2 (192.0.2.2): 56 data bytes
 92 bytes from 192.0.2.2: Destination Host Unreachable
-Vr HL TOS  Len   ID Flg  off TTL Pro  cks      Src      Dst
- 4  5  00 0054 0001   0 0000  40  01 f6a4 192.0.2.1  192.0.2.2 
+Vr HL TOS  Len   ID Flg  off TTL Pro  cks       Src       Dst
+ 4  5  00 0054 0001   0 0000  40  01 f6a4 192.0.2.1 192.0.2.2
 
 
 --- 192.0.2.2 ping statistics ---
@@ -1291,6 +1405,39 @@ def test_ping_46(self, expected):
             },
             id="_0_0_special_warp",
         ),
+        pytest.param(
+            {
+                "src": "192.0.2.1",
+                "dst": "192.0.2.2",
+                "icmp_type": 0,
+                "icmp_code": 0,
+                "special": "wrong",
+            },
+            {
+                "returncode": 0,
+                "stdout": """\
+PATTERN: 0x01
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+64 bytes from: icmp_seq=0 ttl= time= ms
+wrong data byte #55 should be 0x1 but was 0x0
+cp: xx xx xx xx xx xx xx xx
+	  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1
+	  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1
+	  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1  0
+dp: xx xx xx xx xx xx xx xx
+	  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1
+	  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1
+	  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/stddev = /// ms
+""",
+                "stderr": "",
+                "redacted": True,
+            },
+            id="_0_0_special_wrong",
+        ),
     ]
 
     @pytest.mark.parametrize("pinger_kargs, expected", pinger_testdata)
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index c5d9dbe1c055..8cf4178a7570 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1004,8 +1004,10 @@ show_info(char *name, const char *sep, int ctltype, char *fmt, int *qoid, int nl
 	bzero(buf, BUFSIZ);
 	j = sizeof(buf);
 	i = sysctl(qoid, nlen + 2, buf, &j, 0, 0);
-	if (i < 0)
+	if (i < 0) {
+		putchar('\n');
 		return (1);
+	}
 	fputs(buf, stdout);
 	return (error);
 }
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 9682b486f830..7b016d988a34 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -2,8 +2,8 @@
 .include <bsd.own.mk>
 
 # OpenSSL version used for manual page generation
-OPENSSL_VER=	3.0.10
-OPENSSL_DATE=	2023-08-01
+OPENSSL_VER=	3.0.11
+OPENSSL_DATE=	2023-09-19
 
 LCRYPTO_SRC=	${SRCTOP}/crypto/openssl
 LCRYPTO_DOC=	${LCRYPTO_SRC}/doc
diff --git a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 b/secure/lib/libcrypto/man/man3/ADMISSIONS.3
index 7b30052b59aa..d63c9fd5b66f 100644
--- a/secure/lib/libcrypto/man/man3/ADMISSIONS.3
+++ b/secure/lib/libcrypto/man/man3/ADMISSIONS.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ADMISSIONS 3"
-.TH ADMISSIONS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ADMISSIONS 3ossl"
+.TH ADMISSIONS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 b/secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3
index 14ca6570db8a..6c933f0ec9f7 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_EXTERN_FUNCS 3"
-.TH ASN1_EXTERN_FUNCS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_EXTERN_FUNCS 3ossl"
+.TH ASN1_EXTERN_FUNCS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3
index 38bc7cbb9387..23fe03660ec2 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_INTEGER_GET_INT64 3"
-.TH ASN1_INTEGER_GET_INT64 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_INTEGER_GET_INT64 3ossl"
+.TH ASN1_INTEGER_GET_INT64 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3
index 2906b7a05a82..310b7aeb57b4 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_INTEGER_NEW 3"
-.TH ASN1_INTEGER_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_INTEGER_NEW 3ossl"
+.TH ASN1_INTEGER_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3
index c5896248ae2b..217e2d84b131 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_ITEM_LOOKUP 3"
-.TH ASN1_ITEM_LOOKUP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_ITEM_LOOKUP 3ossl"
+.TH ASN1_ITEM_LOOKUP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3
index f413784f2a29..5d74589c8e15 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_OBJECT_NEW 3"
-.TH ASN1_OBJECT_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_OBJECT_NEW 3ossl"
+.TH ASN1_OBJECT_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3
index d2f98831c2e0..92c13d542d81 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_STRING_TABLE_ADD 3"
-.TH ASN1_STRING_TABLE_ADD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_STRING_TABLE_ADD 3ossl"
+.TH ASN1_STRING_TABLE_ADD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3
index 17dba5521e92..4076f8c3d904 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_STRING_LENGTH 3"
-.TH ASN1_STRING_LENGTH 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_STRING_LENGTH 3ossl"
+.TH ASN1_STRING_LENGTH 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3
index d4a3e1445748..d950d2ad5c3e 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_STRING_NEW 3"
-.TH ASN1_STRING_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_STRING_NEW 3ossl"
+.TH ASN1_STRING_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3
index ae5189e8d4f1..e643351d875c 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_STRING_PRINT_EX 3"
-.TH ASN1_STRING_PRINT_EX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_STRING_PRINT_EX 3ossl"
+.TH ASN1_STRING_PRINT_EX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3
index 4644ba7bec95..406a02003712 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_TIME_SET 3"
-.TH ASN1_TIME_SET 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_TIME_SET 3ossl"
+.TH ASN1_TIME_SET 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3
index 6916431ed7b2..fccf591a8181 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_TYPE_GET 3"
-.TH ASN1_TYPE_GET 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_TYPE_GET 3ossl"
+.TH ASN1_TYPE_GET 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 b/secure/lib/libcrypto/man/man3/ASN1_aux_cb.3
index cfdcbf32a8cf..ad81a08d06ba 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_aux_cb.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_aux_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_AUX_CB 3"
-.TH ASN1_AUX_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_AUX_CB 3ossl"
+.TH ASN1_AUX_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3
index 380ae0fe2666..abb03bd95638 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_GENERATE_NCONF 3"
-.TH ASN1_GENERATE_NCONF 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_GENERATE_NCONF 3ossl"
+.TH ASN1_GENERATE_NCONF 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3 b/secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3
index 916e9864ff0c..8294f2da779d 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_ITEM_D2I_BIO 3"
-.TH ASN1_ITEM_D2I_BIO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_ITEM_D2I_BIO 3ossl"
+.TH ASN1_ITEM_D2I_BIO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_item_new.3 b/secure/lib/libcrypto/man/man3/ASN1_item_new.3
index 69bec5795044..1334efe7e67f 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_item_new.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_item_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_ITEM_NEW 3"
-.TH ASN1_ITEM_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_ITEM_NEW 3ossl"
+.TH ASN1_ITEM_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASN1_item_sign.3 b/secure/lib/libcrypto/man/man3/ASN1_item_sign.3
index f4efb7fa065b..e77515744361 100644
--- a/secure/lib/libcrypto/man/man3/ASN1_item_sign.3
+++ b/secure/lib/libcrypto/man/man3/ASN1_item_sign.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASN1_ITEM_SIGN 3"
-.TH ASN1_ITEM_SIGN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASN1_ITEM_SIGN 3ossl"
+.TH ASN1_ITEM_SIGN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3
index dbdbbd7474cf..0171dde53971 100644
--- a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3
+++ b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASYNC_WAIT_CTX_NEW 3"
-.TH ASYNC_WAIT_CTX_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASYNC_WAIT_CTX_NEW 3ossl"
+.TH ASYNC_WAIT_CTX_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3
index 7871c37ca1aa..6a8e8dd87c8d 100644
--- a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3
+++ b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ASYNC_START_JOB 3"
-.TH ASYNC_START_JOB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ASYNC_START_JOB 3ossl"
+.TH ASYNC_START_JOB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BF_encrypt.3 b/secure/lib/libcrypto/man/man3/BF_encrypt.3
index d7289a5cfbc0..135bddf3aefb 100644
--- a/secure/lib/libcrypto/man/man3/BF_encrypt.3
+++ b/secure/lib/libcrypto/man/man3/BF_encrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BF_ENCRYPT 3"
-.TH BF_ENCRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BF_ENCRYPT 3ossl"
+.TH BF_ENCRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 b/secure/lib/libcrypto/man/man3/BIO_ADDR.3
index 7c4ad126093c..3d9f969524fd 100644
--- a/secure/lib/libcrypto/man/man3/BIO_ADDR.3
+++ b/secure/lib/libcrypto/man/man3/BIO_ADDR.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_ADDR 3"
-.TH BIO_ADDR 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_ADDR 3ossl"
+.TH BIO_ADDR 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3
index e874655e7630..9220e05e5dd7 100644
--- a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3
+++ b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_ADDRINFO 3"
-.TH BIO_ADDRINFO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_ADDRINFO 3ossl"
+.TH BIO_ADDRINFO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_connect.3 b/secure/lib/libcrypto/man/man3/BIO_connect.3
index a9f980fa46dd..7b0f520be620 100644
--- a/secure/lib/libcrypto/man/man3/BIO_connect.3
+++ b/secure/lib/libcrypto/man/man3/BIO_connect.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_CONNECT 3"
-.TH BIO_CONNECT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_CONNECT 3ossl"
+.TH BIO_CONNECT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 b/secure/lib/libcrypto/man/man3/BIO_ctrl.3
index c565d78a5e23..bec7dc1bd084 100644
--- a/secure/lib/libcrypto/man/man3/BIO_ctrl.3
+++ b/secure/lib/libcrypto/man/man3/BIO_ctrl.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_CTRL 3"
-.TH BIO_CTRL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_CTRL 3ossl"
+.TH BIO_CTRL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 b/secure/lib/libcrypto/man/man3/BIO_f_base64.3
index 315a76eb8474..e973c2330c8e 100644
--- a/secure/lib/libcrypto/man/man3/BIO_f_base64.3
+++ b/secure/lib/libcrypto/man/man3/BIO_f_base64.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_F_BASE64 3"
-.TH BIO_F_BASE64 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_F_BASE64 3ossl"
+.TH BIO_F_BASE64 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3
index 328129dae2a2..20e1fc9dac63 100644
--- a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3
+++ b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_F_BUFFER 3"
-.TH BIO_F_BUFFER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_F_BUFFER 3ossl"
+.TH BIO_F_BUFFER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3
index 4084f522802f..66f6091d82d6 100644
--- a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3
+++ b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_F_CIPHER 3"
-.TH BIO_F_CIPHER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_F_CIPHER 3ossl"
+.TH BIO_F_CIPHER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_f_md.3 b/secure/lib/libcrypto/man/man3/BIO_f_md.3
index efce82c82ef1..eeb9061c6927 100644
--- a/secure/lib/libcrypto/man/man3/BIO_f_md.3
+++ b/secure/lib/libcrypto/man/man3/BIO_f_md.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_F_MD 3"
-.TH BIO_F_MD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_F_MD 3ossl"
+.TH BIO_F_MD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_f_null.3 b/secure/lib/libcrypto/man/man3/BIO_f_null.3
index 8d12b627d210..63c50f881aee 100644
--- a/secure/lib/libcrypto/man/man3/BIO_f_null.3
+++ b/secure/lib/libcrypto/man/man3/BIO_f_null.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_F_NULL 3"
-.TH BIO_F_NULL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_F_NULL 3ossl"
+.TH BIO_F_NULL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_f_prefix.3 b/secure/lib/libcrypto/man/man3/BIO_f_prefix.3
index 873826c65aca..a0c8cd6b5a60 100644
--- a/secure/lib/libcrypto/man/man3/BIO_f_prefix.3
+++ b/secure/lib/libcrypto/man/man3/BIO_f_prefix.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_F_PREFIX 3"
-.TH BIO_F_PREFIX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_F_PREFIX 3ossl"
+.TH BIO_F_PREFIX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3 b/secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3
index 528b22a5029a..2c6e82e64dff 100644
--- a/secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3
+++ b/secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_F_READBUFFER 3"
-.TH BIO_F_READBUFFER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_F_READBUFFER 3ossl"
+.TH BIO_F_READBUFFER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 b/secure/lib/libcrypto/man/man3/BIO_f_ssl.3
index d7f8236ff347..da8823ef3495 100644
--- a/secure/lib/libcrypto/man/man3/BIO_f_ssl.3
+++ b/secure/lib/libcrypto/man/man3/BIO_f_ssl.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_F_SSL 3"
-.TH BIO_F_SSL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_F_SSL 3ossl"
+.TH BIO_F_SSL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_find_type.3 b/secure/lib/libcrypto/man/man3/BIO_find_type.3
index b80aa1eb48f2..ddf98c969fb4 100644
--- a/secure/lib/libcrypto/man/man3/BIO_find_type.3
+++ b/secure/lib/libcrypto/man/man3/BIO_find_type.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_FIND_TYPE 3"
-.TH BIO_FIND_TYPE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_FIND_TYPE 3ossl"
+.TH BIO_FIND_TYPE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_get_data.3 b/secure/lib/libcrypto/man/man3/BIO_get_data.3
index 4a69e397697e..5a26b132b290 100644
--- a/secure/lib/libcrypto/man/man3/BIO_get_data.3
+++ b/secure/lib/libcrypto/man/man3/BIO_get_data.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_GET_DATA 3"
-.TH BIO_GET_DATA 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_GET_DATA 3ossl"
+.TH BIO_GET_DATA 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 b/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3
index 1c206c9bc7a0..cb321d186ecd 100644
--- a/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3
+++ b/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_GET_EX_NEW_INDEX 3"
-.TH BIO_GET_EX_NEW_INDEX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_GET_EX_NEW_INDEX 3ossl"
+.TH BIO_GET_EX_NEW_INDEX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_meth_new.3 b/secure/lib/libcrypto/man/man3/BIO_meth_new.3
index acfa4e22cec3..38098b930e40 100644
--- a/secure/lib/libcrypto/man/man3/BIO_meth_new.3
+++ b/secure/lib/libcrypto/man/man3/BIO_meth_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_METH_NEW 3"
-.TH BIO_METH_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_METH_NEW 3ossl"
+.TH BIO_METH_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_new.3 b/secure/lib/libcrypto/man/man3/BIO_new.3
index 34e682f43b74..05c650e4b8ed 100644
--- a/secure/lib/libcrypto/man/man3/BIO_new.3
+++ b/secure/lib/libcrypto/man/man3/BIO_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_NEW 3"
-.TH BIO_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_NEW 3ossl"
+.TH BIO_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 b/secure/lib/libcrypto/man/man3/BIO_new_CMS.3
index 94956606d7a1..6ecc33ea1854 100644
--- a/secure/lib/libcrypto/man/man3/BIO_new_CMS.3
+++ b/secure/lib/libcrypto/man/man3/BIO_new_CMS.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_NEW_CMS 3"
-.TH BIO_NEW_CMS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_NEW_CMS 3ossl"
+.TH BIO_NEW_CMS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 b/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3
index 454c7782dc4b..d6cf4b26c93c 100644
--- a/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3
+++ b/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_PARSE_HOSTSERV 3"
-.TH BIO_PARSE_HOSTSERV 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_PARSE_HOSTSERV 3ossl"
+.TH BIO_PARSE_HOSTSERV 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_printf.3 b/secure/lib/libcrypto/man/man3/BIO_printf.3
index 35b95fd2e4f8..788338c9631d 100644
--- a/secure/lib/libcrypto/man/man3/BIO_printf.3
+++ b/secure/lib/libcrypto/man/man3/BIO_printf.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_PRINTF 3"
-.TH BIO_PRINTF 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_PRINTF 3ossl"
+.TH BIO_PRINTF 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_push.3 b/secure/lib/libcrypto/man/man3/BIO_push.3
index c9820f1ad0b2..0413308d73aa 100644
--- a/secure/lib/libcrypto/man/man3/BIO_push.3
+++ b/secure/lib/libcrypto/man/man3/BIO_push.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_PUSH 3"
-.TH BIO_PUSH 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_PUSH 3ossl"
+.TH BIO_PUSH 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_read.3 b/secure/lib/libcrypto/man/man3/BIO_read.3
index f7b9a253960b..144699b80757 100644
--- a/secure/lib/libcrypto/man/man3/BIO_read.3
+++ b/secure/lib/libcrypto/man/man3/BIO_read.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_READ 3"
-.TH BIO_READ 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_READ 3ossl"
+.TH BIO_READ 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_s_accept.3 b/secure/lib/libcrypto/man/man3/BIO_s_accept.3
index 4f5c3ea7df02..54a56927dc3c 100644
--- a/secure/lib/libcrypto/man/man3/BIO_s_accept.3
+++ b/secure/lib/libcrypto/man/man3/BIO_s_accept.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_S_ACCEPT 3"
-.TH BIO_S_ACCEPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_S_ACCEPT 3ossl"
+.TH BIO_S_ACCEPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_s_bio.3 b/secure/lib/libcrypto/man/man3/BIO_s_bio.3
index 20faca65479e..a7cf67be617f 100644
--- a/secure/lib/libcrypto/man/man3/BIO_s_bio.3
+++ b/secure/lib/libcrypto/man/man3/BIO_s_bio.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_S_BIO 3"
-.TH BIO_S_BIO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_S_BIO 3ossl"
+.TH BIO_S_BIO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_s_connect.3 b/secure/lib/libcrypto/man/man3/BIO_s_connect.3
index f41e98eda56c..ed71f09d68d4 100644
--- a/secure/lib/libcrypto/man/man3/BIO_s_connect.3
+++ b/secure/lib/libcrypto/man/man3/BIO_s_connect.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_S_CONNECT 3"
-.TH BIO_S_CONNECT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_S_CONNECT 3ossl"
+.TH BIO_S_CONNECT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_s_core.3 b/secure/lib/libcrypto/man/man3/BIO_s_core.3
index a47cd8d86961..6963ed1204b6 100644
--- a/secure/lib/libcrypto/man/man3/BIO_s_core.3
+++ b/secure/lib/libcrypto/man/man3/BIO_s_core.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_S_CORE 3"
-.TH BIO_S_CORE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_S_CORE 3ossl"
+.TH BIO_S_CORE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_s_datagram.3 b/secure/lib/libcrypto/man/man3/BIO_s_datagram.3
index 0e0950853d83..627a2882943d 100644
--- a/secure/lib/libcrypto/man/man3/BIO_s_datagram.3
+++ b/secure/lib/libcrypto/man/man3/BIO_s_datagram.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_S_DATAGRAM 3"
-.TH BIO_S_DATAGRAM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_S_DATAGRAM 3ossl"
+.TH BIO_S_DATAGRAM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_s_fd.3 b/secure/lib/libcrypto/man/man3/BIO_s_fd.3
index c0897039f915..53a5f24921b3 100644
--- a/secure/lib/libcrypto/man/man3/BIO_s_fd.3
+++ b/secure/lib/libcrypto/man/man3/BIO_s_fd.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_S_FD 3"
-.TH BIO_S_FD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_S_FD 3ossl"
+.TH BIO_S_FD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_s_file.3 b/secure/lib/libcrypto/man/man3/BIO_s_file.3
index 179dc0d17dd1..d2525de59360 100644
--- a/secure/lib/libcrypto/man/man3/BIO_s_file.3
+++ b/secure/lib/libcrypto/man/man3/BIO_s_file.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_S_FILE 3"
-.TH BIO_S_FILE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_S_FILE 3ossl"
+.TH BIO_S_FILE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_s_mem.3 b/secure/lib/libcrypto/man/man3/BIO_s_mem.3
index 0d7970f84618..6a1c5580c61c 100644
--- a/secure/lib/libcrypto/man/man3/BIO_s_mem.3
+++ b/secure/lib/libcrypto/man/man3/BIO_s_mem.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_S_MEM 3"
-.TH BIO_S_MEM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_S_MEM 3ossl"
+.TH BIO_S_MEM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -196,6 +196,8 @@ positive return value \fBv\fR should be set to a negative value, typically \-1.
 .PP
 \&\fBBIO_get_mem_data()\fR sets *\fBpp\fR to a pointer to the start of the memory BIOs data
 and returns the total amount of data available. It is implemented as a macro.
+Note the pointer returned by this call is informative, no transfer of ownership
+of this memory is implied.  See notes on \fBBIO_set_close()\fR.
 .PP
 \&\fBBIO_set_mem_buf()\fR sets the internal \s-1BUF_MEM\s0 structure to \fBbm\fR and sets the
 close flag to \fBc\fR, that is \fBc\fR should be either \s-1BIO_CLOSE\s0 or \s-1BIO_NOCLOSE.\s0
@@ -249,6 +251,10 @@ preceding that write operation cannot be undone.
 .PP
 Calling \fBBIO_get_mem_ptr()\fR prior to a \fBBIO_reset()\fR call with
 \&\s-1BIO_FLAGS_NONCLEAR_RST\s0 set has the same effect as a write operation.
+.PP
+Calling \fBBIO_set_close()\fR with \s-1BIO_NOCLOSE\s0 orphans the \s-1BUF_MEM\s0 internal to the
+\&\s-1BIO,\s0 _not_ its actual data buffer. See the examples section for the proper
+method for claiming ownership of the data pointer for a deferred free operation.
 .SH "BUGS"
 .IX Header "BUGS"
 There should be an option to set the maximum size of a memory \s-1BIO.\s0
@@ -289,9 +295,26 @@ Extract the \s-1BUF_MEM\s0 structure from a memory \s-1BIO\s0 and then free up t
 \& BIO_set_close(mem, BIO_NOCLOSE); /* So BIO_free() leaves BUF_MEM alone */
 \& BIO_free(mem);
 .Ve
+.PP
+Extract the \s-1BUF_MEM\s0 ptr, claim ownership of the internal data and free the \s-1BIO\s0
+and \s-1BUF_MEM\s0 structure:
+.PP
+.Vb 2
+\& BUF_MEM *bptr;
+\& char *data;
+\&
+\& BIO_get_mem_data(bio, &data);
+\& BIO_get_mem_ptr(bio, &bptr);
+\& BIO_set_close(mem, BIO_NOCLOSE); /* So BIO_free orphans BUF_MEM */
+\& BIO_free(bio);
+\& bptr\->data = NULL; /* Tell BUF_MEM to orphan data */
+\& BUF_MEM_free(bptr);
+\& ...
+\& free(data);
+.Ve
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2000\-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/lib/libcrypto/man/man3/BIO_s_null.3 b/secure/lib/libcrypto/man/man3/BIO_s_null.3
index db9fdf6126dd..5ad8ebc26ce7 100644
--- a/secure/lib/libcrypto/man/man3/BIO_s_null.3
+++ b/secure/lib/libcrypto/man/man3/BIO_s_null.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_S_NULL 3"
-.TH BIO_S_NULL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_S_NULL 3ossl"
+.TH BIO_S_NULL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_s_socket.3 b/secure/lib/libcrypto/man/man3/BIO_s_socket.3
index 62af9af2d73f..d00a2315aabc 100644
--- a/secure/lib/libcrypto/man/man3/BIO_s_socket.3
+++ b/secure/lib/libcrypto/man/man3/BIO_s_socket.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_S_SOCKET 3"
-.TH BIO_S_SOCKET 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_S_SOCKET 3ossl"
+.TH BIO_S_SOCKET 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_set_callback.3 b/secure/lib/libcrypto/man/man3/BIO_set_callback.3
index b8d9479ad6e0..4d7ce05dc2d4 100644
--- a/secure/lib/libcrypto/man/man3/BIO_set_callback.3
+++ b/secure/lib/libcrypto/man/man3/BIO_set_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_SET_CALLBACK 3"
-.TH BIO_SET_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_SET_CALLBACK 3ossl"
+.TH BIO_SET_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_should_retry.3 b/secure/lib/libcrypto/man/man3/BIO_should_retry.3
index 89e0bff55093..70001503cb21 100644
--- a/secure/lib/libcrypto/man/man3/BIO_should_retry.3
+++ b/secure/lib/libcrypto/man/man3/BIO_should_retry.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_SHOULD_RETRY 3"
-.TH BIO_SHOULD_RETRY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_SHOULD_RETRY 3ossl"
+.TH BIO_SHOULD_RETRY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BIO_socket_wait.3 b/secure/lib/libcrypto/man/man3/BIO_socket_wait.3
index 4953e5985998..7b21c13643a3 100644
--- a/secure/lib/libcrypto/man/man3/BIO_socket_wait.3
+++ b/secure/lib/libcrypto/man/man3/BIO_socket_wait.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO_SOCKET_WAIT 3"
-.TH BIO_SOCKET_WAIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO_SOCKET_WAIT 3ossl"
+.TH BIO_SOCKET_WAIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 b/secure/lib/libcrypto/man/man3/BN_BLINDING_new.3
index cf1f7971354b..df2369bb9e6a 100644
--- a/secure/lib/libcrypto/man/man3/BN_BLINDING_new.3
+++ b/secure/lib/libcrypto/man/man3/BN_BLINDING_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_BLINDING_NEW 3"
-.TH BN_BLINDING_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_BLINDING_NEW 3ossl"
+.TH BN_BLINDING_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_CTX_new.3 b/secure/lib/libcrypto/man/man3/BN_CTX_new.3
index 61839698f109..b3a242fb0eae 100644
--- a/secure/lib/libcrypto/man/man3/BN_CTX_new.3
+++ b/secure/lib/libcrypto/man/man3/BN_CTX_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_CTX_NEW 3"
-.TH BN_CTX_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_CTX_NEW 3ossl"
+.TH BN_CTX_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_CTX_start.3 b/secure/lib/libcrypto/man/man3/BN_CTX_start.3
index b75be43317e1..df547b578ec4 100644
--- a/secure/lib/libcrypto/man/man3/BN_CTX_start.3
+++ b/secure/lib/libcrypto/man/man3/BN_CTX_start.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_CTX_START 3"
-.TH BN_CTX_START 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_CTX_START 3ossl"
+.TH BN_CTX_START 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_add.3 b/secure/lib/libcrypto/man/man3/BN_add.3
index 58ae37aaaf96..945aaa7038c7 100644
--- a/secure/lib/libcrypto/man/man3/BN_add.3
+++ b/secure/lib/libcrypto/man/man3/BN_add.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_ADD 3"
-.TH BN_ADD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_ADD 3ossl"
+.TH BN_ADD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_add_word.3 b/secure/lib/libcrypto/man/man3/BN_add_word.3
index 59f341eb83d4..de81f22bd398 100644
--- a/secure/lib/libcrypto/man/man3/BN_add_word.3
+++ b/secure/lib/libcrypto/man/man3/BN_add_word.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_ADD_WORD 3"
-.TH BN_ADD_WORD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_ADD_WORD 3ossl"
+.TH BN_ADD_WORD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_bn2bin.3 b/secure/lib/libcrypto/man/man3/BN_bn2bin.3
index bccaffd1183d..f5a38b965392 100644
--- a/secure/lib/libcrypto/man/man3/BN_bn2bin.3
+++ b/secure/lib/libcrypto/man/man3/BN_bn2bin.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_BN2BIN 3"
-.TH BN_BN2BIN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_BN2BIN 3ossl"
+.TH BN_BN2BIN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_cmp.3 b/secure/lib/libcrypto/man/man3/BN_cmp.3
index 1d76c58ef487..fa902264920d 100644
--- a/secure/lib/libcrypto/man/man3/BN_cmp.3
+++ b/secure/lib/libcrypto/man/man3/BN_cmp.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_CMP 3"
-.TH BN_CMP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_CMP 3ossl"
+.TH BN_CMP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_copy.3 b/secure/lib/libcrypto/man/man3/BN_copy.3
index c2fecdf47684..0714dba21c74 100644
--- a/secure/lib/libcrypto/man/man3/BN_copy.3
+++ b/secure/lib/libcrypto/man/man3/BN_copy.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_COPY 3"
-.TH BN_COPY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_COPY 3ossl"
+.TH BN_COPY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_generate_prime.3 b/secure/lib/libcrypto/man/man3/BN_generate_prime.3
index 5e52fdfbb4dd..cf652270d399 100644
--- a/secure/lib/libcrypto/man/man3/BN_generate_prime.3
+++ b/secure/lib/libcrypto/man/man3/BN_generate_prime.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_GENERATE_PRIME 3"
-.TH BN_GENERATE_PRIME 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_GENERATE_PRIME 3ossl"
+.TH BN_GENERATE_PRIME 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3 b/secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3
index 2a4f17f2c7c6..46e9545a95dd 100644
--- a/secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3
+++ b/secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_MOD_EXP_MONT 3"
-.TH BN_MOD_EXP_MONT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_MOD_EXP_MONT 3ossl"
+.TH BN_MOD_EXP_MONT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_mod_inverse.3 b/secure/lib/libcrypto/man/man3/BN_mod_inverse.3
index e8aac9ab9e0b..de8a8046f82c 100644
--- a/secure/lib/libcrypto/man/man3/BN_mod_inverse.3
+++ b/secure/lib/libcrypto/man/man3/BN_mod_inverse.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_MOD_INVERSE 3"
-.TH BN_MOD_INVERSE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_MOD_INVERSE 3ossl"
+.TH BN_MOD_INVERSE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 b/secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3
index 94ca6cddf1e2..01f3b997c9a9 100644
--- a/secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3
+++ b/secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_MOD_MUL_MONTGOMERY 3"
-.TH BN_MOD_MUL_MONTGOMERY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_MOD_MUL_MONTGOMERY 3ossl"
+.TH BN_MOD_MUL_MONTGOMERY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 b/secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3
index 2c9794cef4f7..f4f6ebb886ed 100644
--- a/secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3
+++ b/secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_MOD_MUL_RECIPROCAL 3"
-.TH BN_MOD_MUL_RECIPROCAL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_MOD_MUL_RECIPROCAL 3ossl"
+.TH BN_MOD_MUL_RECIPROCAL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_new.3 b/secure/lib/libcrypto/man/man3/BN_new.3
index 91cfe17a48e2..a868af5563ee 100644
--- a/secure/lib/libcrypto/man/man3/BN_new.3
+++ b/secure/lib/libcrypto/man/man3/BN_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_NEW 3"
-.TH BN_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_NEW 3ossl"
+.TH BN_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_num_bytes.3 b/secure/lib/libcrypto/man/man3/BN_num_bytes.3
index 2b7c4bdc9330..975b4f6939b8 100644
--- a/secure/lib/libcrypto/man/man3/BN_num_bytes.3
+++ b/secure/lib/libcrypto/man/man3/BN_num_bytes.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_NUM_BYTES 3"
-.TH BN_NUM_BYTES 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_NUM_BYTES 3ossl"
+.TH BN_NUM_BYTES 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_rand.3 b/secure/lib/libcrypto/man/man3/BN_rand.3
index 756c6e39fdb6..359331cc2ce1 100644
--- a/secure/lib/libcrypto/man/man3/BN_rand.3
+++ b/secure/lib/libcrypto/man/man3/BN_rand.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_RAND 3"
-.TH BN_RAND 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_RAND 3ossl"
+.TH BN_RAND 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_security_bits.3 b/secure/lib/libcrypto/man/man3/BN_security_bits.3
index ea5a31873681..a301fb4bb03b 100644
--- a/secure/lib/libcrypto/man/man3/BN_security_bits.3
+++ b/secure/lib/libcrypto/man/man3/BN_security_bits.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_SECURITY_BITS 3"
-.TH BN_SECURITY_BITS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_SECURITY_BITS 3ossl"
+.TH BN_SECURITY_BITS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_set_bit.3 b/secure/lib/libcrypto/man/man3/BN_set_bit.3
index 805c7198070e..64f9d403b84b 100644
--- a/secure/lib/libcrypto/man/man3/BN_set_bit.3
+++ b/secure/lib/libcrypto/man/man3/BN_set_bit.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_SET_BIT 3"
-.TH BN_SET_BIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_SET_BIT 3ossl"
+.TH BN_SET_BIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_swap.3 b/secure/lib/libcrypto/man/man3/BN_swap.3
index 12a78b3ab9c3..1b69c54c9671 100644
--- a/secure/lib/libcrypto/man/man3/BN_swap.3
+++ b/secure/lib/libcrypto/man/man3/BN_swap.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_SWAP 3"
-.TH BN_SWAP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_SWAP 3ossl"
+.TH BN_SWAP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BN_zero.3 b/secure/lib/libcrypto/man/man3/BN_zero.3
index c6059555fb29..85e62fcd7349 100644
--- a/secure/lib/libcrypto/man/man3/BN_zero.3
+++ b/secure/lib/libcrypto/man/man3/BN_zero.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BN_ZERO 3"
-.TH BN_ZERO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BN_ZERO 3ossl"
+.TH BN_ZERO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/BUF_MEM_new.3 b/secure/lib/libcrypto/man/man3/BUF_MEM_new.3
index 25b00bc20e5c..b28896fe6c0d 100644
--- a/secure/lib/libcrypto/man/man3/BUF_MEM_new.3
+++ b/secure/lib/libcrypto/man/man3/BUF_MEM_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BUF_MEM_NEW 3"
-.TH BUF_MEM_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BUF_MEM_NEW 3ossl"
+.TH BUF_MEM_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_EncryptedData_decrypt.3 b/secure/lib/libcrypto/man/man3/CMS_EncryptedData_decrypt.3
index f1eb608a15e2..10dad54b7c7b 100644
--- a/secure/lib/libcrypto/man/man3/CMS_EncryptedData_decrypt.3
+++ b/secure/lib/libcrypto/man/man3/CMS_EncryptedData_decrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_ENCRYPTEDDATA_DECRYPT 3"
-.TH CMS_ENCRYPTEDDATA_DECRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_ENCRYPTEDDATA_DECRYPT 3ossl"
+.TH CMS_ENCRYPTEDDATA_DECRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_EncryptedData_encrypt.3 b/secure/lib/libcrypto/man/man3/CMS_EncryptedData_encrypt.3
index ddabf2ed90e4..11c9acada3d5 100644
--- a/secure/lib/libcrypto/man/man3/CMS_EncryptedData_encrypt.3
+++ b/secure/lib/libcrypto/man/man3/CMS_EncryptedData_encrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_ENCRYPTEDDATA_ENCRYPT 3"
-.TH CMS_ENCRYPTEDDATA_ENCRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_ENCRYPTEDDATA_ENCRYPT 3ossl"
+.TH CMS_ENCRYPTEDDATA_ENCRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_EnvelopedData_create.3 b/secure/lib/libcrypto/man/man3/CMS_EnvelopedData_create.3
index bfe41a424a86..be6ab0138954 100644
--- a/secure/lib/libcrypto/man/man3/CMS_EnvelopedData_create.3
+++ b/secure/lib/libcrypto/man/man3/CMS_EnvelopedData_create.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_ENVELOPEDDATA_CREATE 3"
-.TH CMS_ENVELOPEDDATA_CREATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_ENVELOPEDDATA_CREATE 3ossl"
+.TH CMS_ENVELOPEDDATA_CREATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_add0_cert.3 b/secure/lib/libcrypto/man/man3/CMS_add0_cert.3
index 2701983ca7c8..262b8d722745 100644
--- a/secure/lib/libcrypto/man/man3/CMS_add0_cert.3
+++ b/secure/lib/libcrypto/man/man3/CMS_add0_cert.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_ADD0_CERT 3"
-.TH CMS_ADD0_CERT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_ADD0_CERT 3ossl"
+.TH CMS_ADD0_CERT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3 b/secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3
index 5dba59eae905..d2e96ad778e8 100644
--- a/secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3
+++ b/secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_ADD1_RECIPIENT_CERT 3"
-.TH CMS_ADD1_RECIPIENT_CERT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_ADD1_RECIPIENT_CERT 3ossl"
+.TH CMS_ADD1_RECIPIENT_CERT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_add1_signer.3 b/secure/lib/libcrypto/man/man3/CMS_add1_signer.3
index f6fd796dc83d..70249b7b33aa 100644
--- a/secure/lib/libcrypto/man/man3/CMS_add1_signer.3
+++ b/secure/lib/libcrypto/man/man3/CMS_add1_signer.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_ADD1_SIGNER 3"
-.TH CMS_ADD1_SIGNER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_ADD1_SIGNER 3ossl"
+.TH CMS_ADD1_SIGNER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_compress.3 b/secure/lib/libcrypto/man/man3/CMS_compress.3
index 438309a75454..1ae103d9d86c 100644
--- a/secure/lib/libcrypto/man/man3/CMS_compress.3
+++ b/secure/lib/libcrypto/man/man3/CMS_compress.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_COMPRESS 3"
-.TH CMS_COMPRESS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_COMPRESS 3ossl"
+.TH CMS_COMPRESS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_data_create.3 b/secure/lib/libcrypto/man/man3/CMS_data_create.3
index 9f19258646c7..778817c6c152 100644
--- a/secure/lib/libcrypto/man/man3/CMS_data_create.3
+++ b/secure/lib/libcrypto/man/man3/CMS_data_create.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_DATA_CREATE 3"
-.TH CMS_DATA_CREATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_DATA_CREATE 3ossl"
+.TH CMS_DATA_CREATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_decrypt.3 b/secure/lib/libcrypto/man/man3/CMS_decrypt.3
index c47d7cf9a4c0..d0369e5d581a 100644
--- a/secure/lib/libcrypto/man/man3/CMS_decrypt.3
+++ b/secure/lib/libcrypto/man/man3/CMS_decrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_DECRYPT 3"
-.TH CMS_DECRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_DECRYPT 3ossl"
+.TH CMS_DECRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_digest_create.3 b/secure/lib/libcrypto/man/man3/CMS_digest_create.3
index f9065b4db507..e9ffc00f1b82 100644
--- a/secure/lib/libcrypto/man/man3/CMS_digest_create.3
+++ b/secure/lib/libcrypto/man/man3/CMS_digest_create.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_DIGEST_CREATE 3"
-.TH CMS_DIGEST_CREATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_DIGEST_CREATE 3ossl"
+.TH CMS_DIGEST_CREATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_encrypt.3 b/secure/lib/libcrypto/man/man3/CMS_encrypt.3
index 2ec8a7a55a84..4ef4c5e3e4e4 100644
--- a/secure/lib/libcrypto/man/man3/CMS_encrypt.3
+++ b/secure/lib/libcrypto/man/man3/CMS_encrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_ENCRYPT 3"
-.TH CMS_ENCRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_ENCRYPT 3ossl"
+.TH CMS_ENCRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_final.3 b/secure/lib/libcrypto/man/man3/CMS_final.3
index 00283e7f0f99..5cba4cff383c 100644
--- a/secure/lib/libcrypto/man/man3/CMS_final.3
+++ b/secure/lib/libcrypto/man/man3/CMS_final.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_FINAL 3"
-.TH CMS_FINAL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_FINAL 3ossl"
+.TH CMS_FINAL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3 b/secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3
index ddb380b000bf..edce05d20487 100644
--- a/secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3
+++ b/secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_GET0_RECIPIENTINFOS 3"
-.TH CMS_GET0_RECIPIENTINFOS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_GET0_RECIPIENTINFOS 3ossl"
+.TH CMS_GET0_RECIPIENTINFOS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 b/secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3
index 9bd12830ba20..781b6edc4c24 100644
--- a/secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3
+++ b/secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_GET0_SIGNERINFOS 3"
-.TH CMS_GET0_SIGNERINFOS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_GET0_SIGNERINFOS 3ossl"
+.TH CMS_GET0_SIGNERINFOS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_get0_type.3 b/secure/lib/libcrypto/man/man3/CMS_get0_type.3
index 2b859ef9a85a..33153f3ade41 100644
--- a/secure/lib/libcrypto/man/man3/CMS_get0_type.3
+++ b/secure/lib/libcrypto/man/man3/CMS_get0_type.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_GET0_TYPE 3"
-.TH CMS_GET0_TYPE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_GET0_TYPE 3ossl"
+.TH CMS_GET0_TYPE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3 b/secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3
index de4de77ad18e..3697b70fe890 100644
--- a/secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3
+++ b/secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_GET1_RECEIPTREQUEST 3"
-.TH CMS_GET1_RECEIPTREQUEST 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_GET1_RECEIPTREQUEST 3ossl"
+.TH CMS_GET1_RECEIPTREQUEST 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_sign.3 b/secure/lib/libcrypto/man/man3/CMS_sign.3
index 4ce3c75af71d..09ec048986f8 100644
--- a/secure/lib/libcrypto/man/man3/CMS_sign.3
+++ b/secure/lib/libcrypto/man/man3/CMS_sign.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_SIGN 3"
-.TH CMS_SIGN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_SIGN 3ossl"
+.TH CMS_SIGN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -241,7 +241,7 @@ The function \fBCMS_sign()\fR is a basic \s-1CMS\s0 signing function whose outpu
 suitable for many purposes. For finer control of the output format the
 \&\fBcerts\fR, \fBsigncert\fR and \fBpkey\fR parameters can all be \fB\s-1NULL\s0\fR and the
 \&\fB\s-1CMS_PARTIAL\s0\fR flag set. Then one or more signers can be added using the
-function \fBCMS_sign_add1_signer()\fR, non default digests can be used and custom
+function \fBCMS_add1_signer()\fR, non default digests can be used and custom
 attributes added. \fBCMS_final()\fR must then be called to finalize the
 structure if streaming is not enabled.
 .SH "BUGS"
@@ -263,7 +263,7 @@ it is supported for embedded data in OpenSSL 1.0.0 and later.
 The \fBCMS_sign_ex()\fR method was added in OpenSSL 3.0.
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2008\-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 b/secure/lib/libcrypto/man/man3/CMS_sign_receipt.3
index 2b0d0a53d02b..dac0e87aff55 100644
--- a/secure/lib/libcrypto/man/man3/CMS_sign_receipt.3
+++ b/secure/lib/libcrypto/man/man3/CMS_sign_receipt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_SIGN_RECEIPT 3"
-.TH CMS_SIGN_RECEIPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_SIGN_RECEIPT 3ossl"
+.TH CMS_SIGN_RECEIPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_uncompress.3 b/secure/lib/libcrypto/man/man3/CMS_uncompress.3
index a60f33e3395a..f9ea236e64b7 100644
--- a/secure/lib/libcrypto/man/man3/CMS_uncompress.3
+++ b/secure/lib/libcrypto/man/man3/CMS_uncompress.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_UNCOMPRESS 3"
-.TH CMS_UNCOMPRESS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_UNCOMPRESS 3ossl"
+.TH CMS_UNCOMPRESS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_verify.3 b/secure/lib/libcrypto/man/man3/CMS_verify.3
index 2647f36f0b0a..9ca4ff1114b3 100644
--- a/secure/lib/libcrypto/man/man3/CMS_verify.3
+++ b/secure/lib/libcrypto/man/man3/CMS_verify.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_VERIFY 3"
-.TH CMS_VERIFY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_VERIFY 3ossl"
+.TH CMS_VERIFY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 b/secure/lib/libcrypto/man/man3/CMS_verify_receipt.3
index e0b9b5081ac3..1f336849b004 100644
--- a/secure/lib/libcrypto/man/man3/CMS_verify_receipt.3
+++ b/secure/lib/libcrypto/man/man3/CMS_verify_receipt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CMS_VERIFY_RECEIPT 3"
-.TH CMS_VERIFY_RECEIPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CMS_VERIFY_RECEIPT 3ossl"
+.TH CMS_VERIFY_RECEIPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CONF_modules_free.3 b/secure/lib/libcrypto/man/man3/CONF_modules_free.3
index bb66916d9121..1dbf826a76ae 100644
--- a/secure/lib/libcrypto/man/man3/CONF_modules_free.3
+++ b/secure/lib/libcrypto/man/man3/CONF_modules_free.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CONF_MODULES_FREE 3"
-.TH CONF_MODULES_FREE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CONF_MODULES_FREE 3ossl"
+.TH CONF_MODULES_FREE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CONF_modules_load_file.3 b/secure/lib/libcrypto/man/man3/CONF_modules_load_file.3
index b7b43dddaff1..d2d8f676a66d 100644
--- a/secure/lib/libcrypto/man/man3/CONF_modules_load_file.3
+++ b/secure/lib/libcrypto/man/man3/CONF_modules_load_file.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CONF_MODULES_LOAD_FILE 3"
-.TH CONF_MODULES_LOAD_FILE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CONF_MODULES_LOAD_FILE 3ossl"
+.TH CONF_MODULES_LOAD_FILE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3 b/secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3
index 962677501a75..2767b5c4447f 100644
--- a/secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3
+++ b/secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CRYPTO_THREAD_RUN_ONCE 3"
-.TH CRYPTO_THREAD_RUN_ONCE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CRYPTO_THREAD_RUN_ONCE 3ossl"
+.TH CRYPTO_THREAD_RUN_ONCE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3 b/secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3
index 17ba2a1d8cc1..14c26d9b63d8 100644
--- a/secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3
+++ b/secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CRYPTO_GET_EX_NEW_INDEX 3"
-.TH CRYPTO_GET_EX_NEW_INDEX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CRYPTO_GET_EX_NEW_INDEX 3ossl"
+.TH CRYPTO_GET_EX_NEW_INDEX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 b/secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3
index 84fe7d12fb8b..05dfa2f2fe28 100644
--- a/secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3
+++ b/secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CRYPTO_MEMCMP 3"
-.TH CRYPTO_MEMCMP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CRYPTO_MEMCMP 3ossl"
+.TH CRYPTO_MEMCMP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3 b/secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3
index 5c1062212214..04cadca817aa 100644
--- a/secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3
+++ b/secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CTLOG_STORE_GET0_LOG_BY_ID 3"
-.TH CTLOG_STORE_GET0_LOG_BY_ID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CTLOG_STORE_GET0_LOG_BY_ID 3ossl"
+.TH CTLOG_STORE_GET0_LOG_BY_ID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 b/secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3
index a9f22119cb85..42e217dc0980 100644
--- a/secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3
+++ b/secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CTLOG_STORE_NEW 3"
-.TH CTLOG_STORE_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CTLOG_STORE_NEW 3ossl"
+.TH CTLOG_STORE_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CTLOG_new.3 b/secure/lib/libcrypto/man/man3/CTLOG_new.3
index 624e1c835ca2..68fc99a3ec48 100644
--- a/secure/lib/libcrypto/man/man3/CTLOG_new.3
+++ b/secure/lib/libcrypto/man/man3/CTLOG_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CTLOG_NEW 3"
-.TH CTLOG_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CTLOG_NEW 3ossl"
+.TH CTLOG_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 b/secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3
index 3a1f331461c0..45139ea6d61c 100644
--- a/secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3
+++ b/secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CT_POLICY_EVAL_CTX_NEW 3"
-.TH CT_POLICY_EVAL_CTX_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CT_POLICY_EVAL_CTX_NEW 3ossl"
+.TH CT_POLICY_EVAL_CTX_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 b/secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3
index 9b14f4b04556..239a5f5d5f55 100644
--- a/secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3
+++ b/secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DEFINE_STACK_OF 3"
-.TH DEFINE_STACK_OF 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DEFINE_STACK_OF 3ossl"
+.TH DEFINE_STACK_OF 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DES_random_key.3 b/secure/lib/libcrypto/man/man3/DES_random_key.3
index 93356841bb4a..76a25e18d8a8 100644
--- a/secure/lib/libcrypto/man/man3/DES_random_key.3
+++ b/secure/lib/libcrypto/man/man3/DES_random_key.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DES_RANDOM_KEY 3"
-.TH DES_RANDOM_KEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DES_RANDOM_KEY 3ossl"
+.TH DES_RANDOM_KEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DH_generate_key.3 b/secure/lib/libcrypto/man/man3/DH_generate_key.3
index eae2e886ea13..282a4516c55f 100644
--- a/secure/lib/libcrypto/man/man3/DH_generate_key.3
+++ b/secure/lib/libcrypto/man/man3/DH_generate_key.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DH_GENERATE_KEY 3"
-.TH DH_GENERATE_KEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DH_GENERATE_KEY 3ossl"
+.TH DH_GENERATE_KEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DH_generate_parameters.3 b/secure/lib/libcrypto/man/man3/DH_generate_parameters.3
index 7c300e2fd1d1..a836fc32e141 100644
--- a/secure/lib/libcrypto/man/man3/DH_generate_parameters.3
+++ b/secure/lib/libcrypto/man/man3/DH_generate_parameters.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DH_GENERATE_PARAMETERS 3"
-.TH DH_GENERATE_PARAMETERS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DH_GENERATE_PARAMETERS 3ossl"
+.TH DH_GENERATE_PARAMETERS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DH_get0_pqg.3 b/secure/lib/libcrypto/man/man3/DH_get0_pqg.3
index 2e64cb195791..46b832ea7288 100644
--- a/secure/lib/libcrypto/man/man3/DH_get0_pqg.3
+++ b/secure/lib/libcrypto/man/man3/DH_get0_pqg.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DH_GET0_PQG 3"
-.TH DH_GET0_PQG 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DH_GET0_PQG 3ossl"
+.TH DH_GET0_PQG 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DH_get_1024_160.3 b/secure/lib/libcrypto/man/man3/DH_get_1024_160.3
index 2134aef3bf4f..536d4ab725d2 100644
--- a/secure/lib/libcrypto/man/man3/DH_get_1024_160.3
+++ b/secure/lib/libcrypto/man/man3/DH_get_1024_160.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DH_GET_1024_160 3"
-.TH DH_GET_1024_160 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DH_GET_1024_160 3ossl"
+.TH DH_GET_1024_160 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DH_meth_new.3 b/secure/lib/libcrypto/man/man3/DH_meth_new.3
index b59ec24245ea..33edc727d6d2 100644
--- a/secure/lib/libcrypto/man/man3/DH_meth_new.3
+++ b/secure/lib/libcrypto/man/man3/DH_meth_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DH_METH_NEW 3"
-.TH DH_METH_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DH_METH_NEW 3ossl"
+.TH DH_METH_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DH_new.3 b/secure/lib/libcrypto/man/man3/DH_new.3
index e346306f9e78..ef4848c1d3cd 100644
--- a/secure/lib/libcrypto/man/man3/DH_new.3
+++ b/secure/lib/libcrypto/man/man3/DH_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DH_NEW 3"
-.TH DH_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DH_NEW 3ossl"
+.TH DH_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DH_new_by_nid.3 b/secure/lib/libcrypto/man/man3/DH_new_by_nid.3
index 30a7376f0fa3..f43709cdecd7 100644
--- a/secure/lib/libcrypto/man/man3/DH_new_by_nid.3
+++ b/secure/lib/libcrypto/man/man3/DH_new_by_nid.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DH_NEW_BY_NID 3"
-.TH DH_NEW_BY_NID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DH_NEW_BY_NID 3ossl"
+.TH DH_NEW_BY_NID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DH_set_method.3 b/secure/lib/libcrypto/man/man3/DH_set_method.3
index 632a15d088a6..0795c8cbdc35 100644
--- a/secure/lib/libcrypto/man/man3/DH_set_method.3
+++ b/secure/lib/libcrypto/man/man3/DH_set_method.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DH_SET_METHOD 3"
-.TH DH_SET_METHOD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DH_SET_METHOD 3ossl"
+.TH DH_SET_METHOD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DH_size.3 b/secure/lib/libcrypto/man/man3/DH_size.3
index f8ce59c634c3..7aabf36d108c 100644
--- a/secure/lib/libcrypto/man/man3/DH_size.3
+++ b/secure/lib/libcrypto/man/man3/DH_size.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DH_SIZE 3"
-.TH DH_SIZE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DH_SIZE 3ossl"
+.TH DH_SIZE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DSA_SIG_new.3 b/secure/lib/libcrypto/man/man3/DSA_SIG_new.3
index 62c6aa7bdc9f..f62d3ef7c1a7 100644
--- a/secure/lib/libcrypto/man/man3/DSA_SIG_new.3
+++ b/secure/lib/libcrypto/man/man3/DSA_SIG_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DSA_SIG_NEW 3"
-.TH DSA_SIG_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DSA_SIG_NEW 3ossl"
+.TH DSA_SIG_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DSA_do_sign.3 b/secure/lib/libcrypto/man/man3/DSA_do_sign.3
index 768bc7ba98b1..d8453b2e6977 100644
--- a/secure/lib/libcrypto/man/man3/DSA_do_sign.3
+++ b/secure/lib/libcrypto/man/man3/DSA_do_sign.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DSA_DO_SIGN 3"
-.TH DSA_DO_SIGN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DSA_DO_SIGN 3ossl"
+.TH DSA_DO_SIGN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DSA_dup_DH.3 b/secure/lib/libcrypto/man/man3/DSA_dup_DH.3
index 585b47e46282..f3f4d6385d67 100644
--- a/secure/lib/libcrypto/man/man3/DSA_dup_DH.3
+++ b/secure/lib/libcrypto/man/man3/DSA_dup_DH.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DSA_DUP_DH 3"
-.TH DSA_DUP_DH 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DSA_DUP_DH 3ossl"
+.TH DSA_DUP_DH 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DSA_generate_key.3 b/secure/lib/libcrypto/man/man3/DSA_generate_key.3
index 74fcdb7f66f3..244bbcd01989 100644
--- a/secure/lib/libcrypto/man/man3/DSA_generate_key.3
+++ b/secure/lib/libcrypto/man/man3/DSA_generate_key.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DSA_GENERATE_KEY 3"
-.TH DSA_GENERATE_KEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DSA_GENERATE_KEY 3ossl"
+.TH DSA_GENERATE_KEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DSA_generate_parameters.3 b/secure/lib/libcrypto/man/man3/DSA_generate_parameters.3
index 4256553f280a..ba0e71cee50f 100644
--- a/secure/lib/libcrypto/man/man3/DSA_generate_parameters.3
+++ b/secure/lib/libcrypto/man/man3/DSA_generate_parameters.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DSA_GENERATE_PARAMETERS 3"
-.TH DSA_GENERATE_PARAMETERS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DSA_GENERATE_PARAMETERS 3ossl"
+.TH DSA_GENERATE_PARAMETERS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 b/secure/lib/libcrypto/man/man3/DSA_get0_pqg.3
index 81b4fa9d66af..a40e62d2a0dd 100644
--- a/secure/lib/libcrypto/man/man3/DSA_get0_pqg.3
+++ b/secure/lib/libcrypto/man/man3/DSA_get0_pqg.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DSA_GET0_PQG 3"
-.TH DSA_GET0_PQG 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DSA_GET0_PQG 3ossl"
+.TH DSA_GET0_PQG 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DSA_meth_new.3 b/secure/lib/libcrypto/man/man3/DSA_meth_new.3
index 50683439bc40..79601df40d65 100644
--- a/secure/lib/libcrypto/man/man3/DSA_meth_new.3
+++ b/secure/lib/libcrypto/man/man3/DSA_meth_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DSA_METH_NEW 3"
-.TH DSA_METH_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DSA_METH_NEW 3ossl"
+.TH DSA_METH_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DSA_new.3 b/secure/lib/libcrypto/man/man3/DSA_new.3
index 1083a347b4b2..3ad59561de93 100644
--- a/secure/lib/libcrypto/man/man3/DSA_new.3
+++ b/secure/lib/libcrypto/man/man3/DSA_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DSA_NEW 3"
-.TH DSA_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DSA_NEW 3ossl"
+.TH DSA_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DSA_set_method.3 b/secure/lib/libcrypto/man/man3/DSA_set_method.3
index 46fc0a2e0024..6b4945723f6a 100644
--- a/secure/lib/libcrypto/man/man3/DSA_set_method.3
+++ b/secure/lib/libcrypto/man/man3/DSA_set_method.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DSA_SET_METHOD 3"
-.TH DSA_SET_METHOD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DSA_SET_METHOD 3ossl"
+.TH DSA_SET_METHOD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DSA_sign.3 b/secure/lib/libcrypto/man/man3/DSA_sign.3
index 4744d024478a..7ef40feea500 100644
--- a/secure/lib/libcrypto/man/man3/DSA_sign.3
+++ b/secure/lib/libcrypto/man/man3/DSA_sign.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DSA_SIGN 3"
-.TH DSA_SIGN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DSA_SIGN 3ossl"
+.TH DSA_SIGN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DSA_size.3 b/secure/lib/libcrypto/man/man3/DSA_size.3
index 784c6d0949fd..f8bff4bc7798 100644
--- a/secure/lib/libcrypto/man/man3/DSA_size.3
+++ b/secure/lib/libcrypto/man/man3/DSA_size.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DSA_SIZE 3"
-.TH DSA_SIZE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DSA_SIZE 3ossl"
+.TH DSA_SIZE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 b/secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3
index f8de185225bd..c1f5261f24aa 100644
--- a/secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3
+++ b/secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DTLS_GET_DATA_MTU 3"
-.TH DTLS_GET_DATA_MTU 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DTLS_GET_DATA_MTU 3ossl"
+.TH DTLS_GET_DATA_MTU 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 b/secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3
index b3ea84866ffe..a973a1fb87df 100644
--- a/secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3
+++ b/secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DTLS_SET_TIMER_CB 3"
-.TH DTLS_SET_TIMER_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DTLS_SET_TIMER_CB 3ossl"
+.TH DTLS_SET_TIMER_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/DTLSv1_listen.3 b/secure/lib/libcrypto/man/man3/DTLSv1_listen.3
index 6d39c2d6e9cf..eee23e574dd4 100644
--- a/secure/lib/libcrypto/man/man3/DTLSv1_listen.3
+++ b/secure/lib/libcrypto/man/man3/DTLSv1_listen.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DTLSV1_LISTEN 3"
-.TH DTLSV1_LISTEN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DTLSV1_LISTEN 3ossl"
+.TH DTLSV1_LISTEN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 b/secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3
index 07b09b17bdd3..5f6b20872dfa 100644
--- a/secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3
+++ b/secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ECDSA_SIG_NEW 3"
-.TH ECDSA_SIG_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ECDSA_SIG_NEW 3ossl"
+.TH ECDSA_SIG_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ECDSA_sign.3 b/secure/lib/libcrypto/man/man3/ECDSA_sign.3
index 04e241375289..58c757a6746f 100644
--- a/secure/lib/libcrypto/man/man3/ECDSA_sign.3
+++ b/secure/lib/libcrypto/man/man3/ECDSA_sign.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ECDSA_SIGN 3"
-.TH ECDSA_SIGN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ECDSA_SIGN 3ossl"
+.TH ECDSA_SIGN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ECPKParameters_print.3 b/secure/lib/libcrypto/man/man3/ECPKParameters_print.3
index 4046af18a6ba..a3f1b2b08d36 100644
--- a/secure/lib/libcrypto/man/man3/ECPKParameters_print.3
+++ b/secure/lib/libcrypto/man/man3/ECPKParameters_print.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ECPKPARAMETERS_PRINT 3"
-.TH ECPKPARAMETERS_PRINT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ECPKPARAMETERS_PRINT 3ossl"
+.TH ECPKPARAMETERS_PRINT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3 b/secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3
index 32c32a9227f1..c7313d997c36 100644
--- a/secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3
+++ b/secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EC_GFP_SIMPLE_METHOD 3"
-.TH EC_GFP_SIMPLE_METHOD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EC_GFP_SIMPLE_METHOD 3ossl"
+.TH EC_GFP_SIMPLE_METHOD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 b/secure/lib/libcrypto/man/man3/EC_GROUP_copy.3
index 1c8fb3bd0bef..38d8dda95b32 100644
--- a/secure/lib/libcrypto/man/man3/EC_GROUP_copy.3
+++ b/secure/lib/libcrypto/man/man3/EC_GROUP_copy.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EC_GROUP_COPY 3"
-.TH EC_GROUP_COPY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EC_GROUP_COPY 3ossl"
+.TH EC_GROUP_COPY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EC_GROUP_new.3 b/secure/lib/libcrypto/man/man3/EC_GROUP_new.3
index ffdab4b0b00b..fb1aef342bb5 100644
--- a/secure/lib/libcrypto/man/man3/EC_GROUP_new.3
+++ b/secure/lib/libcrypto/man/man3/EC_GROUP_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EC_GROUP_NEW 3"
-.TH EC_GROUP_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EC_GROUP_NEW 3ossl"
+.TH EC_GROUP_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 b/secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3
index 8306a7aea385..893aef600dba 100644
--- a/secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3
+++ b/secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EC_KEY_GET_ENC_FLAGS 3"
-.TH EC_KEY_GET_ENC_FLAGS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EC_KEY_GET_ENC_FLAGS 3ossl"
+.TH EC_KEY_GET_ENC_FLAGS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EC_KEY_new.3 b/secure/lib/libcrypto/man/man3/EC_KEY_new.3
index febaf2b4bedc..87121d895e6a 100644
--- a/secure/lib/libcrypto/man/man3/EC_KEY_new.3
+++ b/secure/lib/libcrypto/man/man3/EC_KEY_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EC_KEY_NEW 3"
-.TH EC_KEY_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EC_KEY_NEW 3ossl"
+.TH EC_KEY_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EC_POINT_add.3 b/secure/lib/libcrypto/man/man3/EC_POINT_add.3
index b4a91e56ac7e..7f7d3e8ae067 100644
--- a/secure/lib/libcrypto/man/man3/EC_POINT_add.3
+++ b/secure/lib/libcrypto/man/man3/EC_POINT_add.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EC_POINT_ADD 3"
-.TH EC_POINT_ADD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EC_POINT_ADD 3ossl"
+.TH EC_POINT_ADD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EC_POINT_new.3 b/secure/lib/libcrypto/man/man3/EC_POINT_new.3
index 8049d1f6ab97..654eb4342c6a 100644
--- a/secure/lib/libcrypto/man/man3/EC_POINT_new.3
+++ b/secure/lib/libcrypto/man/man3/EC_POINT_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EC_POINT_NEW 3"
-.TH EC_POINT_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EC_POINT_NEW 3ossl"
+.TH EC_POINT_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ENGINE_add.3 b/secure/lib/libcrypto/man/man3/ENGINE_add.3
index 70470d83b262..0f550eb1f930 100644
--- a/secure/lib/libcrypto/man/man3/ENGINE_add.3
+++ b/secure/lib/libcrypto/man/man3/ENGINE_add.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ENGINE_ADD 3"
-.TH ENGINE_ADD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ENGINE_ADD 3ossl"
+.TH ENGINE_ADD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 b/secure/lib/libcrypto/man/man3/ERR_GET_LIB.3
index 00f13ee48294..62975bb77dee 100644
--- a/secure/lib/libcrypto/man/man3/ERR_GET_LIB.3
+++ b/secure/lib/libcrypto/man/man3/ERR_GET_LIB.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ERR_GET_LIB 3"
-.TH ERR_GET_LIB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ERR_GET_LIB 3ossl"
+.TH ERR_GET_LIB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ERR_clear_error.3 b/secure/lib/libcrypto/man/man3/ERR_clear_error.3
index aa6c58f54b59..f2d2e17b6838 100644
--- a/secure/lib/libcrypto/man/man3/ERR_clear_error.3
+++ b/secure/lib/libcrypto/man/man3/ERR_clear_error.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ERR_CLEAR_ERROR 3"
-.TH ERR_CLEAR_ERROR 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ERR_CLEAR_ERROR 3ossl"
+.TH ERR_CLEAR_ERROR 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ERR_error_string.3 b/secure/lib/libcrypto/man/man3/ERR_error_string.3
index a197fb90422b..557be038f290 100644
--- a/secure/lib/libcrypto/man/man3/ERR_error_string.3
+++ b/secure/lib/libcrypto/man/man3/ERR_error_string.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ERR_ERROR_STRING 3"
-.TH ERR_ERROR_STRING 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ERR_ERROR_STRING 3ossl"
+.TH ERR_ERROR_STRING 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ERR_get_error.3 b/secure/lib/libcrypto/man/man3/ERR_get_error.3
index 49856e421935..594d935e9e29 100644
--- a/secure/lib/libcrypto/man/man3/ERR_get_error.3
+++ b/secure/lib/libcrypto/man/man3/ERR_get_error.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ERR_GET_ERROR 3"
-.TH ERR_GET_ERROR 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ERR_GET_ERROR 3ossl"
+.TH ERR_GET_ERROR 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3 b/secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3
index 4f63fb6b875e..d0ea5a966b3e 100644
--- a/secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3
+++ b/secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ERR_LOAD_CRYPTO_STRINGS 3"
-.TH ERR_LOAD_CRYPTO_STRINGS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ERR_LOAD_CRYPTO_STRINGS 3ossl"
+.TH ERR_LOAD_CRYPTO_STRINGS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ERR_load_strings.3 b/secure/lib/libcrypto/man/man3/ERR_load_strings.3
index e25a6a55570f..a852de8b0c32 100644
--- a/secure/lib/libcrypto/man/man3/ERR_load_strings.3
+++ b/secure/lib/libcrypto/man/man3/ERR_load_strings.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ERR_LOAD_STRINGS 3"
-.TH ERR_LOAD_STRINGS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ERR_LOAD_STRINGS 3ossl"
+.TH ERR_LOAD_STRINGS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ERR_new.3 b/secure/lib/libcrypto/man/man3/ERR_new.3
index 83749eee1702..ebf35b9ea1ab 100644
--- a/secure/lib/libcrypto/man/man3/ERR_new.3
+++ b/secure/lib/libcrypto/man/man3/ERR_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ERR_NEW 3"
-.TH ERR_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ERR_NEW 3ossl"
+.TH ERR_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ERR_print_errors.3 b/secure/lib/libcrypto/man/man3/ERR_print_errors.3
index c7acc0d3733e..a43e17faae95 100644
--- a/secure/lib/libcrypto/man/man3/ERR_print_errors.3
+++ b/secure/lib/libcrypto/man/man3/ERR_print_errors.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ERR_PRINT_ERRORS 3"
-.TH ERR_PRINT_ERRORS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ERR_PRINT_ERRORS 3ossl"
+.TH ERR_PRINT_ERRORS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ERR_put_error.3 b/secure/lib/libcrypto/man/man3/ERR_put_error.3
index c07ed730044e..5f2da68e283c 100644
--- a/secure/lib/libcrypto/man/man3/ERR_put_error.3
+++ b/secure/lib/libcrypto/man/man3/ERR_put_error.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ERR_PUT_ERROR 3"
-.TH ERR_PUT_ERROR 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ERR_PUT_ERROR 3ossl"
+.TH ERR_PUT_ERROR 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ERR_remove_state.3 b/secure/lib/libcrypto/man/man3/ERR_remove_state.3
index b36ab16c56e6..22dbb4e456ad 100644
--- a/secure/lib/libcrypto/man/man3/ERR_remove_state.3
+++ b/secure/lib/libcrypto/man/man3/ERR_remove_state.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ERR_REMOVE_STATE 3"
-.TH ERR_REMOVE_STATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ERR_REMOVE_STATE 3ossl"
+.TH ERR_REMOVE_STATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/ERR_set_mark.3 b/secure/lib/libcrypto/man/man3/ERR_set_mark.3
index c036c2f39b98..ee51195ac02d 100644
--- a/secure/lib/libcrypto/man/man3/ERR_set_mark.3
+++ b/secure/lib/libcrypto/man/man3/ERR_set_mark.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "ERR_SET_MARK 3"
-.TH ERR_SET_MARK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "ERR_SET_MARK 3ossl"
+.TH ERR_SET_MARK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3 b/secure/lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3
index ff9b5ae8d96f..01483274fd53 100644
--- a/secure/lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3
+++ b/secure/lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_ASYM_CIPHER_FREE 3"
-.TH EVP_ASYM_CIPHER_FREE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_ASYM_CIPHER_FREE 3ossl"
+.TH EVP_ASYM_CIPHER_FREE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 b/secure/lib/libcrypto/man/man3/EVP_BytesToKey.3
index cd3cea1068d8..9918ddb8721a 100644
--- a/secure/lib/libcrypto/man/man3/EVP_BytesToKey.3
+++ b/secure/lib/libcrypto/man/man3/EVP_BytesToKey.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_BYTESTOKEY 3"
-.TH EVP_BYTESTOKEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_BYTESTOKEY 3ossl"
+.TH EVP_BYTESTOKEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3 b/secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3
index ca6eb50cb2f7..9bb990ff688c 100644
--- a/secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3
+++ b/secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER_CTX_GET_CIPHER_DATA 3"
-.TH EVP_CIPHER_CTX_GET_CIPHER_DATA 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER_CTX_GET_CIPHER_DATA 3ossl"
+.TH EVP_CIPHER_CTX_GET_CIPHER_DATA 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_original_iv.3 b/secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_original_iv.3
index 65316b2d7373..838777f74ee1 100644
--- a/secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_original_iv.3
+++ b/secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_original_iv.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER_CTX_GET_ORIGINAL_IV 3"
-.TH EVP_CIPHER_CTX_GET_ORIGINAL_IV 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER_CTX_GET_ORIGINAL_IV 3ossl"
+.TH EVP_CIPHER_CTX_GET_ORIGINAL_IV 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 b/secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3
index cd69b3ad3542..f648aa3b0147 100644
--- a/secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3
+++ b/secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER_METH_NEW 3"
-.TH EVP_CIPHER_METH_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER_METH_NEW 3ossl"
+.TH EVP_CIPHER_METH_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_DigestInit.3 b/secure/lib/libcrypto/man/man3/EVP_DigestInit.3
index 10c0df783d84..5999a796015d 100644
--- a/secure/lib/libcrypto/man/man3/EVP_DigestInit.3
+++ b/secure/lib/libcrypto/man/man3/EVP_DigestInit.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_DIGESTINIT 3"
-.TH EVP_DIGESTINIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_DIGESTINIT 3ossl"
+.TH EVP_DIGESTINIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 b/secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3
index f8e0a0a8a3a6..2b8c4545df11 100644
--- a/secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3
+++ b/secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_DIGESTSIGNINIT 3"
-.TH EVP_DIGESTSIGNINIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_DIGESTSIGNINIT 3ossl"
+.TH EVP_DIGESTSIGNINIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 b/secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3
index c8c97135deb7..8605902f78ac 100644
--- a/secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3
+++ b/secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_DIGESTVERIFYINIT 3"
-.TH EVP_DIGESTVERIFYINIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_DIGESTVERIFYINIT 3ossl"
+.TH EVP_DIGESTVERIFYINIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 b/secure/lib/libcrypto/man/man3/EVP_EncodeInit.3
index fe3b1bb37e8f..e43dfd6a13c7 100644
--- a/secure/lib/libcrypto/man/man3/EVP_EncodeInit.3
+++ b/secure/lib/libcrypto/man/man3/EVP_EncodeInit.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_ENCODEINIT 3"
-.TH EVP_ENCODEINIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_ENCODEINIT 3ossl"
+.TH EVP_ENCODEINIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 b/secure/lib/libcrypto/man/man3/EVP_EncryptInit.3
index bb4d16797a27..ac0575dc95f9 100644
--- a/secure/lib/libcrypto/man/man3/EVP_EncryptInit.3
+++ b/secure/lib/libcrypto/man/man3/EVP_EncryptInit.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_ENCRYPTINIT 3"
-.TH EVP_ENCRYPTINIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_ENCRYPTINIT 3ossl"
+.TH EVP_ENCRYPTINIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_KDF.3 b/secure/lib/libcrypto/man/man3/EVP_KDF.3
index 087ecfa883f9..b4f2e4563446 100644
--- a/secure/lib/libcrypto/man/man3/EVP_KDF.3
+++ b/secure/lib/libcrypto/man/man3/EVP_KDF.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF 3"
-.TH EVP_KDF 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF 3ossl"
+.TH EVP_KDF 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_KEM_free.3 b/secure/lib/libcrypto/man/man3/EVP_KEM_free.3
index f5429db01afe..4e15eacfbee8 100644
--- a/secure/lib/libcrypto/man/man3/EVP_KEM_free.3
+++ b/secure/lib/libcrypto/man/man3/EVP_KEM_free.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KEM_FREE 3"
-.TH EVP_KEM_FREE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KEM_FREE 3ossl"
+.TH EVP_KEM_FREE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3 b/secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3
index 51159c4f6527..c38091a01bc3 100644
--- a/secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3
+++ b/secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KEYEXCH_FREE 3"
-.TH EVP_KEYEXCH_FREE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KEYEXCH_FREE 3ossl"
+.TH EVP_KEYEXCH_FREE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3 b/secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3
index e39ddbb83c3e..99e4f47ab11a 100644
--- a/secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3
+++ b/secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KEYMGMT 3"
-.TH EVP_KEYMGMT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KEYMGMT 3ossl"
+.TH EVP_KEYMGMT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_MAC.3 b/secure/lib/libcrypto/man/man3/EVP_MAC.3
index fa6c439fb780..6e274cbf447f 100644
--- a/secure/lib/libcrypto/man/man3/EVP_MAC.3
+++ b/secure/lib/libcrypto/man/man3/EVP_MAC.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MAC 3"
-.TH EVP_MAC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MAC 3ossl"
+.TH EVP_MAC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -314,7 +314,7 @@ simply ignored.
 context, given a context \fIctx\fR.
 The set of parameters given with \fIparams\fR determine exactly what
 parameters are passed down.
-If \fIparams\fR are \s-1NULL,\s0 the unterlying context should do nothing and return 1.
+If \fIparams\fR are \s-1NULL,\s0 the underlying context should do nothing and return 1.
 Note that a parameter that is unknown in the underlying context is
 simply ignored.
 Also, what happens when a needed parameter isn't passed down is
@@ -610,7 +610,7 @@ look like this:
 These functions were added in OpenSSL 3.0.
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2018\-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2018\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 b/secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3
index aadaa80047ae..b6d27f3572fc 100644
--- a/secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3
+++ b/secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD_METH_NEW 3"
-.TH EVP_MD_METH_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD_METH_NEW 3ossl"
+.TH EVP_MD_METH_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_OpenInit.3 b/secure/lib/libcrypto/man/man3/EVP_OpenInit.3
index 253b8960e55b..42da6b2f44a9 100644
--- a/secure/lib/libcrypto/man/man3/EVP_OpenInit.3
+++ b/secure/lib/libcrypto/man/man3/EVP_OpenInit.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_OPENINIT 3"
-.TH EVP_OPENINIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_OPENINIT 3ossl"
+.TH EVP_OPENINIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3 b/secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3
index 44201e2ed5ce..5ecf9bf14338 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PBE_CIPHERINIT 3"
-.TH EVP_PBE_CIPHERINIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PBE_CIPHERINIT 3ossl"
+.TH EVP_PBE_CIPHERINIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3
index bfda4e63a86c..996f6e6ffdbd 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY2PKCS8 3"
-.TH EVP_PKEY2PKCS8 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY2PKCS8 3ossl"
+.TH EVP_PKEY2PKCS8 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3
index 4e75e1f82d54..495f2df07c65 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_ASN1_METHOD 3"
-.TH EVP_PKEY_ASN1_METHOD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_ASN1_METHOD 3ossl"
+.TH EVP_PKEY_ASN1_METHOD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3
index 6c38efb78d68..0084f4566ccd 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_CTX_CTRL 3"
-.TH EVP_PKEY_CTX_CTRL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_CTX_CTRL 3ossl"
+.TH EVP_PKEY_CTX_CTRL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3
index f6afd45277fa..18f88e269450 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_CTX_GET0_LIBCTX 3"
-.TH EVP_PKEY_CTX_GET0_LIBCTX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_CTX_GET0_LIBCTX 3ossl"
+.TH EVP_PKEY_CTX_GET0_LIBCTX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3
index 00e889b27739..a6bd5d98be91 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_CTX_GET0_PKEY 3"
-.TH EVP_PKEY_CTX_GET0_PKEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_CTX_GET0_PKEY 3ossl"
+.TH EVP_PKEY_CTX_GET0_PKEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3
index 5ac07132075e..8187a921a546 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_CTX_NEW 3"
-.TH EVP_PKEY_CTX_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_CTX_NEW 3ossl"
+.TH EVP_PKEY_CTX_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3
index 9dab9ac96672..0d51313d098d 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_CTX_SET1_PBE_PASS 3"
-.TH EVP_PKEY_CTX_SET1_PBE_PASS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_CTX_SET1_PBE_PASS 3ossl"
+.TH EVP_PKEY_CTX_SET1_PBE_PASS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3
index b585d37498c9..5c3d8a48fda1 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_CTX_SET_HKDF_MD 3"
-.TH EVP_PKEY_CTX_SET_HKDF_MD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_CTX_SET_HKDF_MD 3ossl"
+.TH EVP_PKEY_CTX_SET_HKDF_MD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_params.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_params.3
index 51da4e4b2134..45c771d27548 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_params.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_params.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_CTX_SET_PARAMS 3"
-.TH EVP_PKEY_CTX_SET_PARAMS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_CTX_SET_PARAMS 3ossl"
+.TH EVP_PKEY_CTX_SET_PARAMS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3
index 69048f6fb027..12294e5f900e 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_CTX_SET_RSA_PSS_KEYGEN_MD 3"
-.TH EVP_PKEY_CTX_SET_RSA_PSS_KEYGEN_MD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_CTX_SET_RSA_PSS_KEYGEN_MD 3ossl"
+.TH EVP_PKEY_CTX_SET_RSA_PSS_KEYGEN_MD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3
index ec43f411545e..c40ff6440b11 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_CTX_SET_SCRYPT_N 3"
-.TH EVP_PKEY_CTX_SET_SCRYPT_N 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_CTX_SET_SCRYPT_N 3ossl"
+.TH EVP_PKEY_CTX_SET_SCRYPT_N 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3
index 37fa49600cd7..ac925e8d11bb 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_CTX_SET_TLS1_PRF_MD 3"
-.TH EVP_PKEY_CTX_SET_TLS1_PRF_MD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_CTX_SET_TLS1_PRF_MD 3ossl"
+.TH EVP_PKEY_CTX_SET_TLS1_PRF_MD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3
index 500b35436df5..6e6b59041815 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_ASN1_GET_COUNT 3"
-.TH EVP_PKEY_ASN1_GET_COUNT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_ASN1_GET_COUNT 3ossl"
+.TH EVP_PKEY_ASN1_GET_COUNT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_check.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_check.3
index 70d9c8a64d0b..20d5bf1736a0 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_check.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_check.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_CHECK 3"
-.TH EVP_PKEY_CHECK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_CHECK 3ossl"
+.TH EVP_PKEY_CHECK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_copy_parameters.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_copy_parameters.3
index 73094feda994..892a72c31e3f 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_copy_parameters.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_copy_parameters.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_COPY_PARAMETERS 3"
-.TH EVP_PKEY_COPY_PARAMETERS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_COPY_PARAMETERS 3ossl"
+.TH EVP_PKEY_COPY_PARAMETERS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3
index b9fe8098f15b..610bfa1f6ae6 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_DECAPSULATE 3"
-.TH EVP_PKEY_DECAPSULATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_DECAPSULATE 3ossl"
+.TH EVP_PKEY_DECAPSULATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3
index 35fcbcc3f1dd..8160f3c9ff09 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_DECRYPT 3"
-.TH EVP_PKEY_DECRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_DECRYPT 3ossl"
+.TH EVP_PKEY_DECRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3
index e9ba2925458a..d3a38b9b6a34 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_DERIVE 3"
-.TH EVP_PKEY_DERIVE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_DERIVE 3ossl"
+.TH EVP_PKEY_DERIVE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_digestsign_supports_digest.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_digestsign_supports_digest.3
index bffe573f5219..d5267745b29a 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_digestsign_supports_digest.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_digestsign_supports_digest.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_DIGESTSIGN_SUPPORTS_DIGEST 3"
-.TH EVP_PKEY_DIGESTSIGN_SUPPORTS_DIGEST 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_DIGESTSIGN_SUPPORTS_DIGEST 3ossl"
+.TH EVP_PKEY_DIGESTSIGN_SUPPORTS_DIGEST 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3
index c54d507a0653..db160b48dbea 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_ENCAPSULATE 3"
-.TH EVP_PKEY_ENCAPSULATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_ENCAPSULATE 3ossl"
+.TH EVP_PKEY_ENCAPSULATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3
index f13c24ae5e93..3eab08eadd90 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_ENCRYPT 3"
-.TH EVP_PKEY_ENCRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_ENCRYPT 3ossl"
+.TH EVP_PKEY_ENCRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3
index 11beb709764a..ce83fa3a9bc2 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_FROMDATA 3"
-.TH EVP_PKEY_FROMDATA 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_FROMDATA 3ossl"
+.TH EVP_PKEY_FROMDATA 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3
index 8f9642d71d02..af98f7b7e257 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_GET_DEFAULT_DIGEST_NID 3"
-.TH EVP_PKEY_GET_DEFAULT_DIGEST_NID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_GET_DEFAULT_DIGEST_NID 3ossl"
+.TH EVP_PKEY_GET_DEFAULT_DIGEST_NID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_get_field_type.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_get_field_type.3
index 062332401ffb..4df8b498097d 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_get_field_type.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_get_field_type.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_GET_FIELD_TYPE 3"
-.TH EVP_PKEY_GET_FIELD_TYPE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_GET_FIELD_TYPE 3ossl"
+.TH EVP_PKEY_GET_FIELD_TYPE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_get_group_name.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_get_group_name.3
index e8f2227815fe..3abd1cbade7d 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_get_group_name.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_get_group_name.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_GET_GROUP_NAME 3"
-.TH EVP_PKEY_GET_GROUP_NAME 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_GET_GROUP_NAME 3ossl"
+.TH EVP_PKEY_GET_GROUP_NAME 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3
index e71e052997ad..de317fe3b142 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_GET_SIZE 3"
-.TH EVP_PKEY_GET_SIZE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_GET_SIZE 3ossl"
+.TH EVP_PKEY_GET_SIZE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_gettable_params.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_gettable_params.3
index 186feb73c3ed..4e00914d6bd2 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_gettable_params.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_gettable_params.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_GETTABLE_PARAMS 3"
-.TH EVP_PKEY_GETTABLE_PARAMS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_GETTABLE_PARAMS 3ossl"
+.TH EVP_PKEY_GETTABLE_PARAMS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3
index 57b85eaa2f04..35569ce16bc5 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_IS_A 3"
-.TH EVP_PKEY_IS_A 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_IS_A 3ossl"
+.TH EVP_PKEY_IS_A 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3
index 6182edbb310e..a6eee2bc0a18 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_KEYGEN 3"
-.TH EVP_PKEY_KEYGEN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_KEYGEN 3ossl"
+.TH EVP_PKEY_KEYGEN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3
index 1cbfa4cfda37..44e5187945bf 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_METH_GET_COUNT 3"
-.TH EVP_PKEY_METH_GET_COUNT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_METH_GET_COUNT 3ossl"
+.TH EVP_PKEY_METH_GET_COUNT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3
index 441c83d01534..2ecac5c52e5d 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_METH_NEW 3"
-.TH EVP_PKEY_METH_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_METH_NEW 3ossl"
+.TH EVP_PKEY_METH_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_new.3
index 52ab446d4792..ab470f6623c1 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_new.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_NEW 3"
-.TH EVP_PKEY_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_NEW 3ossl"
+.TH EVP_PKEY_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3
index 8640cdc7958e..2b9328c3437c 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_PRINT_PRIVATE 3"
-.TH EVP_PKEY_PRINT_PRIVATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_PRINT_PRIVATE 3ossl"
+.TH EVP_PKEY_PRINT_PRIVATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3
index 3b15dd4a7d8f..2900b37822d2 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_SET1_RSA 3"
-.TH EVP_PKEY_SET1_RSA 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_SET1_RSA 3ossl"
+.TH EVP_PKEY_SET1_RSA 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_set1_encoded_public_key.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_set1_encoded_public_key.3
index 584ca166c928..6c41c97991c5 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_set1_encoded_public_key.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_set1_encoded_public_key.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_SET1_ENCODED_PUBLIC_KEY 3"
-.TH EVP_PKEY_SET1_ENCODED_PUBLIC_KEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_SET1_ENCODED_PUBLIC_KEY 3ossl"
+.TH EVP_PKEY_SET1_ENCODED_PUBLIC_KEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3
index 0698b3fa7661..07f350442282 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_SET_TYPE 3"
-.TH EVP_PKEY_SET_TYPE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_SET_TYPE 3ossl"
+.TH EVP_PKEY_SET_TYPE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_settable_params.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_settable_params.3
index 3fc3be0ad8ef..bc177df347de 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_settable_params.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_settable_params.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_SETTABLE_PARAMS 3"
-.TH EVP_PKEY_SETTABLE_PARAMS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_SETTABLE_PARAMS 3ossl"
+.TH EVP_PKEY_SETTABLE_PARAMS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3
index 916681c8eefb..f291640dbf0a 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_SIGN 3"
-.TH EVP_PKEY_SIGN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_SIGN 3ossl"
+.TH EVP_PKEY_SIGN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3
index 5bb8bb3806b3..1079f885d09f 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_TODATA 3"
-.TH EVP_PKEY_TODATA 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_TODATA 3ossl"
+.TH EVP_PKEY_TODATA 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3
index ce66a986875a..5839b8aace20 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_VERIFY 3"
-.TH EVP_PKEY_VERIFY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_VERIFY 3ossl"
+.TH EVP_PKEY_VERIFY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3 b/secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3
index 9473ddd53a98..17b9c383c232 100644
--- a/secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3
+++ b/secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY_VERIFY_RECOVER 3"
-.TH EVP_PKEY_VERIFY_RECOVER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY_VERIFY_RECOVER 3ossl"
+.TH EVP_PKEY_VERIFY_RECOVER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_RAND.3 b/secure/lib/libcrypto/man/man3/EVP_RAND.3
index a56e3c2944d5..7a11c95bd089 100644
--- a/secure/lib/libcrypto/man/man3/EVP_RAND.3
+++ b/secure/lib/libcrypto/man/man3/EVP_RAND.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_RAND 3"
-.TH EVP_RAND 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_RAND 3ossl"
+.TH EVP_RAND 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3 b/secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3
index 4f75205c74e2..45e52e3577ba 100644
--- a/secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3
+++ b/secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SIGNATURE 3"
-.TH EVP_SIGNATURE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SIGNATURE 3ossl"
+.TH EVP_SIGNATURE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -198,7 +198,7 @@ algorithm that's identifiable with \fIname\fR, otherwise 0.
 fetched from.
 .PP
 \&\fBEVP_SIGNATURE_do_all_provided()\fR traverses all \s-1SIGNATURE\s0 implemented by all
-activated roviders in the given library context \fIlibctx\fR, and for each of the
+activated providers in the given library context \fIlibctx\fR, and for each of the
 implementations, calls the given function \fIfn\fR with the implementation method
 and the given \fIarg\fR as argument.
 .PP
@@ -239,7 +239,7 @@ return a constant \s-1\fBOSSL_PARAM\s0\fR\|(3) array or \s-1NULL\s0 on error.
 The functions described here were added in OpenSSL 3.0.
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2019\-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/lib/libcrypto/man/man3/EVP_SealInit.3 b/secure/lib/libcrypto/man/man3/EVP_SealInit.3
index 3704a098f265..8fd303de1788 100644
--- a/secure/lib/libcrypto/man/man3/EVP_SealInit.3
+++ b/secure/lib/libcrypto/man/man3/EVP_SealInit.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SEALINIT 3"
-.TH EVP_SEALINIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SEALINIT 3ossl"
+.TH EVP_SEALINIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_SignInit.3 b/secure/lib/libcrypto/man/man3/EVP_SignInit.3
index c62215663730..1c7a7bf36ac4 100644
--- a/secure/lib/libcrypto/man/man3/EVP_SignInit.3
+++ b/secure/lib/libcrypto/man/man3/EVP_SignInit.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SIGNINIT 3"
-.TH EVP_SIGNINIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SIGNINIT 3ossl"
+.TH EVP_SIGNINIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 b/secure/lib/libcrypto/man/man3/EVP_VerifyInit.3
index e234c5f2443a..13733fec09bf 100644
--- a/secure/lib/libcrypto/man/man3/EVP_VerifyInit.3
+++ b/secure/lib/libcrypto/man/man3/EVP_VerifyInit.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_VERIFYINIT 3"
-.TH EVP_VERIFYINIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_VERIFYINIT 3ossl"
+.TH EVP_VERIFYINIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3 b/secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3
index 60cf3598bd5e..58c26e779a90 100644
--- a/secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3
+++ b/secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_AES_128_GCM 3"
-.TH EVP_AES_128_GCM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_AES_128_GCM 3ossl"
+.TH EVP_AES_128_GCM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3 b/secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3
index 1527c73efacb..84cc8e88b4bf 100644
--- a/secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3
+++ b/secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_ARIA_128_GCM 3"
-.TH EVP_ARIA_128_GCM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_ARIA_128_GCM 3ossl"
+.TH EVP_ARIA_128_GCM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 b/secure/lib/libcrypto/man/man3/EVP_bf_cbc.3
index b3772130b105..a5ea45845fe4 100644
--- a/secure/lib/libcrypto/man/man3/EVP_bf_cbc.3
+++ b/secure/lib/libcrypto/man/man3/EVP_bf_cbc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_BF_CBC 3"
-.TH EVP_BF_CBC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_BF_CBC 3ossl"
+.TH EVP_BF_CBC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_blake2b512.3 b/secure/lib/libcrypto/man/man3/EVP_blake2b512.3
index b47a3442d186..faab92b10f74 100644
--- a/secure/lib/libcrypto/man/man3/EVP_blake2b512.3
+++ b/secure/lib/libcrypto/man/man3/EVP_blake2b512.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_BLAKE2B512 3"
-.TH EVP_BLAKE2B512 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_BLAKE2B512 3ossl"
+.TH EVP_BLAKE2B512 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_camellia_128_ecb.3 b/secure/lib/libcrypto/man/man3/EVP_camellia_128_ecb.3
index 42fa2d0221fc..d4d1ed18623c 100644
--- a/secure/lib/libcrypto/man/man3/EVP_camellia_128_ecb.3
+++ b/secure/lib/libcrypto/man/man3/EVP_camellia_128_ecb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CAMELLIA_128_ECB 3"
-.TH EVP_CAMELLIA_128_ECB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CAMELLIA_128_ECB 3ossl"
+.TH EVP_CAMELLIA_128_ECB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 b/secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3
index a1840747c553..a0c1c0fdf486 100644
--- a/secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3
+++ b/secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CAST5_CBC 3"
-.TH EVP_CAST5_CBC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CAST5_CBC 3ossl"
+.TH EVP_CAST5_CBC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_chacha20.3 b/secure/lib/libcrypto/man/man3/EVP_chacha20.3
index e282d88e7c1c..47ce5af67906 100644
--- a/secure/lib/libcrypto/man/man3/EVP_chacha20.3
+++ b/secure/lib/libcrypto/man/man3/EVP_chacha20.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CHACHA20 3"
-.TH EVP_CHACHA20 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CHACHA20 3ossl"
+.TH EVP_CHACHA20 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_des_cbc.3 b/secure/lib/libcrypto/man/man3/EVP_des_cbc.3
index 06f60dab1786..7b74fad4abd7 100644
--- a/secure/lib/libcrypto/man/man3/EVP_des_cbc.3
+++ b/secure/lib/libcrypto/man/man3/EVP_des_cbc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_DES_CBC 3"
-.TH EVP_DES_CBC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_DES_CBC 3ossl"
+.TH EVP_DES_CBC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 b/secure/lib/libcrypto/man/man3/EVP_desx_cbc.3
index 481747f87d7c..218742bd6404 100644
--- a/secure/lib/libcrypto/man/man3/EVP_desx_cbc.3
+++ b/secure/lib/libcrypto/man/man3/EVP_desx_cbc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_DESX_CBC 3"
-.TH EVP_DESX_CBC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_DESX_CBC 3ossl"
+.TH EVP_DESX_CBC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 b/secure/lib/libcrypto/man/man3/EVP_idea_cbc.3
index 9d1737c140c7..e2eb0d5b9e13 100644
--- a/secure/lib/libcrypto/man/man3/EVP_idea_cbc.3
+++ b/secure/lib/libcrypto/man/man3/EVP_idea_cbc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_IDEA_CBC 3"
-.TH EVP_IDEA_CBC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_IDEA_CBC 3ossl"
+.TH EVP_IDEA_CBC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_md2.3 b/secure/lib/libcrypto/man/man3/EVP_md2.3
index 80c934f372d9..c8761eee8a47 100644
--- a/secure/lib/libcrypto/man/man3/EVP_md2.3
+++ b/secure/lib/libcrypto/man/man3/EVP_md2.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD2 3"
-.TH EVP_MD2 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD2 3ossl"
+.TH EVP_MD2 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_md4.3 b/secure/lib/libcrypto/man/man3/EVP_md4.3
index 8d34b717ca86..8b5b719e1d92 100644
--- a/secure/lib/libcrypto/man/man3/EVP_md4.3
+++ b/secure/lib/libcrypto/man/man3/EVP_md4.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD4 3"
-.TH EVP_MD4 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD4 3ossl"
+.TH EVP_MD4 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_md5.3 b/secure/lib/libcrypto/man/man3/EVP_md5.3
index 6b636d32a62f..b9b4cd6faa98 100644
--- a/secure/lib/libcrypto/man/man3/EVP_md5.3
+++ b/secure/lib/libcrypto/man/man3/EVP_md5.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD5 3"
-.TH EVP_MD5 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD5 3ossl"
+.TH EVP_MD5 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_mdc2.3 b/secure/lib/libcrypto/man/man3/EVP_mdc2.3
index 03101babd529..37694c41d1fa 100644
--- a/secure/lib/libcrypto/man/man3/EVP_mdc2.3
+++ b/secure/lib/libcrypto/man/man3/EVP_mdc2.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MDC2 3"
-.TH EVP_MDC2 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MDC2 3ossl"
+.TH EVP_MDC2 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 b/secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3
index 477e9f6dd1ce..c3be4cad9e6d 100644
--- a/secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3
+++ b/secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_RC2_CBC 3"
-.TH EVP_RC2_CBC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_RC2_CBC 3ossl"
+.TH EVP_RC2_CBC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_rc4.3 b/secure/lib/libcrypto/man/man3/EVP_rc4.3
index 7c51e0d26842..523b560486f9 100644
--- a/secure/lib/libcrypto/man/man3/EVP_rc4.3
+++ b/secure/lib/libcrypto/man/man3/EVP_rc4.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_RC4 3"
-.TH EVP_RC4 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_RC4 3ossl"
+.TH EVP_RC4 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 b/secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3
index b4188435d1cd..1cffaa77dfc5 100644
--- a/secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3
+++ b/secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_RC5_32_12_16_CBC 3"
-.TH EVP_RC5_32_12_16_CBC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_RC5_32_12_16_CBC 3ossl"
+.TH EVP_RC5_32_12_16_CBC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_ripemd160.3 b/secure/lib/libcrypto/man/man3/EVP_ripemd160.3
index 282f142e2c46..019b27b7d36f 100644
--- a/secure/lib/libcrypto/man/man3/EVP_ripemd160.3
+++ b/secure/lib/libcrypto/man/man3/EVP_ripemd160.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_RIPEMD160 3"
-.TH EVP_RIPEMD160 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_RIPEMD160 3ossl"
+.TH EVP_RIPEMD160 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 b/secure/lib/libcrypto/man/man3/EVP_seed_cbc.3
index f919c7730b27..cc47094d1983 100644
--- a/secure/lib/libcrypto/man/man3/EVP_seed_cbc.3
+++ b/secure/lib/libcrypto/man/man3/EVP_seed_cbc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SEED_CBC 3"
-.TH EVP_SEED_CBC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SEED_CBC 3ossl"
+.TH EVP_SEED_CBC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_set_default_properties.3 b/secure/lib/libcrypto/man/man3/EVP_set_default_properties.3
index 3809a9af8fb1..e392eca6bc4d 100644
--- a/secure/lib/libcrypto/man/man3/EVP_set_default_properties.3
+++ b/secure/lib/libcrypto/man/man3/EVP_set_default_properties.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SET_DEFAULT_PROPERTIES 3"
-.TH EVP_SET_DEFAULT_PROPERTIES 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SET_DEFAULT_PROPERTIES 3ossl"
+.TH EVP_SET_DEFAULT_PROPERTIES 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_sha1.3 b/secure/lib/libcrypto/man/man3/EVP_sha1.3
index 21942d9c0298..dfe07abaab63 100644
--- a/secure/lib/libcrypto/man/man3/EVP_sha1.3
+++ b/secure/lib/libcrypto/man/man3/EVP_sha1.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SHA1 3"
-.TH EVP_SHA1 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SHA1 3ossl"
+.TH EVP_SHA1 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_sha224.3 b/secure/lib/libcrypto/man/man3/EVP_sha224.3
index ea869fe60cfd..c0076de4cc54 100644
--- a/secure/lib/libcrypto/man/man3/EVP_sha224.3
+++ b/secure/lib/libcrypto/man/man3/EVP_sha224.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SHA224 3"
-.TH EVP_SHA224 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SHA224 3ossl"
+.TH EVP_SHA224 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_sha3_224.3 b/secure/lib/libcrypto/man/man3/EVP_sha3_224.3
index 96848f2db565..97d9636022db 100644
--- a/secure/lib/libcrypto/man/man3/EVP_sha3_224.3
+++ b/secure/lib/libcrypto/man/man3/EVP_sha3_224.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SHA3_224 3"
-.TH EVP_SHA3_224 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SHA3_224 3ossl"
+.TH EVP_SHA3_224 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_sm3.3 b/secure/lib/libcrypto/man/man3/EVP_sm3.3
index 1e6237695efe..58f6ca87b5d3 100644
--- a/secure/lib/libcrypto/man/man3/EVP_sm3.3
+++ b/secure/lib/libcrypto/man/man3/EVP_sm3.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SM3 3"
-.TH EVP_SM3 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SM3 3ossl"
+.TH EVP_SM3 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 b/secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3
index d9f1ee7ce099..b093180e6503 100644
--- a/secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3
+++ b/secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SM4_CBC 3"
-.TH EVP_SM4_CBC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SM4_CBC 3ossl"
+.TH EVP_SM4_CBC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/EVP_whirlpool.3 b/secure/lib/libcrypto/man/man3/EVP_whirlpool.3
index 5230a804b123..d4179166f63b 100644
--- a/secure/lib/libcrypto/man/man3/EVP_whirlpool.3
+++ b/secure/lib/libcrypto/man/man3/EVP_whirlpool.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_WHIRLPOOL 3"
-.TH EVP_WHIRLPOOL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_WHIRLPOOL 3ossl"
+.TH EVP_WHIRLPOOL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/HMAC.3 b/secure/lib/libcrypto/man/man3/HMAC.3
index 41e3e4ca1a31..0533d337839d 100644
--- a/secure/lib/libcrypto/man/man3/HMAC.3
+++ b/secure/lib/libcrypto/man/man3/HMAC.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "HMAC 3"
-.TH HMAC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "HMAC 3ossl"
+.TH HMAC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/MD5.3 b/secure/lib/libcrypto/man/man3/MD5.3
index 267273cee86c..f3e3eceb0bca 100644
--- a/secure/lib/libcrypto/man/man3/MD5.3
+++ b/secure/lib/libcrypto/man/man3/MD5.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "MD5 3"
-.TH MD5 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "MD5 3ossl"
+.TH MD5 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/MDC2_Init.3 b/secure/lib/libcrypto/man/man3/MDC2_Init.3
index 7ca911893795..23f57347919d 100644
--- a/secure/lib/libcrypto/man/man3/MDC2_Init.3
+++ b/secure/lib/libcrypto/man/man3/MDC2_Init.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "MDC2_INIT 3"
-.TH MDC2_INIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "MDC2_INIT 3ossl"
+.TH MDC2_INIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/NCONF_new_ex.3 b/secure/lib/libcrypto/man/man3/NCONF_new_ex.3
index accf37822161..d6f6f7f058bf 100644
--- a/secure/lib/libcrypto/man/man3/NCONF_new_ex.3
+++ b/secure/lib/libcrypto/man/man3/NCONF_new_ex.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "NCONF_NEW_EX 3"
-.TH NCONF_NEW_EX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "NCONF_NEW_EX 3ossl"
+.TH NCONF_NEW_EX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 b/secure/lib/libcrypto/man/man3/OBJ_nid2obj.3
index 68ca630d958e..7601bb762e50 100644
--- a/secure/lib/libcrypto/man/man3/OBJ_nid2obj.3
+++ b/secure/lib/libcrypto/man/man3/OBJ_nid2obj.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OBJ_NID2OBJ 3"
-.TH OBJ_NID2OBJ 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OBJ_NID2OBJ 3ossl"
+.TH OBJ_NID2OBJ 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 b/secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3
index e96b15362059..0f2a185ed7b9 100644
--- a/secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3
+++ b/secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OCSP_REQUEST_NEW 3"
-.TH OCSP_REQUEST_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OCSP_REQUEST_NEW 3ossl"
+.TH OCSP_REQUEST_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 b/secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3
index 8e6e94d6a631..fbe737b73e65 100644
--- a/secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3
+++ b/secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OCSP_CERT_TO_ID 3"
-.TH OCSP_CERT_TO_ID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OCSP_CERT_TO_ID 3ossl"
+.TH OCSP_CERT_TO_ID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3 b/secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3
index 1cedb59a63ce..ef0e03c00cdc 100644
--- a/secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3
+++ b/secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OCSP_REQUEST_ADD1_NONCE 3"
-.TH OCSP_REQUEST_ADD1_NONCE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OCSP_REQUEST_ADD1_NONCE 3ossl"
+.TH OCSP_REQUEST_ADD1_NONCE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3 b/secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3
index 4584d6e380c6..7b18ba5da284 100644
--- a/secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3
+++ b/secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OCSP_RESP_FIND_STATUS 3"
-.TH OCSP_RESP_FIND_STATUS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OCSP_RESP_FIND_STATUS 3ossl"
+.TH OCSP_RESP_FIND_STATUS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OCSP_response_status.3 b/secure/lib/libcrypto/man/man3/OCSP_response_status.3
index cede3381bb0f..607f89892cdb 100644
--- a/secure/lib/libcrypto/man/man3/OCSP_response_status.3
+++ b/secure/lib/libcrypto/man/man3/OCSP_response_status.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OCSP_RESPONSE_STATUS 3"
-.TH OCSP_RESPONSE_STATUS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OCSP_RESPONSE_STATUS 3ossl"
+.TH OCSP_RESPONSE_STATUS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 b/secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3
index 44ada10450c5..52ec562c1816 100644
--- a/secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3
+++ b/secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OCSP_SENDREQ_NEW 3"
-.TH OCSP_SENDREQ_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OCSP_SENDREQ_NEW 3ossl"
+.TH OCSP_SENDREQ_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 b/secure/lib/libcrypto/man/man3/OPENSSL_Applink.3
index b16b61f2b5c4..44061624bb0a 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_Applink.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_Applink.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_APPLINK 3"
-.TH OPENSSL_APPLINK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_APPLINK 3ossl"
+.TH OPENSSL_APPLINK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_FILE.3 b/secure/lib/libcrypto/man/man3/OPENSSL_FILE.3
index d7dec3b4d2c4..b1af613c57c8 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_FILE.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_FILE.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_FILE 3"
-.TH OPENSSL_FILE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_FILE 3ossl"
+.TH OPENSSL_FILE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 b/secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3
index a96526e9bf1e..d5d22bcb5207 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_LH_COMPFUNC 3"
-.TH OPENSSL_LH_COMPFUNC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_LH_COMPFUNC 3ossl"
+.TH OPENSSL_LH_COMPFUNC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 b/secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3
index 5b18cb555ee6..0c54474c90c8 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_LH_STATS 3"
-.TH OPENSSL_LH_STATS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_LH_STATS 3ossl"
+.TH OPENSSL_LH_STATS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_config.3 b/secure/lib/libcrypto/man/man3/OPENSSL_config.3
index be2cbe20d1a7..6db68bc182f9 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_config.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_config.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_CONFIG 3"
-.TH OPENSSL_CONFIG 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_CONFIG 3ossl"
+.TH OPENSSL_CONFIG 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 b/secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3
index 750af5065fd4..d83b2428371c 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_FORK_PREPARE 3"
-.TH OPENSSL_FORK_PREPARE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_FORK_PREPARE 3ossl"
+.TH OPENSSL_FORK_PREPARE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3 b/secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3
index 885ed22067e7..a0bba85a10a2 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_GMTIME 3"
-.TH OPENSSL_GMTIME 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_GMTIME 3ossl"
+.TH OPENSSL_GMTIME 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_hexchar2int.3 b/secure/lib/libcrypto/man/man3/OPENSSL_hexchar2int.3
index c3034fc60e57..34944aae9e79 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_hexchar2int.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_hexchar2int.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_HEXCHAR2INT 3"
-.TH OPENSSL_HEXCHAR2INT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_HEXCHAR2INT 3ossl"
+.TH OPENSSL_HEXCHAR2INT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 b/secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3
index 0ca7968a643b..1f75a3f14855 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_IA32CAP 3"
-.TH OPENSSL_IA32CAP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_IA32CAP 3ossl"
+.TH OPENSSL_IA32CAP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3 b/secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3
index d347df2207af..dd6303c66ac2 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_INIT_CRYPTO 3"
-.TH OPENSSL_INIT_CRYPTO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_INIT_CRYPTO 3ossl"
+.TH OPENSSL_INIT_CRYPTO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 b/secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3
index 9656bd64bd3b..e630e59e509b 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_INIT_SSL 3"
-.TH OPENSSL_INIT_SSL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_INIT_SSL 3ossl"
+.TH OPENSSL_INIT_SSL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3 b/secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3
index dbeb0718dfeb..0596ac6e9865 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_INSTRUMENT_BUS 3"
-.TH OPENSSL_INSTRUMENT_BUS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_INSTRUMENT_BUS 3ossl"
+.TH OPENSSL_INSTRUMENT_BUS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3 b/secure/lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3
index 1744a5c0be7f..7dea4dda0d81 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_LOAD_BUILTIN_MODULES 3"
-.TH OPENSSL_LOAD_BUILTIN_MODULES 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_LOAD_BUILTIN_MODULES 3ossl"
+.TH OPENSSL_LOAD_BUILTIN_MODULES 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 b/secure/lib/libcrypto/man/man3/OPENSSL_malloc.3
index bb8facc48791..aaec5a81058a 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_malloc.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_malloc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_MALLOC 3"
-.TH OPENSSL_MALLOC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_MALLOC 3ossl"
+.TH OPENSSL_MALLOC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3 b/secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3
index a2fc53073dd7..30438dff82c0 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_S390XCAP 3"
-.TH OPENSSL_S390XCAP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_S390XCAP 3ossl"
+.TH OPENSSL_S390XCAP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 b/secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3
index 078bcdae9a75..7a25c0294ea1 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_SECURE_MALLOC 3"
-.TH OPENSSL_SECURE_MALLOC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_SECURE_MALLOC 3ossl"
+.TH OPENSSL_SECURE_MALLOC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3 b/secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3
index c6e520a79de0..37460d041079 100644
--- a/secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3
+++ b/secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_STRCASECMP 3"
-.TH OPENSSL_STRCASECMP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_STRCASECMP 3ossl"
+.TH OPENSSL_STRCASECMP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3 b/secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3
index fe30f789feae..5b49457beb15 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_ALGORITHM 3"
-.TH OSSL_ALGORITHM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_ALGORITHM 3ossl"
+.TH OSSL_ALGORITHM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3 b/secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3
index 01ba1d310ee6..dbc4b0224a78 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CALLBACK 3"
-.TH OSSL_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CALLBACK 3ossl"
+.TH OSSL_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3 b/secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3
index 262a8e2cfe60..bac566df4b2b 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CMP_CTX_NEW 3"
-.TH OSSL_CMP_CTX_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CMP_CTX_NEW 3ossl"
+.TH OSSL_CMP_CTX_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -319,7 +319,7 @@ clearing the internal \s-1CMP\s0 transaction (aka session) status, PKIStatusInfo
 and any previous results (newCert, newChain, caPubs, and extraCertsIn)
 from the last executed transaction.
 It also clears any ITAVs that were added by \fBOSSL_CMP_CTX_push0_genm_ITAV()\fR.
-All other field values (i.e., \s-1CMP\s0 options) are retained for potential re-use.
+All other field values (i.e., \s-1CMP\s0 options) are retained for potential reuse.
 .PP
 \&\fBOSSL_CMP_CTX_set_option()\fR sets the given value for the given option
 (e.g., \s-1OSSL_CMP_OPT_IMPLICIT_CONFIRM\s0) in the given \s-1OSSL_CMP_CTX\s0 structure.
@@ -402,11 +402,11 @@ The following options can be set:
 \&        for signature\-based message protection and Proof\-of\-Possession (POPO).
 \&        Default is SHA256.
 .Ve
-.IP "\fB\s-1OSSL_CMP_OPT_OWF_ALGNID\s0\fR The \s-1NID\s0 of the digest algorithm to be used as one-way function (\s-1OWF\s0) in \s-1RFC 4210\s0's \s-1MSG_MAC_ALG\s0 for PBM-based message protection. Default is \s-1SHA256.\s0" 4
-.IX Item "OSSL_CMP_OPT_OWF_ALGNID The NID of the digest algorithm to be used as one-way function (OWF) in RFC 4210's MSG_MAC_ALG for PBM-based message protection. Default is SHA256."
+.IP "\fB\s-1OSSL_CMP_OPT_OWF_ALGNID\s0\fR The \s-1NID\s0 of the digest algorithm to be used as one-way function (\s-1OWF\s0) for MAC-based message protection with password-based \s-1MAC\s0 (\s-1PBM\s0). See \s-1RFC 4210\s0 section 5.1.3.1 for details. Default is \s-1SHA256.\s0" 4
+.IX Item "OSSL_CMP_OPT_OWF_ALGNID The NID of the digest algorithm to be used as one-way function (OWF) for MAC-based message protection with password-based MAC (PBM). See RFC 4210 section 5.1.3.1 for details. Default is SHA256."
 .PD 0
-.IP "\fB\s-1OSSL_CMP_OPT_MAC_ALGNID\s0\fR The \s-1NID\s0 of the \s-1MAC\s0 algorithm to be used in \s-1RFC 4210\s0's \s-1MSG_MAC_ALG\s0 for PBM-based message protection. Default is \s-1HMAC\-SHA1\s0 as per \s-1RFC 4210.\s0" 4
-.IX Item "OSSL_CMP_OPT_MAC_ALGNID The NID of the MAC algorithm to be used in RFC 4210's MSG_MAC_ALG for PBM-based message protection. Default is HMAC-SHA1 as per RFC 4210."
+.IP "\fB\s-1OSSL_CMP_OPT_MAC_ALGNID\s0\fR The \s-1NID\s0 of the \s-1MAC\s0 algorithm to be used for message protection with \s-1PBM.\s0 Default is \s-1HMAC\-SHA1\s0 as per \s-1RFC 4210.\s0" 4
+.IX Item "OSSL_CMP_OPT_MAC_ALGNID The NID of the MAC algorithm to be used for message protection with PBM. Default is HMAC-SHA1 as per RFC 4210."
 .IP "\fB\s-1OSSL_CMP_OPT_REVOCATION_REASON\s0\fR" 4
 .IX Item "OSSL_CMP_OPT_REVOCATION_REASON"
 .PD
@@ -600,8 +600,8 @@ The reference counts of those certificates handled successfully are increased.
 OSSL_CMP_CTX_get0_untrusted(\s-1OSSL_CMP_CTX\s0 *ctx) returns a pointer to the
 list of untrusted certs, which may be empty if unset.
 .PP
-\&\fBOSSL_CMP_CTX_set1_cert()\fR sets the \s-1CMP\s0 signer certificate
-related to the private key used for \s-1CMP\s0 message protection.
+\&\fBOSSL_CMP_CTX_set1_cert()\fR sets the \s-1CMP\s0 signer certificate, also called protection
+certificate, related to the private key for signature-based message protection.
 Therefore the public key of this \fIcert\fR must correspond to
 the private key set before or thereafter via \fBOSSL_CMP_CTX_set1_pkey()\fR.
 When using signature-based protection of \s-1CMP\s0 request messages
@@ -631,15 +631,15 @@ with the \fIcandidates\fR and \fIown_trusted\fR arguments being \s-1NULL.\s0
 \&\s-1CMP\s0 signer certificate set via \fBOSSL_CMP_CTX_set1_cert()\fR.
 This key is used create signature-based protection (protectionAlg = \s-1MSG_SIG_ALG\s0)
 of outgoing messages
-unless a \s-1PBM\s0 secret has been set via \fBOSSL_CMP_CTX_set1_secretValue()\fR.
+unless a symmetric secret has been set via \fBOSSL_CMP_CTX_set1_secretValue()\fR.
 The \fIpkey\fR argument may be \s-1NULL\s0 to clear the entry.
 .PP
-\&\fBOSSL_CMP_CTX_set1_secretValue()\fR sets the byte string \fIsec\fR with length \fIlen\fR
-as \s-1PBM\s0 secret in the given \fIctx\fR or clears it if the \fIsec\fR argument is \s-1NULL.\s0
-If present, this secret is used to create PBM-based protection of outgoing
-messages and to verify any PBM-based protection of incoming messages
-(protectionAlg = \s-1MSG_MAC_ALG\s0). \s-1PBM\s0 stands for Password-Based \s-1MAC.\s0
-PBM-based protection takes precedence over signature-based protection.
+\&\fBOSSL_CMP_CTX_set1_secretValue()\fR sets in \fIctx\fR the byte string \fIsec\fR of length
+\&\fIlen\fR to use as pre-shared secret, or clears it if the \fIsec\fR argument is \s-1NULL.\s0
+If present, this secret is used to create MAC-based authentication and integrity
+protection (rather than applying signature-based protection)
+of outgoing messages and to verify authenticity and integrity of incoming
+messages that have MAC-based protection (protectionAlg = \f(CW\*(C`MSG_MAC_ALG\*(C'\fR).
 .PP
 \&\fBOSSL_CMP_CTX_set1_referenceValue()\fR sets the given referenceValue \fIref\fR with
 length \fIlen\fR in the given \fIctx\fR or clears it if the \fIref\fR argument is \s-1NULL.\s0
@@ -650,7 +650,7 @@ then the sender field will contain the NULL-DN
 and the senderKID field of the \s-1CMP\s0 message header must be set.
 When signature-based protection is used the senderKID will be set to
 the subjectKeyIdentifier of the \s-1CMP\s0 signer certificate as far as present.
-If not present or when PBM-based protection is used
+If not present or when MAC-based protection is used
 the \fIref\fR value is taken as the fallback value for the senderKID.
 .PP
 \&\fBOSSL_CMP_CTX_set1_recipient()\fR sets the recipient name that will be used in the
@@ -875,7 +875,7 @@ Set up a \s-1CMP\s0 client context for sending requests and verifying responses:
 \&    OSSL_CMP_CTX_set0_trustedStore(cmp_ctx, ts);
 .Ve
 .PP
-Set up client credentials for password-based protection (\s-1PBM\s0):
+Set up symmetric credentials for MAC-based message protection such as \s-1PBM:\s0
 .PP
 .Vb 2
 \&    OSSL_CMP_CTX_set1_referenceValue(cmp_ctx, ref, ref_len);
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CMP_HDR_get0_transactionID.3 b/secure/lib/libcrypto/man/man3/OSSL_CMP_HDR_get0_transactionID.3
index a46dde4335b1..1425b4f9333a 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CMP_HDR_get0_transactionID.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CMP_HDR_get0_transactionID.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CMP_HDR_GET0_TRANSACTIONID 3"
-.TH OSSL_CMP_HDR_GET0_TRANSACTIONID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CMP_HDR_GET0_TRANSACTIONID 3ossl"
+.TH OSSL_CMP_HDR_GET0_TRANSACTIONID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3 b/secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3
index cc6cf1deb6fb..95f156016617 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CMP_ITAV_SET0 3"
-.TH OSSL_CMP_ITAV_SET0 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CMP_ITAV_SET0 3ossl"
+.TH OSSL_CMP_ITAV_SET0 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3 b/secure/lib/libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3
index 84203f61a7c2..69b8247af015 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CMP_MSG_GET0_HEADER 3"
-.TH OSSL_CMP_MSG_GET0_HEADER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CMP_MSG_GET0_HEADER 3ossl"
+.TH OSSL_CMP_MSG_GET0_HEADER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3 b/secure/lib/libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3
index 63f6a301f625..ad586192eca9 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CMP_MSG_HTTP_PERFORM 3"
-.TH OSSL_CMP_MSG_HTTP_PERFORM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CMP_MSG_HTTP_PERFORM 3ossl"
+.TH OSSL_CMP_MSG_HTTP_PERFORM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3 b/secure/lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3
index 8889ab60a7e0..cf32a6ef8daf 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CMP_SRV_CTX_NEW 3"
-.TH OSSL_CMP_SRV_CTX_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CMP_SRV_CTX_NEW 3ossl"
+.TH OSSL_CMP_SRV_CTX_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3 b/secure/lib/libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3
index 7d193875c03d..069e85939d54 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CMP_STATUSINFO_NEW 3"
-.TH OSSL_CMP_STATUSINFO_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CMP_STATUSINFO_NEW 3ossl"
+.TH OSSL_CMP_STATUSINFO_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3 b/secure/lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3
index 83052e8cb78f..bd329718f338 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CMP_EXEC_CERTREQ 3"
-.TH OSSL_CMP_EXEC_CERTREQ 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CMP_EXEC_CERTREQ 3ossl"
+.TH OSSL_CMP_EXEC_CERTREQ 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -179,7 +179,7 @@ client-server transactions, i.e., sequences of \s-1CMP\s0 requests and responses
 .PP
 All functions take a populated \s-1OSSL_CMP_CTX\s0 structure as their first argument.
 Usually the server name, port, and path (\*(L"\s-1CMP\s0 alias\*(R") need to be set, as well as
-credentials the client can use for authenticating itself to the client.
+credentials the client can use for authenticating itself to the server.
 In order to authenticate the server the client typically needs a trust store.
 The functions return their respective main results directly, while there are
 also accessor functions for retrieving various results and status information
@@ -209,7 +209,7 @@ and need to be filled in using \fBOSSL_CMP_CTX_set1_subjectName\fR\|(3),
 \&\fBOSSL_CMP_CTX_set0_newPkey\fR\|(3), \fBOSSL_CMP_CTX_set1_oldCert\fR\|(3), etc.
 For P10CR, \fBOSSL_CMP_CTX_set1_p10CSR\fR\|(3) needs to be used instead.
 The enrollment session may be blocked by sleeping until the addressed
-\&\s-1CA\s0 (or an intermedate \s-1PKI\s0 component) can fully process and answer the request.
+\&\s-1CA\s0 (or an intermediate \s-1PKI\s0 component) can fully process and answer the request.
 .PP
 \&\fBOSSL_CMP_try_certreq()\fR is an alternative to the above functions that is
 more flexible regarding what to do after receiving a checkAfter value.
@@ -255,8 +255,16 @@ See \s-1RFC 4210\s0 section 5.3.19 and appendix E.5 for details.
 .IX Header "NOTES"
 \&\s-1CMP\s0 is defined in \s-1RFC 4210\s0 (and \s-1CRMF\s0 in \s-1RFC 4211\s0).
 .PP
-So far the \s-1CMP\s0 client implementation is limited to one request per \s-1CMP\s0 message
+The \s-1CMP\s0 client implementation is limited to one request per \s-1CMP\s0 message
 (and consequently to at most one response component per \s-1CMP\s0 message).
+.PP
+When a client obtains from a \s-1CMP\s0 server \s-1CA\s0 certificates that it is going to
+trust, for instance via the caPubs field of a certificate response,
+authentication of the \s-1CMP\s0 server is particularly critical.
+So special care must be taken setting up server authentication in \fIctx\fR
+using functions such as
+\&\fBOSSL_CMP_CTX_set0_trustedStore\fR\|(3) (for certificate-based authentication) or
+\&\fBOSSL_CMP_CTX_set1_secretValue\fR\|(3) (for MAC-based protection).
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
 \&\fBOSSL_CMP_exec_certreq()\fR, \fBOSSL_CMP_exec_IR_ses()\fR, \fBOSSL_CMP_exec_CR_ses()\fR,
@@ -294,7 +302,7 @@ functions.
 The OpenSSL \s-1CMP\s0 support was added in OpenSSL 3.0.
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2007\-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3 b/secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3
index 4e24e004bc72..e34f6e943069 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CMP_LOG_OPEN 3"
-.TH OSSL_CMP_LOG_OPEN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CMP_LOG_OPEN 3ossl"
+.TH OSSL_CMP_LOG_OPEN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3 b/secure/lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3
index a29a27b9a4fc..521150612d5e 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CMP_VALIDATE_MSG 3"
-.TH OSSL_CMP_VALIDATE_MSG 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CMP_VALIDATE_MSG 3ossl"
+.TH OSSL_CMP_VALIDATE_MSG 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3 b/secure/lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3
index 8fe08cfe18ef..4fe5cfa74e7d 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CORE_MAKE_FUNC 3"
-.TH OSSL_CORE_MAKE_FUNC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CORE_MAKE_FUNC 3ossl"
+.TH OSSL_CORE_MAKE_FUNC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3 b/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3
index 70d542fd06da..a64b5018879e 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CRMF_MSG_GET0_TMPL 3"
-.TH OSSL_CRMF_MSG_GET0_TMPL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CRMF_MSG_GET0_TMPL 3ossl"
+.TH OSSL_CRMF_MSG_GET0_TMPL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set0_validity.3 b/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set0_validity.3
index b60cf02a176b..bd863301e02e 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set0_validity.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set0_validity.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CRMF_MSG_SET0_VALIDITY 3"
-.TH OSSL_CRMF_MSG_SET0_VALIDITY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CRMF_MSG_SET0_VALIDITY 3ossl"
+.TH OSSL_CRMF_MSG_SET0_VALIDITY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3 b/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3
index 0b4979d48513..ab59cc5b9fab 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CRMF_MSG_SET1_REGCTRL_REGTOKEN 3"
-.TH OSSL_CRMF_MSG_SET1_REGCTRL_REGTOKEN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CRMF_MSG_SET1_REGCTRL_REGTOKEN 3ossl"
+.TH OSSL_CRMF_MSG_SET1_REGCTRL_REGTOKEN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3 b/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3
index bd2ecee287e9..c085ca13b4c1 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CRMF_MSG_SET1_REGINFO_CERTREQ 3"
-.TH OSSL_CRMF_MSG_SET1_REGINFO_CERTREQ 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CRMF_MSG_SET1_REGINFO_CERTREQ 3ossl"
+.TH OSSL_CRMF_MSG_SET1_REGINFO_CERTREQ 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3 b/secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3
index 9a48879c0a01..eb7548e61d1f 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_CRMF_PBMP_NEW 3"
-.TH OSSL_CRMF_PBMP_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_CRMF_PBMP_NEW 3ossl"
+.TH OSSL_CRMF_PBMP_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_DECODER.3 b/secure/lib/libcrypto/man/man3/OSSL_DECODER.3
index 018625ae3290..72067ab56406 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_DECODER.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_DECODER.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_DECODER 3"
-.TH OSSL_DECODER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_DECODER 3ossl"
+.TH OSSL_DECODER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3 b/secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3
index 80143e2f8674..2f4767a7dd6f 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_DECODER_CTX 3"
-.TH OSSL_DECODER_CTX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_DECODER_CTX 3ossl"
+.TH OSSL_DECODER_CTX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX_new_for_pkey.3 b/secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX_new_for_pkey.3
index fc602c18edb2..bb706f6864f0 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX_new_for_pkey.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX_new_for_pkey.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_DECODER_CTX_NEW_FOR_PKEY 3"
-.TH OSSL_DECODER_CTX_NEW_FOR_PKEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_DECODER_CTX_NEW_FOR_PKEY 3ossl"
+.TH OSSL_DECODER_CTX_NEW_FOR_PKEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3 b/secure/lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3
index 921152275756..ff14fe697a2d 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_DECODER_FROM_BIO 3"
-.TH OSSL_DECODER_FROM_BIO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_DECODER_FROM_BIO 3ossl"
+.TH OSSL_DECODER_FROM_BIO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3 b/secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3
index 06eeca69c3c5..94693e5b1d56 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_DISPATCH 3"
-.TH OSSL_DISPATCH 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_DISPATCH 3ossl"
+.TH OSSL_DISPATCH 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_ENCODER.3 b/secure/lib/libcrypto/man/man3/OSSL_ENCODER.3
index 91ca37681141..8bfbf4572bef 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_ENCODER.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_ENCODER.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_ENCODER 3"
-.TH OSSL_ENCODER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_ENCODER 3ossl"
+.TH OSSL_ENCODER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3 b/secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3
index 84e45a027a39..f7120c22287b 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_ENCODER_CTX 3"
-.TH OSSL_ENCODER_CTX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_ENCODER_CTX 3ossl"
+.TH OSSL_ENCODER_CTX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX_new_for_pkey.3 b/secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX_new_for_pkey.3
index 2ca23b9e0392..e7c97210a5d4 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX_new_for_pkey.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX_new_for_pkey.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_ENCODER_CTX_NEW_FOR_PKEY 3"
-.TH OSSL_ENCODER_CTX_NEW_FOR_PKEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_ENCODER_CTX_NEW_FOR_PKEY 3ossl"
+.TH OSSL_ENCODER_CTX_NEW_FOR_PKEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3 b/secure/lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3
index 47f5f7d37156..5ae83a58ee5f 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_ENCODER_TO_BIO 3"
-.TH OSSL_ENCODER_TO_BIO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_ENCODER_TO_BIO 3ossl"
+.TH OSSL_ENCODER_TO_BIO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_ESS_check_signing_certs.3 b/secure/lib/libcrypto/man/man3/OSSL_ESS_check_signing_certs.3
index d91187287a1f..686380d17166 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_ESS_check_signing_certs.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_ESS_check_signing_certs.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_ESS_CHECK_SIGNING_CERTS 3"
-.TH OSSL_ESS_CHECK_SIGNING_CERTS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_ESS_CHECK_SIGNING_CERTS 3ossl"
+.TH OSSL_ESS_CHECK_SIGNING_CERTS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3 b/secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3
index a46207cbbe8d..5679df686ba9 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_HTTP_REQ_CTX 3"
-.TH OSSL_HTTP_REQ_CTX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_HTTP_REQ_CTX 3ossl"
+.TH OSSL_HTTP_REQ_CTX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -209,12 +209,16 @@ which collects the \s-1HTTP\s0 request header lines.
 \&\fBOSSL_HTTP_REQ_CTX_free()\fR frees up the \s-1HTTP\s0 request context \fIrctx\fR.
 The \fIrbio\fR is not free'd, \fIwbio\fR will be free'd if \fIfree_wbio\fR is set.
 .PP
-\&\fBOSSL_HTTP_REQ_CTX_set_request_line()\fR adds the \s-1HTTP\s0 request line to the context.
+\&\fBOSSL_HTTP_REQ_CTX_set_request_line()\fR adds the 1st \s-1HTTP\s0 request line to \fIrctx\fR.
 The \s-1HTTP\s0 method is determined by \fImethod_POST\fR,
 which should be 1 to indicate \f(CW\*(C`POST\*(C'\fR or 0 to indicate \f(CW\*(C`GET\*(C'\fR.
-\&\fIserver\fR and \fIport\fR may be set to indicate a proxy server and port
-that the request should go through, otherwise they should be left \s-1NULL.\s0
-\&\fIpath\fR is the \s-1HTTP\s0 request path; if left \s-1NULL,\s0 \f(CW\*(C`/\*(C'\fR is used.
+\&\fIserver\fR and \fIport\fR may be set to give the server and the optional port that
+an \s-1HTTP\s0 proxy shall forward the request to, otherwise they must be left \s-1NULL.\s0
+\&\fIpath\fR provides the \s-1HTTP\s0 request path; if left \s-1NULL,\s0 \f(CW\*(C`/\*(C'\fR is used.
+For backward compatibility, \fIpath\fR may begin with \f(CW\*(C`http://\*(C'\fR and thus convey
+an absoluteURI. In this case it indicates \s-1HTTP\s0 proxy use and provides also the
+server (and optionally the port) that the proxy shall forward the request to.
+In this case the \fIserver\fR and \fIport\fR arguments must be \s-1NULL.\s0
 .PP
 \&\fBOSSL_HTTP_REQ_CTX_add1_header()\fR adds header \fIname\fR with value \fIvalue\fR to the
 context \fIrctx\fR. It can be called more than once to add multiple header lines.
diff --git a/secure/lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3 b/secure/lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3
index 4ce087202657..9c9b56c1d5e3 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_HTTP_PARSE_URL 3"
-.TH OSSL_HTTP_PARSE_URL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_HTTP_PARSE_URL 3ossl"
+.TH OSSL_HTTP_PARSE_URL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3 b/secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3
index db155525105a..a229e4cfebae 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_HTTP_TRANSFER 3"
-.TH OSSL_HTTP_TRANSFER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_HTTP_TRANSFER 3ossl"
+.TH OSSL_HTTP_TRANSFER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -302,8 +302,11 @@ Since this function is typically called by applications such as
 .PP
 \&\fBOSSL_HTTP_set1_request()\fR sets up in \fIrctx\fR the request header and content data
 and expectations on the response using the following parameters.
-If <rctx> indicates using a proxy for \s-1HTTP\s0 (but not \s-1HTTPS\s0), the server hostname
-(and optionally port) needs to be placed in the header and thus must be present.
+If <rctx> indicates using a proxy for \s-1HTTP\s0 (but not \s-1HTTPS\s0), the server host
+(and optionally port) needs to be placed in the header; thus it must be present
+in \fIrctx\fR.
+For backward compatibility, the server (and optional port) may also be given in
+the \fIpath\fR argument beginning with \f(CW\*(C`http://\*(C'\fR (thus giving an absoluteURI).
 If \fIpath\fR is \s-1NULL\s0 it defaults to \*(L"/\*(R".
 If \fIreq\fR is \s-1NULL\s0 the \s-1HTTP GET\s0 method will be used to send the request
 else \s-1HTTP POST\s0 with the contents of \fIreq\fR and optional \fIcontent_type\fR, where
@@ -410,7 +413,7 @@ The caller is responsible for freeing the \s-1BIO\s0 pointer obtained.
 All the functions described here were added in OpenSSL 3.0.
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2019\-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/lib/libcrypto/man/man3/OSSL_ITEM.3 b/secure/lib/libcrypto/man/man3/OSSL_ITEM.3
index 58a5bb797660..c312eb41b4c1 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_ITEM.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_ITEM.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_ITEM 3"
-.TH OSSL_ITEM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_ITEM 3ossl"
+.TH OSSL_ITEM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3 b/secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3
index 7d4f1ecf26ff..0a44a8d2fc27 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_LIB_CTX 3"
-.TH OSSL_LIB_CTX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_LIB_CTX 3ossl"
+.TH OSSL_LIB_CTX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_PARAM.3 b/secure/lib/libcrypto/man/man3/OSSL_PARAM.3
index 23f4c67a1c1f..b34a4377435d 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_PARAM.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_PARAM.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_PARAM 3"
-.TH OSSL_PARAM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_PARAM 3ossl"
+.TH OSSL_PARAM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3 b/secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3
index 9cf1733a10b7..4fee56253514 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_PARAM_BLD 3"
-.TH OSSL_PARAM_BLD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_PARAM_BLD 3ossl"
+.TH OSSL_PARAM_BLD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_PARAM_allocate_from_text.3 b/secure/lib/libcrypto/man/man3/OSSL_PARAM_allocate_from_text.3
index bfb0014379af..c6202e5eea1b 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_PARAM_allocate_from_text.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_PARAM_allocate_from_text.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_PARAM_ALLOCATE_FROM_TEXT 3"
-.TH OSSL_PARAM_ALLOCATE_FROM_TEXT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_PARAM_ALLOCATE_FROM_TEXT 3ossl"
+.TH OSSL_PARAM_ALLOCATE_FROM_TEXT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3 b/secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3
index 125e762c0a46..9783d2681949 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_PARAM_DUP 3"
-.TH OSSL_PARAM_DUP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_PARAM_DUP 3ossl"
+.TH OSSL_PARAM_DUP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3 b/secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3
index b13aae2ed3e6..6e518b977178 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_PARAM_INT 3"
-.TH OSSL_PARAM_INT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_PARAM_INT 3ossl"
+.TH OSSL_PARAM_INT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3 b/secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3
index fd1e74f00974..42c20bef2749 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_PROVIDER 3"
-.TH OSSL_PROVIDER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_PROVIDER 3ossl"
+.TH OSSL_PROVIDER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3 b/secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3
index c3e27213ddde..e246b6f616c1 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_SELF_TEST_NEW 3"
-.TH OSSL_SELF_TEST_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_SELF_TEST_NEW 3ossl"
+.TH OSSL_SELF_TEST_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_set_callback.3 b/secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_set_callback.3
index ea50401e49ac..d5c5ce5b6f74 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_set_callback.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_set_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_SELF_TEST_SET_CALLBACK 3"
-.TH OSSL_SELF_TEST_SET_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_SELF_TEST_SET_CALLBACK 3ossl"
+.TH OSSL_SELF_TEST_SET_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 b/secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3
index 8d37e4f32916..96ef1bc5699c 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_STORE_INFO 3"
-.TH OSSL_STORE_INFO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_STORE_INFO 3ossl"
+.TH OSSL_STORE_INFO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 b/secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3
index 7bd32000d824..2c7b39d5960e 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_STORE_LOADER 3"
-.TH OSSL_STORE_LOADER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_STORE_LOADER 3ossl"
+.TH OSSL_STORE_LOADER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 b/secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3
index ee38b1c72372..5cfb415b49d8 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_STORE_SEARCH 3"
-.TH OSSL_STORE_SEARCH 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_STORE_SEARCH 3ossl"
+.TH OSSL_STORE_SEARCH 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3 b/secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3
index b630e548df3a..4e5ea44e243a 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_STORE_ATTACH 3"
-.TH OSSL_STORE_ATTACH 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_STORE_ATTACH 3ossl"
+.TH OSSL_STORE_ATTACH 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 b/secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3
index 41e4d52c4772..0fac90dc0bfa 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_STORE_EXPECT 3"
-.TH OSSL_STORE_EXPECT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_STORE_EXPECT 3ossl"
+.TH OSSL_STORE_EXPECT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 b/secure/lib/libcrypto/man/man3/OSSL_STORE_open.3
index 42361a491bbc..b4275a46dd02 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_STORE_open.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_STORE_open.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_STORE_OPEN 3"
-.TH OSSL_STORE_OPEN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_STORE_OPEN 3ossl"
+.TH OSSL_STORE_OPEN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3 b/secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3
index 736a52e12703..0282c3aa0016 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_TRACE_ENABLED 3"
-.TH OSSL_TRACE_ENABLED 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_TRACE_ENABLED 3ossl"
+.TH OSSL_TRACE_ENABLED 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_trace_get_category_num.3 b/secure/lib/libcrypto/man/man3/OSSL_trace_get_category_num.3
index fea58fe3ff63..8c543c92000c 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_trace_get_category_num.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_trace_get_category_num.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_TRACE_GET_CATEGORY_NUM 3"
-.TH OSSL_TRACE_GET_CATEGORY_NUM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_TRACE_GET_CATEGORY_NUM 3ossl"
+.TH OSSL_TRACE_GET_CATEGORY_NUM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OSSL_trace_set_channel.3 b/secure/lib/libcrypto/man/man3/OSSL_trace_set_channel.3
index a13c01c3c1cd..08e63ffe653a 100644
--- a/secure/lib/libcrypto/man/man3/OSSL_trace_set_channel.3
+++ b/secure/lib/libcrypto/man/man3/OSSL_trace_set_channel.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_TRACE_SET_CHANNEL 3"
-.TH OSSL_TRACE_SET_CHANNEL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_TRACE_SET_CHANNEL 3ossl"
+.TH OSSL_TRACE_SET_CHANNEL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3 b/secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3
index 153f09859909..131c4cba77e2 100644
--- a/secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3
+++ b/secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_ADD_ALL_ALGORITHMS 3"
-.TH OPENSSL_ADD_ALL_ALGORITHMS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_ADD_ALL_ALGORITHMS 3ossl"
+.TH OPENSSL_ADD_ALL_ALGORITHMS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/OpenSSL_version.3 b/secure/lib/libcrypto/man/man3/OpenSSL_version.3
index 707c0a1f0637..413b2479962c 100644
--- a/secure/lib/libcrypto/man/man3/OpenSSL_version.3
+++ b/secure/lib/libcrypto/man/man3/OpenSSL_version.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_VERSION 3"
-.TH OPENSSL_VERSION 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_VERSION 3ossl"
+.TH OPENSSL_VERSION 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3 b/secure/lib/libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3
index 68976ab828c9..76365f973de7 100644
--- a/secure/lib/libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3
+++ b/secure/lib/libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PEM_X509_INFO_READ_BIO_EX 3"
-.TH PEM_X509_INFO_READ_BIO_EX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PEM_X509_INFO_READ_BIO_EX 3ossl"
+.TH PEM_X509_INFO_READ_BIO_EX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 b/secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3
index b377fa72e8bb..ffdc6af0d720 100644
--- a/secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3
+++ b/secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PEM_BYTES_READ_BIO 3"
-.TH PEM_BYTES_READ_BIO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PEM_BYTES_READ_BIO 3ossl"
+.TH PEM_BYTES_READ_BIO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PEM_read.3 b/secure/lib/libcrypto/man/man3/PEM_read.3
index 29082454f2dc..afac9e212e87 100644
--- a/secure/lib/libcrypto/man/man3/PEM_read.3
+++ b/secure/lib/libcrypto/man/man3/PEM_read.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PEM_READ 3"
-.TH PEM_READ 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PEM_READ 3ossl"
+.TH PEM_READ 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PEM_read_CMS.3 b/secure/lib/libcrypto/man/man3/PEM_read_CMS.3
index 39788a2ef971..d5821def4a5d 100644
--- a/secure/lib/libcrypto/man/man3/PEM_read_CMS.3
+++ b/secure/lib/libcrypto/man/man3/PEM_read_CMS.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PEM_READ_CMS 3"
-.TH PEM_READ_CMS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PEM_READ_CMS 3ossl"
+.TH PEM_READ_CMS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3 b/secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3
index 2c95fe106bfb..c7e67dece9d8 100644
--- a/secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3
+++ b/secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PEM_READ_BIO_PRIVATEKEY 3"
-.TH PEM_READ_BIO_PRIVATEKEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PEM_READ_BIO_PRIVATEKEY 3ossl"
+.TH PEM_READ_BIO_PRIVATEKEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 b/secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3
index 2477c83f52f3..01bfe4da703e 100644
--- a/secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3
+++ b/secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PEM_READ_BIO_EX 3"
-.TH PEM_READ_BIO_EX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PEM_READ_BIO_EX 3ossl"
+.TH PEM_READ_BIO_EX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3 b/secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3
index f4c983d03ee2..b2c068fbea5d 100644
--- a/secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3
+++ b/secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PEM_WRITE_BIO_CMS_STREAM 3"
-.TH PEM_WRITE_BIO_CMS_STREAM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PEM_WRITE_BIO_CMS_STREAM 3ossl"
+.TH PEM_WRITE_BIO_CMS_STREAM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3 b/secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3
index eee07dca5088..fddbc8a01b65 100644
--- a/secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3
+++ b/secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PEM_WRITE_BIO_PKCS7_STREAM 3"
-.TH PEM_WRITE_BIO_PKCS7_STREAM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PEM_WRITE_BIO_PKCS7_STREAM 3ossl"
+.TH PEM_WRITE_BIO_PKCS7_STREAM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3 b/secure/lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3
index adbc9a8907a7..4863523fbbbd 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_PBE_KEYIVGEN 3"
-.TH PKCS12_PBE_KEYIVGEN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_PBE_KEYIVGEN 3ossl"
+.TH PKCS12_PBE_KEYIVGEN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_create_cert.3 b/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_create_cert.3
index cf8b578598b4..be1854960069 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_create_cert.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_create_cert.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_SAFEBAG_CREATE_CERT 3"
-.TH PKCS12_SAFEBAG_CREATE_CERT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_SAFEBAG_CREATE_CERT 3ossl"
+.TH PKCS12_SAFEBAG_CREATE_CERT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3 b/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3
index 29058d660503..761687efb6dc 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_SAFEBAG_GET0_ATTRS 3"
-.TH PKCS12_SAFEBAG_GET0_ATTRS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_SAFEBAG_GET0_ATTRS 3ossl"
+.TH PKCS12_SAFEBAG_GET0_ATTRS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3 b/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3
index 56acfb0b31c2..3f7c70b63b64 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_SAFEBAG_GET1_CERT 3"
-.TH PKCS12_SAFEBAG_GET1_CERT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_SAFEBAG_GET1_CERT 3ossl"
+.TH PKCS12_SAFEBAG_GET1_CERT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_add1_attr_by_NID.3 b/secure/lib/libcrypto/man/man3/PKCS12_add1_attr_by_NID.3
index 04e1edad7c07..1c7be1bc6591 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_add1_attr_by_NID.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_add1_attr_by_NID.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_ADD1_ATTR_BY_NID 3"
-.TH PKCS12_ADD1_ATTR_BY_NID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_ADD1_ATTR_BY_NID 3ossl"
+.TH PKCS12_ADD1_ATTR_BY_NID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_add_CSPName_asc.3 b/secure/lib/libcrypto/man/man3/PKCS12_add_CSPName_asc.3
index f520e8625ce3..212d1c95d1a7 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_add_CSPName_asc.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_add_CSPName_asc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_ADD_CSPNAME_ASC 3"
-.TH PKCS12_ADD_CSPNAME_ASC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_ADD_CSPNAME_ASC 3ossl"
+.TH PKCS12_ADD_CSPNAME_ASC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_add_cert.3 b/secure/lib/libcrypto/man/man3/PKCS12_add_cert.3
index 3022ef81be7c..c8933b0a0d93 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_add_cert.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_add_cert.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_ADD_CERT 3"
-.TH PKCS12_ADD_CERT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_ADD_CERT 3ossl"
+.TH PKCS12_ADD_CERT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_add_friendlyname_asc.3 b/secure/lib/libcrypto/man/man3/PKCS12_add_friendlyname_asc.3
index ed1b1696e6b1..0a19739a8e21 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_add_friendlyname_asc.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_add_friendlyname_asc.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_ADD_FRIENDLYNAME_ASC 3"
-.TH PKCS12_ADD_FRIENDLYNAME_ASC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_ADD_FRIENDLYNAME_ASC 3ossl"
+.TH PKCS12_ADD_FRIENDLYNAME_ASC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_add_localkeyid.3 b/secure/lib/libcrypto/man/man3/PKCS12_add_localkeyid.3
index 04fb25e1a313..6f93c87fd1e2 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_add_localkeyid.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_add_localkeyid.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_ADD_LOCALKEYID 3"
-.TH PKCS12_ADD_LOCALKEYID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_ADD_LOCALKEYID 3ossl"
+.TH PKCS12_ADD_LOCALKEYID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_add_safe.3 b/secure/lib/libcrypto/man/man3/PKCS12_add_safe.3
index 7a7a4d96f66c..462fd812aaf6 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_add_safe.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_add_safe.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_ADD_SAFE 3"
-.TH PKCS12_ADD_SAFE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_ADD_SAFE 3ossl"
+.TH PKCS12_ADD_SAFE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_create.3 b/secure/lib/libcrypto/man/man3/PKCS12_create.3
index 3ba7540a58bf..4a0e4465b7b8 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_create.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_create.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_CREATE 3"
-.TH PKCS12_CREATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_CREATE 3ossl"
+.TH PKCS12_CREATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -178,7 +178,8 @@ can all be set to zero and sensible defaults will be used.
 These defaults are: \s-1AES\s0 password based encryption (\s-1PBES2\s0 with \s-1PBKDF2\s0 and
 \&\s-1AES\-256\-CBC\s0) for private keys and certificates, the \s-1PBKDF2\s0 and \s-1MAC\s0 key
 derivation iteration count of \fB\s-1PKCS12_DEFAULT_ITER\s0\fR (currently 2048), and
-\&\s-1MAC\s0 algorithm \s-1HMAC\s0 with \s-1SHA2\-256.\s0
+\&\s-1MAC\s0 algorithm \s-1HMAC\s0 with \s-1SHA2\-256.\s0 The \s-1MAC\s0 key derivation algorithm used
+for the outer PKCS#12 structure is \s-1PKCS12KDF.\s0
 .PP
 The default \s-1MAC\s0 iteration count is 1 in order to retain compatibility with
 old software which did not interpret \s-1MAC\s0 iteration counts. If such compatibility
@@ -204,6 +205,8 @@ a fatal error is returned.
 should be used.
 .PP
 \&\fImac_iter\fR can be set to \-1 and the \s-1MAC\s0 will then be omitted entirely.
+This can be useful when running with the \s-1FIPS\s0 provider as the \s-1PKCS12KDF\s0
+is not a \s-1FIPS\s0 approvable algorithm.
 .PP
 \&\fBPKCS12_create()\fR makes assumptions regarding the encoding of the given pass
 phrase.
@@ -216,7 +219,9 @@ See \fBpassphrase\-encoding\fR\|(7) for more information.
 \&\s-1IETF RFC 7292\s0 (<https://tools.ietf.org/html/rfc7292>)
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
+\&\s-1\fBEVP_KDF\-PKCS12KDF\s0\fR\|(7),
 \&\fBd2i_PKCS12\fR\|(3),
+\&\s-1\fBOSSL_PROVIDER\-FIPS\s0\fR\|(7),
 \&\fBpassphrase\-encoding\fR\|(7)
 .SH "HISTORY"
 .IX Header "HISTORY"
@@ -227,7 +232,7 @@ derivation iteration count were changed in OpenSSL 3.0 to more modern
 standards.
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2002\-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2002\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_decrypt_skey.3 b/secure/lib/libcrypto/man/man3/PKCS12_decrypt_skey.3
index da3e9a68a7a1..0f28d95ca24e 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_decrypt_skey.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_decrypt_skey.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_DECRYPT_SKEY 3"
-.TH PKCS12_DECRYPT_SKEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_DECRYPT_SKEY 3ossl"
+.TH PKCS12_DECRYPT_SKEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3 b/secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3
index e104307b0a21..b07ca54845bc 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_GEN_MAC 3"
-.TH PKCS12_GEN_MAC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_GEN_MAC 3ossl"
+.TH PKCS12_GEN_MAC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -159,6 +159,7 @@ PKCS12_verify_mac \- Functions to create and manipulate a PKCS#12 structure
 .IX Header "DESCRIPTION"
 \&\fBPKCS12_gen_mac()\fR generates an \s-1HMAC\s0 over the entire PKCS#12 object using the
 supplied password along with a set of already configured parameters.
+The default key generation mechanism used is \s-1PKCS12KDF.\s0
 .PP
 \&\fBPKCS12_verify_mac()\fR verifies the PKCS#12 object's \s-1HMAC\s0 using the supplied
 password.
@@ -190,6 +191,7 @@ All functions return 1 on success and 0 if an error occurred.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fBd2i_PKCS12\fR\|(3),
+\&\s-1\fBEVP_KDF\-PKCS12KDF\s0\fR\|(7),
 \&\fBPKCS12_create\fR\|(3),
 \&\fBpassphrase\-encoding\fR\|(7)
 .SH "COPYRIGHT"
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_get_friendlyname.3 b/secure/lib/libcrypto/man/man3/PKCS12_get_friendlyname.3
index d1c2f64735d9..5a3013c6d103 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_get_friendlyname.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_get_friendlyname.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_GET_FRIENDLYNAME 3"
-.TH PKCS12_GET_FRIENDLYNAME 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_GET_FRIENDLYNAME 3ossl"
+.TH PKCS12_GET_FRIENDLYNAME 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_init.3 b/secure/lib/libcrypto/man/man3/PKCS12_init.3
index b46f0bf01fbc..a105aa8a3e5f 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_init.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_init.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_INIT 3"
-.TH PKCS12_INIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_INIT 3ossl"
+.TH PKCS12_INIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_item_decrypt_d2i.3 b/secure/lib/libcrypto/man/man3/PKCS12_item_decrypt_d2i.3
index ad28bfe8a8ce..44f46c6c10c3 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_item_decrypt_d2i.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_item_decrypt_d2i.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_ITEM_DECRYPT_D2I 3"
-.TH PKCS12_ITEM_DECRYPT_D2I 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_ITEM_DECRYPT_D2I 3ossl"
+.TH PKCS12_ITEM_DECRYPT_D2I 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3 b/secure/lib/libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3
index 10554f448162..4ed4c39640e0 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_KEY_GEN_UTF8_EX 3"
-.TH PKCS12_KEY_GEN_UTF8_EX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_KEY_GEN_UTF8_EX 3ossl"
+.TH PKCS12_KEY_GEN_UTF8_EX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_newpass.3 b/secure/lib/libcrypto/man/man3/PKCS12_newpass.3
index e3ee42902375..27a5260369a5 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_newpass.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_newpass.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_NEWPASS 3"
-.TH PKCS12_NEWPASS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_NEWPASS 3ossl"
+.TH PKCS12_NEWPASS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3 b/secure/lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3
index f0f611b81a34..18dc2a0dc65e 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_PACK_P7ENCDATA 3"
-.TH PKCS12_PACK_P7ENCDATA 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_PACK_P7ENCDATA 3ossl"
+.TH PKCS12_PACK_P7ENCDATA 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS12_parse.3 b/secure/lib/libcrypto/man/man3/PKCS12_parse.3
index fd30a8b4fd58..50c8f49611bd 100644
--- a/secure/lib/libcrypto/man/man3/PKCS12_parse.3
+++ b/secure/lib/libcrypto/man/man3/PKCS12_parse.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS12_PARSE 3"
-.TH PKCS12_PARSE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS12_PARSE 3ossl"
+.TH PKCS12_PARSE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3 b/secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3
index b5c134ae42b7..a07593413e20 100644
--- a/secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3
+++ b/secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS5_PBE_KEYIVGEN 3"
-.TH PKCS5_PBE_KEYIVGEN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS5_PBE_KEYIVGEN 3ossl"
+.TH PKCS5_PBE_KEYIVGEN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 b/secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3
index 4f5631253e0d..9c76cc337164 100644
--- a/secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3
+++ b/secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS5_PBKDF2_HMAC 3"
-.TH PKCS5_PBKDF2_HMAC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS5_PBKDF2_HMAC 3ossl"
+.TH PKCS5_PBKDF2_HMAC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 b/secure/lib/libcrypto/man/man3/PKCS7_decrypt.3
index 59227a999219..7b242755a4dc 100644
--- a/secure/lib/libcrypto/man/man3/PKCS7_decrypt.3
+++ b/secure/lib/libcrypto/man/man3/PKCS7_decrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS7_DECRYPT 3"
-.TH PKCS7_DECRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS7_DECRYPT 3ossl"
+.TH PKCS7_DECRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 b/secure/lib/libcrypto/man/man3/PKCS7_encrypt.3
index 55ce196cfe87..4ce97ed6446f 100644
--- a/secure/lib/libcrypto/man/man3/PKCS7_encrypt.3
+++ b/secure/lib/libcrypto/man/man3/PKCS7_encrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS7_ENCRYPT 3"
-.TH PKCS7_ENCRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS7_ENCRYPT 3ossl"
+.TH PKCS7_ENCRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS7_get_octet_string.3 b/secure/lib/libcrypto/man/man3/PKCS7_get_octet_string.3
index 730687525fd7..042dbb8ada23 100644
--- a/secure/lib/libcrypto/man/man3/PKCS7_get_octet_string.3
+++ b/secure/lib/libcrypto/man/man3/PKCS7_get_octet_string.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS7_GET_OCTET_STRING 3"
-.TH PKCS7_GET_OCTET_STRING 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS7_GET_OCTET_STRING 3ossl"
+.TH PKCS7_GET_OCTET_STRING 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS7_sign.3 b/secure/lib/libcrypto/man/man3/PKCS7_sign.3
index 64f618449d2f..210be55d4130 100644
--- a/secure/lib/libcrypto/man/man3/PKCS7_sign.3
+++ b/secure/lib/libcrypto/man/man3/PKCS7_sign.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS7_SIGN 3"
-.TH PKCS7_SIGN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS7_SIGN 3ossl"
+.TH PKCS7_SIGN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 b/secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3
index 959102b80319..604625be26eb 100644
--- a/secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3
+++ b/secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS7_SIGN_ADD_SIGNER 3"
-.TH PKCS7_SIGN_ADD_SIGNER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS7_SIGN_ADD_SIGNER 3ossl"
+.TH PKCS7_SIGN_ADD_SIGNER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS7_type_is_other.3 b/secure/lib/libcrypto/man/man3/PKCS7_type_is_other.3
index 1ab9bf55bcf1..13558557c11a 100644
--- a/secure/lib/libcrypto/man/man3/PKCS7_type_is_other.3
+++ b/secure/lib/libcrypto/man/man3/PKCS7_type_is_other.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS7_TYPE_IS_OTHER 3"
-.TH PKCS7_TYPE_IS_OTHER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS7_TYPE_IS_OTHER 3ossl"
+.TH PKCS7_TYPE_IS_OTHER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS7_verify.3 b/secure/lib/libcrypto/man/man3/PKCS7_verify.3
index 06325e797b32..73b3bb800e01 100644
--- a/secure/lib/libcrypto/man/man3/PKCS7_verify.3
+++ b/secure/lib/libcrypto/man/man3/PKCS7_verify.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS7_VERIFY 3"
-.TH PKCS7_VERIFY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS7_VERIFY 3ossl"
+.TH PKCS7_VERIFY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS8_encrypt.3 b/secure/lib/libcrypto/man/man3/PKCS8_encrypt.3
index b19f458d4fd0..cfe25fc23726 100644
--- a/secure/lib/libcrypto/man/man3/PKCS8_encrypt.3
+++ b/secure/lib/libcrypto/man/man3/PKCS8_encrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS8_ENCRYPT 3"
-.TH PKCS8_ENCRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS8_ENCRYPT 3ossl"
+.TH PKCS8_ENCRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3 b/secure/lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3
index 5e1b8d40a44b..6604dd0446a2 100644
--- a/secure/lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3
+++ b/secure/lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PKCS8_PKEY_ADD1_ATTR 3"
-.TH PKCS8_PKEY_ADD1_ATTR 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PKCS8_PKEY_ADD1_ATTR 3ossl"
+.TH PKCS8_PKEY_ADD1_ATTR 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RAND_add.3 b/secure/lib/libcrypto/man/man3/RAND_add.3
index 312910bb413c..1b1899bd9b7d 100644
--- a/secure/lib/libcrypto/man/man3/RAND_add.3
+++ b/secure/lib/libcrypto/man/man3/RAND_add.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RAND_ADD 3"
-.TH RAND_ADD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RAND_ADD 3ossl"
+.TH RAND_ADD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RAND_bytes.3 b/secure/lib/libcrypto/man/man3/RAND_bytes.3
index 6fc8cd2a0f6b..9b1c63733bb1 100644
--- a/secure/lib/libcrypto/man/man3/RAND_bytes.3
+++ b/secure/lib/libcrypto/man/man3/RAND_bytes.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RAND_BYTES 3"
-.TH RAND_BYTES 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RAND_BYTES 3ossl"
+.TH RAND_BYTES 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RAND_cleanup.3 b/secure/lib/libcrypto/man/man3/RAND_cleanup.3
index 6e1d1a15e065..fe6ad53d9e21 100644
--- a/secure/lib/libcrypto/man/man3/RAND_cleanup.3
+++ b/secure/lib/libcrypto/man/man3/RAND_cleanup.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RAND_CLEANUP 3"
-.TH RAND_CLEANUP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RAND_CLEANUP 3ossl"
+.TH RAND_CLEANUP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RAND_egd.3 b/secure/lib/libcrypto/man/man3/RAND_egd.3
index 43d82147daaf..e2f92327e70d 100644
--- a/secure/lib/libcrypto/man/man3/RAND_egd.3
+++ b/secure/lib/libcrypto/man/man3/RAND_egd.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RAND_EGD 3"
-.TH RAND_EGD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RAND_EGD 3ossl"
+.TH RAND_EGD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RAND_get0_primary.3 b/secure/lib/libcrypto/man/man3/RAND_get0_primary.3
index 27e5d0339057..1ffdf6ddf64f 100644
--- a/secure/lib/libcrypto/man/man3/RAND_get0_primary.3
+++ b/secure/lib/libcrypto/man/man3/RAND_get0_primary.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RAND_GET0_PRIMARY 3"
-.TH RAND_GET0_PRIMARY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RAND_GET0_PRIMARY 3ossl"
+.TH RAND_GET0_PRIMARY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RAND_load_file.3 b/secure/lib/libcrypto/man/man3/RAND_load_file.3
index c089609995d9..001af79cf2b9 100644
--- a/secure/lib/libcrypto/man/man3/RAND_load_file.3
+++ b/secure/lib/libcrypto/man/man3/RAND_load_file.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RAND_LOAD_FILE 3"
-.TH RAND_LOAD_FILE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RAND_LOAD_FILE 3ossl"
+.TH RAND_LOAD_FILE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3 b/secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3
index 012f1d0ed430..57081fbb7be4 100644
--- a/secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3
+++ b/secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RAND_SET_DRBG_TYPE 3"
-.TH RAND_SET_DRBG_TYPE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RAND_SET_DRBG_TYPE 3ossl"
+.TH RAND_SET_DRBG_TYPE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RAND_set_rand_method.3 b/secure/lib/libcrypto/man/man3/RAND_set_rand_method.3
index c51f62ea3bd2..055d0ad998fb 100644
--- a/secure/lib/libcrypto/man/man3/RAND_set_rand_method.3
+++ b/secure/lib/libcrypto/man/man3/RAND_set_rand_method.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RAND_SET_RAND_METHOD 3"
-.TH RAND_SET_RAND_METHOD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RAND_SET_RAND_METHOD 3ossl"
+.TH RAND_SET_RAND_METHOD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RC4_set_key.3 b/secure/lib/libcrypto/man/man3/RC4_set_key.3
index 8e98d12dafc6..b9b9e7f3177f 100644
--- a/secure/lib/libcrypto/man/man3/RC4_set_key.3
+++ b/secure/lib/libcrypto/man/man3/RC4_set_key.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RC4_SET_KEY 3"
-.TH RC4_SET_KEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RC4_SET_KEY 3ossl"
+.TH RC4_SET_KEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 b/secure/lib/libcrypto/man/man3/RIPEMD160_Init.3
index 1716ef4ba9db..068d158ebe54 100644
--- a/secure/lib/libcrypto/man/man3/RIPEMD160_Init.3
+++ b/secure/lib/libcrypto/man/man3/RIPEMD160_Init.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RIPEMD160_INIT 3"
-.TH RIPEMD160_INIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RIPEMD160_INIT 3ossl"
+.TH RIPEMD160_INIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_blinding_on.3 b/secure/lib/libcrypto/man/man3/RSA_blinding_on.3
index a281a4419225..b14a5cc6a2b7 100644
--- a/secure/lib/libcrypto/man/man3/RSA_blinding_on.3
+++ b/secure/lib/libcrypto/man/man3/RSA_blinding_on.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_BLINDING_ON 3"
-.TH RSA_BLINDING_ON 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_BLINDING_ON 3ossl"
+.TH RSA_BLINDING_ON 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_check_key.3 b/secure/lib/libcrypto/man/man3/RSA_check_key.3
index ec293205023a..2697ecdac47f 100644
--- a/secure/lib/libcrypto/man/man3/RSA_check_key.3
+++ b/secure/lib/libcrypto/man/man3/RSA_check_key.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_CHECK_KEY 3"
-.TH RSA_CHECK_KEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_CHECK_KEY 3ossl"
+.TH RSA_CHECK_KEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_generate_key.3 b/secure/lib/libcrypto/man/man3/RSA_generate_key.3
index 5b046638feb4..042a3b0e59bc 100644
--- a/secure/lib/libcrypto/man/man3/RSA_generate_key.3
+++ b/secure/lib/libcrypto/man/man3/RSA_generate_key.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_GENERATE_KEY 3"
-.TH RSA_GENERATE_KEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_GENERATE_KEY 3ossl"
+.TH RSA_GENERATE_KEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_get0_key.3 b/secure/lib/libcrypto/man/man3/RSA_get0_key.3
index 285ec6a047db..64bf6c2dd931 100644
--- a/secure/lib/libcrypto/man/man3/RSA_get0_key.3
+++ b/secure/lib/libcrypto/man/man3/RSA_get0_key.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_GET0_KEY 3"
-.TH RSA_GET0_KEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_GET0_KEY 3ossl"
+.TH RSA_GET0_KEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_meth_new.3 b/secure/lib/libcrypto/man/man3/RSA_meth_new.3
index 1d2fa5acdab1..ff52b15dedfd 100644
--- a/secure/lib/libcrypto/man/man3/RSA_meth_new.3
+++ b/secure/lib/libcrypto/man/man3/RSA_meth_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_METH_NEW 3"
-.TH RSA_METH_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_METH_NEW 3ossl"
+.TH RSA_METH_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_new.3 b/secure/lib/libcrypto/man/man3/RSA_new.3
index 591e54ee35b8..03e3667f94af 100644
--- a/secure/lib/libcrypto/man/man3/RSA_new.3
+++ b/secure/lib/libcrypto/man/man3/RSA_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_NEW 3"
-.TH RSA_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_NEW 3ossl"
+.TH RSA_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3 b/secure/lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3
index 4efccb0267ee..aa5a491d7788 100644
--- a/secure/lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3
+++ b/secure/lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_PADDING_ADD_PKCS1_TYPE_1 3"
-.TH RSA_PADDING_ADD_PKCS1_TYPE_1 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_PADDING_ADD_PKCS1_TYPE_1 3ossl"
+.TH RSA_PADDING_ADD_PKCS1_TYPE_1 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_print.3 b/secure/lib/libcrypto/man/man3/RSA_print.3
index 0d0aa46223e1..3d157580c337 100644
--- a/secure/lib/libcrypto/man/man3/RSA_print.3
+++ b/secure/lib/libcrypto/man/man3/RSA_print.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_PRINT 3"
-.TH RSA_PRINT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_PRINT 3ossl"
+.TH RSA_PRINT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_private_encrypt.3 b/secure/lib/libcrypto/man/man3/RSA_private_encrypt.3
index 47dcef51048d..fea5dd67aeee 100644
--- a/secure/lib/libcrypto/man/man3/RSA_private_encrypt.3
+++ b/secure/lib/libcrypto/man/man3/RSA_private_encrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_PRIVATE_ENCRYPT 3"
-.TH RSA_PRIVATE_ENCRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_PRIVATE_ENCRYPT 3ossl"
+.TH RSA_PRIVATE_ENCRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 b/secure/lib/libcrypto/man/man3/RSA_public_encrypt.3
index ffba87ead7d2..33f1c6203a37 100644
--- a/secure/lib/libcrypto/man/man3/RSA_public_encrypt.3
+++ b/secure/lib/libcrypto/man/man3/RSA_public_encrypt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_PUBLIC_ENCRYPT 3"
-.TH RSA_PUBLIC_ENCRYPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_PUBLIC_ENCRYPT 3ossl"
+.TH RSA_PUBLIC_ENCRYPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_set_method.3 b/secure/lib/libcrypto/man/man3/RSA_set_method.3
index 311a32960c8b..598f52eea51f 100644
--- a/secure/lib/libcrypto/man/man3/RSA_set_method.3
+++ b/secure/lib/libcrypto/man/man3/RSA_set_method.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_SET_METHOD 3"
-.TH RSA_SET_METHOD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_SET_METHOD 3ossl"
+.TH RSA_SET_METHOD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_sign.3 b/secure/lib/libcrypto/man/man3/RSA_sign.3
index c562a2c001ff..0c560219063b 100644
--- a/secure/lib/libcrypto/man/man3/RSA_sign.3
+++ b/secure/lib/libcrypto/man/man3/RSA_sign.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_SIGN 3"
-.TH RSA_SIGN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_SIGN 3ossl"
+.TH RSA_SIGN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3 b/secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3
index 4132736b17d6..a70aef098dcf 100644
--- a/secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3
+++ b/secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_SIGN_ASN1_OCTET_STRING 3"
-.TH RSA_SIGN_ASN1_OCTET_STRING 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_SIGN_ASN1_OCTET_STRING 3ossl"
+.TH RSA_SIGN_ASN1_OCTET_STRING 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/RSA_size.3 b/secure/lib/libcrypto/man/man3/RSA_size.3
index 10be261bc87a..cf7ed1dadf13 100644
--- a/secure/lib/libcrypto/man/man3/RSA_size.3
+++ b/secure/lib/libcrypto/man/man3/RSA_size.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA_SIZE 3"
-.TH RSA_SIZE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA_SIZE 3ossl"
+.TH RSA_SIZE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SCT_new.3 b/secure/lib/libcrypto/man/man3/SCT_new.3
index 9ca453e4654e..e48766a70ea6 100644
--- a/secure/lib/libcrypto/man/man3/SCT_new.3
+++ b/secure/lib/libcrypto/man/man3/SCT_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SCT_NEW 3"
-.TH SCT_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SCT_NEW 3ossl"
+.TH SCT_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SCT_print.3 b/secure/lib/libcrypto/man/man3/SCT_print.3
index 531de31e94c7..6fe12419d763 100644
--- a/secure/lib/libcrypto/man/man3/SCT_print.3
+++ b/secure/lib/libcrypto/man/man3/SCT_print.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SCT_PRINT 3"
-.TH SCT_PRINT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SCT_PRINT 3ossl"
+.TH SCT_PRINT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SCT_validate.3 b/secure/lib/libcrypto/man/man3/SCT_validate.3
index d0fe8bd79b45..b5e11bf398a0 100644
--- a/secure/lib/libcrypto/man/man3/SCT_validate.3
+++ b/secure/lib/libcrypto/man/man3/SCT_validate.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SCT_VALIDATE 3"
-.TH SCT_VALIDATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SCT_VALIDATE 3ossl"
+.TH SCT_VALIDATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SHA256_Init.3 b/secure/lib/libcrypto/man/man3/SHA256_Init.3
index 5cca230e3668..f827e267a243 100644
--- a/secure/lib/libcrypto/man/man3/SHA256_Init.3
+++ b/secure/lib/libcrypto/man/man3/SHA256_Init.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SHA256_INIT 3"
-.TH SHA256_INIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SHA256_INIT 3ossl"
+.TH SHA256_INIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3 b/secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3
index b170c088afcb..93ceaa917bf9 100644
--- a/secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3
+++ b/secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SMIME_READ_ASN1 3"
-.TH SMIME_READ_ASN1 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SMIME_READ_ASN1 3ossl"
+.TH SMIME_READ_ASN1 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 b/secure/lib/libcrypto/man/man3/SMIME_read_CMS.3
index c80d343af725..47d9d7bb6986 100644
--- a/secure/lib/libcrypto/man/man3/SMIME_read_CMS.3
+++ b/secure/lib/libcrypto/man/man3/SMIME_read_CMS.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SMIME_READ_CMS 3"
-.TH SMIME_READ_CMS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SMIME_READ_CMS 3ossl"
+.TH SMIME_READ_CMS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 b/secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3
index 8ba1c3a13fc9..dc5e69304d44 100644
--- a/secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3
+++ b/secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SMIME_READ_PKCS7 3"
-.TH SMIME_READ_PKCS7 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SMIME_READ_PKCS7 3ossl"
+.TH SMIME_READ_PKCS7 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3 b/secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3
index 04ae2a4bd344..e7253d03a483 100644
--- a/secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3
+++ b/secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SMIME_WRITE_ASN1 3"
-.TH SMIME_WRITE_ASN1 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SMIME_WRITE_ASN1 3ossl"
+.TH SMIME_WRITE_ASN1 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 b/secure/lib/libcrypto/man/man3/SMIME_write_CMS.3
index 1dadd59b2b89..cbd05dd92b8a 100644
--- a/secure/lib/libcrypto/man/man3/SMIME_write_CMS.3
+++ b/secure/lib/libcrypto/man/man3/SMIME_write_CMS.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SMIME_WRITE_CMS 3"
-.TH SMIME_WRITE_CMS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SMIME_WRITE_CMS 3ossl"
+.TH SMIME_WRITE_CMS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 b/secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3
index 8849c9e37224..75cbb3739975 100644
--- a/secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3
+++ b/secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SMIME_WRITE_PKCS7 3"
-.TH SMIME_WRITE_PKCS7 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SMIME_WRITE_PKCS7 3ossl"
+.TH SMIME_WRITE_PKCS7 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SRP_Calc_B.3 b/secure/lib/libcrypto/man/man3/SRP_Calc_B.3
index 707bce31f66f..f3b3792d4a3c 100644
--- a/secure/lib/libcrypto/man/man3/SRP_Calc_B.3
+++ b/secure/lib/libcrypto/man/man3/SRP_Calc_B.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SRP_CALC_B 3"
-.TH SRP_CALC_B 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SRP_CALC_B 3ossl"
+.TH SRP_CALC_B 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SRP_VBASE_new.3 b/secure/lib/libcrypto/man/man3/SRP_VBASE_new.3
index d4337d1799c1..6e034bf91b15 100644
--- a/secure/lib/libcrypto/man/man3/SRP_VBASE_new.3
+++ b/secure/lib/libcrypto/man/man3/SRP_VBASE_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SRP_VBASE_NEW 3"
-.TH SRP_VBASE_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SRP_VBASE_NEW 3ossl"
+.TH SRP_VBASE_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SRP_create_verifier.3 b/secure/lib/libcrypto/man/man3/SRP_create_verifier.3
index 9c99ca1fde82..a85087d5cc63 100644
--- a/secure/lib/libcrypto/man/man3/SRP_create_verifier.3
+++ b/secure/lib/libcrypto/man/man3/SRP_create_verifier.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SRP_CREATE_VERIFIER 3"
-.TH SRP_CREATE_VERIFIER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SRP_CREATE_VERIFIER 3ossl"
+.TH SRP_CREATE_VERIFIER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3 b/secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3
index a94bb54caa8b..3223712c8b15 100644
--- a/secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3
+++ b/secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SRP_USER_PWD_NEW 3"
-.TH SRP_USER_PWD_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SRP_USER_PWD_NEW 3ossl"
+.TH SRP_USER_PWD_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 b/secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3
index f731256ea5cc..f9dcee238a95 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CIPHER_GET_NAME 3"
-.TH SSL_CIPHER_GET_NAME 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CIPHER_GET_NAME 3ossl"
+.TH SSL_CIPHER_GET_NAME 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_COMP_add_compression_method.3 b/secure/lib/libcrypto/man/man3/SSL_COMP_add_compression_method.3
index 3bc0064b3169..a1c85ac27400 100644
--- a/secure/lib/libcrypto/man/man3/SSL_COMP_add_compression_method.3
+++ b/secure/lib/libcrypto/man/man3/SSL_COMP_add_compression_method.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_COMP_ADD_COMPRESSION_METHOD 3"
-.TH SSL_COMP_ADD_COMPRESSION_METHOD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_COMP_ADD_COMPRESSION_METHOD 3ossl"
+.TH SSL_COMP_ADD_COMPRESSION_METHOD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 b/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3
index 66db50609945..bb5f9c558dd2 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CONF_CTX_NEW 3"
-.TH SSL_CONF_CTX_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CONF_CTX_NEW 3ossl"
+.TH SSL_CONF_CTX_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 b/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3
index 1e55a313cce9..c3992e2f82e9 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CONF_CTX_SET1_PREFIX 3"
-.TH SSL_CONF_CTX_SET1_PREFIX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CONF_CTX_SET1_PREFIX 3ossl"
+.TH SSL_CONF_CTX_SET1_PREFIX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 b/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3
index f6b46d4b636e..d9f7a65579f4 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CONF_CTX_SET_FLAGS 3"
-.TH SSL_CONF_CTX_SET_FLAGS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CONF_CTX_SET_FLAGS 3ossl"
+.TH SSL_CONF_CTX_SET_FLAGS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 b/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3
index 2bfd3bcce961..d64bb9bd05ba 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CONF_CTX_SET_SSL_CTX 3"
-.TH SSL_CONF_CTX_SET_SSL_CTX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CONF_CTX_SET_SSL_CTX 3ossl"
+.TH SSL_CONF_CTX_SET_SSL_CTX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 b/secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3
index 336a68c7a5fa..f957c0b59c71 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CONF_CMD 3"
-.TH SSL_CONF_CMD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CONF_CMD 3ossl"
+.TH SSL_CONF_CMD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 b/secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3
index 3a38ba5ebbd6..abe529bb54e5 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CONF_CMD_ARGV 3"
-.TH SSL_CONF_CMD_ARGV 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CONF_CMD_ARGV 3ossl"
+.TH SSL_CONF_CMD_ARGV 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3
index 7e6d5627a2c2..fa3958bccc76 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_ADD1_CHAIN_CERT 3"
-.TH SSL_CTX_ADD1_CHAIN_CERT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_ADD1_CHAIN_CERT 3ossl"
+.TH SSL_CTX_ADD1_CHAIN_CERT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3
index c2ed33baaa1f..107d659d58a6 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_ADD_EXTRA_CHAIN_CERT 3"
-.TH SSL_CTX_ADD_EXTRA_CHAIN_CERT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_ADD_EXTRA_CHAIN_CERT 3ossl"
+.TH SSL_CTX_ADD_EXTRA_CHAIN_CERT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3
index 04e3c61a3535..2da113b944c6 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_ADD_SESSION 3"
-.TH SSL_CTX_ADD_SESSION 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_ADD_SESSION 3ossl"
+.TH SSL_CTX_ADD_SESSION 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_config.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_config.3
index f989dd4c9251..7f11e4ece34d 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_config.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_config.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_CONFIG 3"
-.TH SSL_CTX_CONFIG 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_CONFIG 3ossl"
+.TH SSL_CTX_CONFIG 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3
index 0823463d1658..8729f371d08b 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_CTRL 3"
-.TH SSL_CTX_CTRL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_CTRL 3ossl"
+.TH SSL_CTX_CTRL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3
index 2afce7e224f8..4800d7604238 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_DANE_ENABLE 3"
-.TH SSL_CTX_DANE_ENABLE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_DANE_ENABLE 3ossl"
+.TH SSL_CTX_DANE_ENABLE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3
index 63de916626f8..c24bbff1244c 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_FLUSH_SESSIONS 3"
-.TH SSL_CTX_FLUSH_SESSIONS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_FLUSH_SESSIONS 3ossl"
+.TH SSL_CTX_FLUSH_SESSIONS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_free.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_free.3
index 0224eee908df..231961d1a83f 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_free.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_free.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_FREE 3"
-.TH SSL_CTX_FREE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_FREE 3ossl"
+.TH SSL_CTX_FREE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3
index b3d732ff8b96..a05454ee9796 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_GET0_PARAM 3"
-.TH SSL_CTX_GET0_PARAM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_GET0_PARAM 3ossl"
+.TH SSL_CTX_GET0_PARAM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3
index b843a17f6281..12a99aef6fe5 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_GET_VERIFY_MODE 3"
-.TH SSL_CTX_GET_VERIFY_MODE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_GET_VERIFY_MODE 3ossl"
+.TH SSL_CTX_GET_VERIFY_MODE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3
index 76c57b5a6701..aea81178463c 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_HAS_CLIENT_CUSTOM_EXT 3"
-.TH SSL_CTX_HAS_CLIENT_CUSTOM_EXT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_HAS_CLIENT_CUSTOM_EXT 3ossl"
+.TH SSL_CTX_HAS_CLIENT_CUSTOM_EXT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3
index 645d6ddb3c3a..39974fae792f 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_LOAD_VERIFY_LOCATIONS 3"
-.TH SSL_CTX_LOAD_VERIFY_LOCATIONS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_LOAD_VERIFY_LOCATIONS 3ossl"
+.TH SSL_CTX_LOAD_VERIFY_LOCATIONS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_new.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_new.3
index 92f3a2ee5529..4a5933f60780 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_new.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_NEW 3"
-.TH SSL_CTX_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_NEW 3ossl"
+.TH SSL_CTX_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3
index 5a3f95b24cc7..f53468828220 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SESS_NUMBER 3"
-.TH SSL_CTX_SESS_NUMBER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SESS_NUMBER 3ossl"
+.TH SSL_CTX_SESS_NUMBER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3
index ec1eeb65b757..a897f0345b9e 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SESS_SET_CACHE_SIZE 3"
-.TH SSL_CTX_SESS_SET_CACHE_SIZE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SESS_SET_CACHE_SIZE 3ossl"
+.TH SSL_CTX_SESS_SET_CACHE_SIZE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3
index c73e90c5056d..97034e462f32 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SESS_SET_GET_CB 3"
-.TH SSL_CTX_SESS_SET_GET_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SESS_SET_GET_CB 3ossl"
+.TH SSL_CTX_SESS_SET_GET_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3
index 6b35bbc68a6b..1ccf8323fc47 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SESSIONS 3"
-.TH SSL_CTX_SESSIONS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SESSIONS 3ossl"
+.TH SSL_CTX_SESSIONS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3
index b910f69ae248..037ec39b3730 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET0_CA_LIST 3"
-.TH SSL_CTX_SET0_CA_LIST 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET0_CA_LIST 3ossl"
+.TH SSL_CTX_SET0_CA_LIST 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3
index 083e1592be7b..657a3755a00b 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET1_CURVES 3"
-.TH SSL_CTX_SET1_CURVES 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET1_CURVES 3ossl"
+.TH SSL_CTX_SET1_CURVES 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3
index 3a60f9856ab3..c989d181834d 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET1_SIGALGS 3"
-.TH SSL_CTX_SET1_SIGALGS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET1_SIGALGS 3ossl"
+.TH SSL_CTX_SET1_SIGALGS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3
index 49592eb141d1..62e1873329f8 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET1_VERIFY_CERT_STORE 3"
-.TH SSL_CTX_SET1_VERIFY_CERT_STORE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET1_VERIFY_CERT_STORE 3ossl"
+.TH SSL_CTX_SET1_VERIFY_CERT_STORE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3
index eb642d3b0172..1bf7904cdc73 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_ALPN_SELECT_CB 3"
-.TH SSL_CTX_SET_ALPN_SELECT_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_ALPN_SELECT_CB 3ossl"
+.TH SSL_CTX_SET_ALPN_SELECT_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3
index 45158e3bae8d..d101dc014acc 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_CERT_CB 3"
-.TH SSL_CTX_SET_CERT_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_CERT_CB 3ossl"
+.TH SSL_CTX_SET_CERT_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3
index a813949c9946..b3859273ad98 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_CERT_STORE 3"
-.TH SSL_CTX_SET_CERT_STORE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_CERT_STORE 3ossl"
+.TH SSL_CTX_SET_CERT_STORE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3
index 2e89a68740e4..f2edc7ba6997 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_CERT_VERIFY_CALLBACK 3"
-.TH SSL_CTX_SET_CERT_VERIFY_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_CERT_VERIFY_CALLBACK 3ossl"
+.TH SSL_CTX_SET_CERT_VERIFY_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3
index cd0dceb05d54..3ecc1df82b02 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_CIPHER_LIST 3"
-.TH SSL_CTX_SET_CIPHER_LIST 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_CIPHER_LIST 3ossl"
+.TH SSL_CTX_SET_CIPHER_LIST 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3
index d174fefe8407..1d64deb71eda 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_CLIENT_CERT_CB 3"
-.TH SSL_CTX_SET_CLIENT_CERT_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_CLIENT_CERT_CB 3ossl"
+.TH SSL_CTX_SET_CLIENT_CERT_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3
index 568460cbdae8..cdcf917105da 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_CLIENT_HELLO_CB 3"
-.TH SSL_CTX_SET_CLIENT_HELLO_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_CLIENT_HELLO_CB 3ossl"
+.TH SSL_CTX_SET_CLIENT_HELLO_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3
index 0ac82d0214b1..2deaeecee69f 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_CT_VALIDATION_CALLBACK 3"
-.TH SSL_CTX_SET_CT_VALIDATION_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_CT_VALIDATION_CALLBACK 3ossl"
+.TH SSL_CTX_SET_CT_VALIDATION_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3
index cc8bbe924172..be4088296cba 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_CTLOG_LIST_FILE 3"
-.TH SSL_CTX_SET_CTLOG_LIST_FILE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_CTLOG_LIST_FILE 3ossl"
+.TH SSL_CTX_SET_CTLOG_LIST_FILE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3
index f9b2e7218b55..d3ecbb7b4f3c 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_DEFAULT_PASSWD_CB 3"
-.TH SSL_CTX_SET_DEFAULT_PASSWD_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_DEFAULT_PASSWD_CB 3ossl"
+.TH SSL_CTX_SET_DEFAULT_PASSWD_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_generate_session_id.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_generate_session_id.3
index a0c48a0ac1d9..72536258a467 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_generate_session_id.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_generate_session_id.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_GENERATE_SESSION_ID 3"
-.TH SSL_CTX_SET_GENERATE_SESSION_ID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_GENERATE_SESSION_ID 3ossl"
+.TH SSL_CTX_SET_GENERATE_SESSION_ID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3
index 8f8cc6de84ae..28e0d58b6ddd 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_INFO_CALLBACK 3"
-.TH SSL_CTX_SET_INFO_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_INFO_CALLBACK 3ossl"
+.TH SSL_CTX_SET_INFO_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3
index 309b9e3e6ea1..3194da32685a 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_KEYLOG_CALLBACK 3"
-.TH SSL_CTX_SET_KEYLOG_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_KEYLOG_CALLBACK 3ossl"
+.TH SSL_CTX_SET_KEYLOG_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3
index 68b26c5d3c99..13924abbd03e 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_MAX_CERT_LIST 3"
-.TH SSL_CTX_SET_MAX_CERT_LIST 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_MAX_CERT_LIST 3ossl"
+.TH SSL_CTX_SET_MAX_CERT_LIST 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3
index f3b5949ea7e8..244b0ca3035f 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_MIN_PROTO_VERSION 3"
-.TH SSL_CTX_SET_MIN_PROTO_VERSION 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_MIN_PROTO_VERSION 3ossl"
+.TH SSL_CTX_SET_MIN_PROTO_VERSION 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3
index 9b051f004522..14d9cc52bf0c 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_MODE 3"
-.TH SSL_CTX_SET_MODE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_MODE 3ossl"
+.TH SSL_CTX_SET_MODE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3
index 5e6d5263929b..468445c825f8 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_MSG_CALLBACK 3"
-.TH SSL_CTX_SET_MSG_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_MSG_CALLBACK 3ossl"
+.TH SSL_CTX_SET_MSG_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3
index f89c87ea37f2..78c89e23be58 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_NUM_TICKETS 3"
-.TH SSL_CTX_SET_NUM_TICKETS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_NUM_TICKETS 3ossl"
+.TH SSL_CTX_SET_NUM_TICKETS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3
index 206151c8df88..a597ec5a705d 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_OPTIONS 3"
-.TH SSL_CTX_SET_OPTIONS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_OPTIONS 3ossl"
+.TH SSL_CTX_SET_OPTIONS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3
index ecc76a03fe0e..cd65616f6fca 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_PSK_CLIENT_CALLBACK 3"
-.TH SSL_CTX_SET_PSK_CLIENT_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_PSK_CLIENT_CALLBACK 3ossl"
+.TH SSL_CTX_SET_PSK_CLIENT_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3
index f0b009ab5268..b236eabf2019 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_QUIET_SHUTDOWN 3"
-.TH SSL_CTX_SET_QUIET_SHUTDOWN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_QUIET_SHUTDOWN 3ossl"
+.TH SSL_CTX_SET_QUIET_SHUTDOWN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3
index 02aff6d92288..e41e5d4dda2b 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_READ_AHEAD 3"
-.TH SSL_CTX_SET_READ_AHEAD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_READ_AHEAD 3ossl"
+.TH SSL_CTX_SET_READ_AHEAD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_record_padding_callback.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_record_padding_callback.3
index b9a45a395037..7a78550a9df5 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_record_padding_callback.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_record_padding_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_RECORD_PADDING_CALLBACK 3"
-.TH SSL_CTX_SET_RECORD_PADDING_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_RECORD_PADDING_CALLBACK 3ossl"
+.TH SSL_CTX_SET_RECORD_PADDING_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3
index 00120cbf553c..8e19c4a1d6f3 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_SECURITY_LEVEL 3"
-.TH SSL_CTX_SET_SECURITY_LEVEL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_SECURITY_LEVEL 3ossl"
+.TH SSL_CTX_SET_SECURITY_LEVEL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3
index 79f1f7d900de..dbfc66285dc3 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_SESSION_CACHE_MODE 3"
-.TH SSL_CTX_SET_SESSION_CACHE_MODE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_SESSION_CACHE_MODE 3ossl"
+.TH SSL_CTX_SET_SESSION_CACHE_MODE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3
index 5f18e5157316..b245daca0c9b 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_SESSION_ID_CONTEXT 3"
-.TH SSL_CTX_SET_SESSION_ID_CONTEXT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_SESSION_ID_CONTEXT 3ossl"
+.TH SSL_CTX_SET_SESSION_ID_CONTEXT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3
index 7272f1e5322a..e40f3b0a7489 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_SESSION_TICKET_CB 3"
-.TH SSL_CTX_SET_SESSION_TICKET_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_SESSION_TICKET_CB 3ossl"
+.TH SSL_CTX_SET_SESSION_TICKET_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3
index 146cc1b8b25b..a04c137e9e67 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_SPLIT_SEND_FRAGMENT 3"
-.TH SSL_CTX_SET_SPLIT_SEND_FRAGMENT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_SPLIT_SEND_FRAGMENT 3ossl"
+.TH SSL_CTX_SET_SPLIT_SEND_FRAGMENT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_srp_password.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_srp_password.3
index e211075604fd..2bd7018585c4 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_srp_password.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_srp_password.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_SRP_PASSWORD 3"
-.TH SSL_CTX_SET_SRP_PASSWORD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_SRP_PASSWORD 3ossl"
+.TH SSL_CTX_SET_SRP_PASSWORD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3
index ab2d0e5e7164..67ddf3615d53 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_SSL_VERSION 3"
-.TH SSL_CTX_SET_SSL_VERSION 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_SSL_VERSION 3ossl"
+.TH SSL_CTX_SET_SSL_VERSION 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3
index 42819a099780..e9620ac91a37 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_STATELESS_COOKIE_GENERATE_CB 3"
-.TH SSL_CTX_SET_STATELESS_COOKIE_GENERATE_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_STATELESS_COOKIE_GENERATE_CB 3ossl"
+.TH SSL_CTX_SET_STATELESS_COOKIE_GENERATE_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3
index 5304d72e7d8e..d80888f59a1d 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_TIMEOUT 3"
-.TH SSL_CTX_SET_TIMEOUT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_TIMEOUT 3ossl"
+.TH SSL_CTX_SET_TIMEOUT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_servername_callback.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_servername_callback.3
index 26d7149ce443..b249f6b0f745 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_servername_callback.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_servername_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_TLSEXT_SERVERNAME_CALLBACK 3"
-.TH SSL_CTX_SET_TLSEXT_SERVERNAME_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_TLSEXT_SERVERNAME_CALLBACK 3ossl"
+.TH SSL_CTX_SET_TLSEXT_SERVERNAME_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3
index 94879c72c5c3..c67753deb499 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_TLSEXT_STATUS_CB 3"
-.TH SSL_CTX_SET_TLSEXT_STATUS_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_TLSEXT_STATUS_CB 3ossl"
+.TH SSL_CTX_SET_TLSEXT_STATUS_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3
index 6764f5ca6355..ae39e2550ff8 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_TLSEXT_TICKET_KEY_CB 3"
-.TH SSL_CTX_SET_TLSEXT_TICKET_KEY_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_TLSEXT_TICKET_KEY_CB 3ossl"
+.TH SSL_CTX_SET_TLSEXT_TICKET_KEY_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3
index ba00345e44e4..480f1d6b38aa 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_TLSEXT_USE_SRTP 3"
-.TH SSL_CTX_SET_TLSEXT_USE_SRTP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_TLSEXT_USE_SRTP 3ossl"
+.TH SSL_CTX_SET_TLSEXT_USE_SRTP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3
index 0a19063c6fa6..76aa0777c36c 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_TMP_DH_CALLBACK 3"
-.TH SSL_CTX_SET_TMP_DH_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_TMP_DH_CALLBACK 3ossl"
+.TH SSL_CTX_SET_TMP_DH_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3
index 5d5b8acb4682..cabb69c0fa13 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_TMP_ECDH 3"
-.TH SSL_CTX_SET_TMP_ECDH 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_TMP_ECDH 3ossl"
+.TH SSL_CTX_SET_TMP_ECDH 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3
index 4b73cfa5741f..26ec5b6a3223 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_SET_VERIFY 3"
-.TH SSL_CTX_SET_VERIFY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_SET_VERIFY 3ossl"
+.TH SSL_CTX_SET_VERIFY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3
index cb2ae9fefe94..298a879cf806 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_USE_CERTIFICATE 3"
-.TH SSL_CTX_USE_CERTIFICATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_USE_CERTIFICATE 3ossl"
+.TH SSL_CTX_USE_CERTIFICATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3
index e52dbc793f97..0412e3ce279f 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_USE_PSK_IDENTITY_HINT 3"
-.TH SSL_CTX_USE_PSK_IDENTITY_HINT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_USE_PSK_IDENTITY_HINT 3ossl"
+.TH SSL_CTX_USE_PSK_IDENTITY_HINT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3 b/secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3
index 482c84060ffc..da42f3925457 100644
--- a/secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3
+++ b/secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CTX_USE_SERVERINFO 3"
-.TH SSL_CTX_USE_SERVERINFO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CTX_USE_SERVERINFO 3ossl"
+.TH SSL_CTX_USE_SERVERINFO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_free.3
index df4d66ca6684..550c9b1905ab 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_free.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_free.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_FREE 3"
-.TH SSL_SESSION_FREE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_FREE 3ossl"
+.TH SSL_SESSION_FREE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3
index ce994dec5162..7c47503687b3 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_GET0_CIPHER 3"
-.TH SSL_SESSION_GET0_CIPHER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_GET0_CIPHER 3ossl"
+.TH SSL_SESSION_GET0_CIPHER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3
index aaa070c41daf..5194c6b975de 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_GET0_HOSTNAME 3"
-.TH SSL_SESSION_GET0_HOSTNAME 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_GET0_HOSTNAME 3ossl"
+.TH SSL_SESSION_GET0_HOSTNAME 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3
index da3605571298..22147874329c 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_GET0_ID_CONTEXT 3"
-.TH SSL_SESSION_GET0_ID_CONTEXT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_GET0_ID_CONTEXT 3ossl"
+.TH SSL_SESSION_GET0_ID_CONTEXT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3
index 7d59f4a5be1e..09ec15d2c059 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_GET0_PEER 3"
-.TH SSL_SESSION_GET0_PEER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_GET0_PEER 3ossl"
+.TH SSL_SESSION_GET0_PEER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3
index cbcbce4069a1..0cb6db1cd147 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_GET_COMPRESS_ID 3"
-.TH SSL_SESSION_GET_COMPRESS_ID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_GET_COMPRESS_ID 3ossl"
+.TH SSL_SESSION_GET_COMPRESS_ID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_get_protocol_version.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_get_protocol_version.3
index 15f535c3aadb..264f8d519eb5 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_get_protocol_version.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_get_protocol_version.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_GET_PROTOCOL_VERSION 3"
-.TH SSL_SESSION_GET_PROTOCOL_VERSION 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_GET_PROTOCOL_VERSION 3ossl"
+.TH SSL_SESSION_GET_PROTOCOL_VERSION 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3
index 625556449822..9a300cf46897 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_GET_TIME 3"
-.TH SSL_SESSION_GET_TIME 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_GET_TIME 3ossl"
+.TH SSL_SESSION_GET_TIME 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3
index 0c11d9614f6f..5da9297064ab 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_HAS_TICKET 3"
-.TH SSL_SESSION_HAS_TICKET 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_HAS_TICKET 3ossl"
+.TH SSL_SESSION_HAS_TICKET 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3
index 62a868a5c57d..d1600f9511b6 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_IS_RESUMABLE 3"
-.TH SSL_SESSION_IS_RESUMABLE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_IS_RESUMABLE 3ossl"
+.TH SSL_SESSION_IS_RESUMABLE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_print.3
index 542c425a0c9f..f1ffd07e973f 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_print.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_print.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_PRINT 3"
-.TH SSL_SESSION_PRINT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_PRINT 3ossl"
+.TH SSL_SESSION_PRINT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 b/secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3
index 6225db9ff589..7abbae842b5b 100644
--- a/secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3
+++ b/secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_SET1_ID 3"
-.TH SSL_SESSION_SET1_ID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_SET1_ID 3ossl"
+.TH SSL_SESSION_SET1_ID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_accept.3 b/secure/lib/libcrypto/man/man3/SSL_accept.3
index 1b9487741e06..5b97c05f5534 100644
--- a/secure/lib/libcrypto/man/man3/SSL_accept.3
+++ b/secure/lib/libcrypto/man/man3/SSL_accept.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_ACCEPT 3"
-.TH SSL_ACCEPT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_ACCEPT 3ossl"
+.TH SSL_ACCEPT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_alert_type_string.3 b/secure/lib/libcrypto/man/man3/SSL_alert_type_string.3
index b674b67a65c6..7de7c01d1808 100644
--- a/secure/lib/libcrypto/man/man3/SSL_alert_type_string.3
+++ b/secure/lib/libcrypto/man/man3/SSL_alert_type_string.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_ALERT_TYPE_STRING 3"
-.TH SSL_ALERT_TYPE_STRING 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_ALERT_TYPE_STRING 3ossl"
+.TH SSL_ALERT_TYPE_STRING 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 b/secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3
index f8b2f395794f..75619a37ab89 100644
--- a/secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3
+++ b/secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_ALLOC_BUFFERS 3"
-.TH SSL_ALLOC_BUFFERS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_ALLOC_BUFFERS 3ossl"
+.TH SSL_ALLOC_BUFFERS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_check_chain.3 b/secure/lib/libcrypto/man/man3/SSL_check_chain.3
index 7a05db7e7a8b..57b96adbedfb 100644
--- a/secure/lib/libcrypto/man/man3/SSL_check_chain.3
+++ b/secure/lib/libcrypto/man/man3/SSL_check_chain.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CHECK_CHAIN 3"
-.TH SSL_CHECK_CHAIN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CHECK_CHAIN 3ossl"
+.TH SSL_CHECK_CHAIN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_clear.3 b/secure/lib/libcrypto/man/man3/SSL_clear.3
index 466a46d4b31c..820701b948ea 100644
--- a/secure/lib/libcrypto/man/man3/SSL_clear.3
+++ b/secure/lib/libcrypto/man/man3/SSL_clear.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CLEAR 3"
-.TH SSL_CLEAR 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CLEAR 3ossl"
+.TH SSL_CLEAR 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_connect.3 b/secure/lib/libcrypto/man/man3/SSL_connect.3
index cd24d54fc8e6..830a64ad2899 100644
--- a/secure/lib/libcrypto/man/man3/SSL_connect.3
+++ b/secure/lib/libcrypto/man/man3/SSL_connect.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_CONNECT 3"
-.TH SSL_CONNECT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_CONNECT 3ossl"
+.TH SSL_CONNECT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_do_handshake.3 b/secure/lib/libcrypto/man/man3/SSL_do_handshake.3
index 122de359b5b4..ba612aff2d1e 100644
--- a/secure/lib/libcrypto/man/man3/SSL_do_handshake.3
+++ b/secure/lib/libcrypto/man/man3/SSL_do_handshake.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_DO_HANDSHAKE 3"
-.TH SSL_DO_HANDSHAKE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_DO_HANDSHAKE 3ossl"
+.TH SSL_DO_HANDSHAKE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_export_keying_material.3 b/secure/lib/libcrypto/man/man3/SSL_export_keying_material.3
index 5f10c096b62b..26991f6b44ef 100644
--- a/secure/lib/libcrypto/man/man3/SSL_export_keying_material.3
+++ b/secure/lib/libcrypto/man/man3/SSL_export_keying_material.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_EXPORT_KEYING_MATERIAL 3"
-.TH SSL_EXPORT_KEYING_MATERIAL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_EXPORT_KEYING_MATERIAL 3ossl"
+.TH SSL_EXPORT_KEYING_MATERIAL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_extension_supported.3 b/secure/lib/libcrypto/man/man3/SSL_extension_supported.3
index a782b4fcd698..d3cd330fff0c 100644
--- a/secure/lib/libcrypto/man/man3/SSL_extension_supported.3
+++ b/secure/lib/libcrypto/man/man3/SSL_extension_supported.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_EXTENSION_SUPPORTED 3"
-.TH SSL_EXTENSION_SUPPORTED 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_EXTENSION_SUPPORTED 3ossl"
+.TH SSL_EXTENSION_SUPPORTED 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_free.3 b/secure/lib/libcrypto/man/man3/SSL_free.3
index 7e768253a7a9..0ba484d71d16 100644
--- a/secure/lib/libcrypto/man/man3/SSL_free.3
+++ b/secure/lib/libcrypto/man/man3/SSL_free.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_FREE 3"
-.TH SSL_FREE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_FREE 3ossl"
+.TH SSL_FREE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 b/secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3
index 347314b832d8..d9ea3c521b86 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET0_PEER_SCTS 3"
-.TH SSL_GET0_PEER_SCTS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET0_PEER_SCTS 3ossl"
+.TH SSL_GET0_PEER_SCTS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 b/secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3
index 45653ba395f0..24ec82b39d51 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_SSL_CTX 3"
-.TH SSL_GET_SSL_CTX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_SSL_CTX 3ossl"
+.TH SSL_GET_SSL_CTX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3 b/secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3
index 1bda013b5bc2..5956a40c237f 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_ALL_ASYNC_FDS 3"
-.TH SSL_GET_ALL_ASYNC_FDS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_ALL_ASYNC_FDS 3ossl"
+.TH SSL_GET_ALL_ASYNC_FDS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_certificate.3 b/secure/lib/libcrypto/man/man3/SSL_get_certificate.3
index bfca36315b79..c173563f2b01 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_certificate.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_certificate.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_CERTIFICATE 3"
-.TH SSL_GET_CERTIFICATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_CERTIFICATE 3ossl"
+.TH SSL_GET_CERTIFICATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 b/secure/lib/libcrypto/man/man3/SSL_get_ciphers.3
index 675c7bab97b7..906809df9a0a 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_ciphers.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_ciphers.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_CIPHERS 3"
-.TH SSL_GET_CIPHERS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_CIPHERS 3ossl"
+.TH SSL_GET_CIPHERS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_client_random.3 b/secure/lib/libcrypto/man/man3/SSL_get_client_random.3
index e2c66d4ef8e0..145e9cd1f352 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_client_random.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_client_random.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_CLIENT_RANDOM 3"
-.TH SSL_GET_CLIENT_RANDOM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_CLIENT_RANDOM 3ossl"
+.TH SSL_GET_CLIENT_RANDOM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3 b/secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3
index 38a4fe0abc89..f01599a88dd9 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_CURRENT_CIPHER 3"
-.TH SSL_GET_CURRENT_CIPHER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_CURRENT_CIPHER 3ossl"
+.TH SSL_GET_CURRENT_CIPHER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3 b/secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3
index 1d7fa0134424..71d54a705555 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_DEFAULT_TIMEOUT 3"
-.TH SSL_GET_DEFAULT_TIMEOUT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_DEFAULT_TIMEOUT 3ossl"
+.TH SSL_GET_DEFAULT_TIMEOUT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_error.3 b/secure/lib/libcrypto/man/man3/SSL_get_error.3
index 08e54d7a3c39..203a6e8ac5a7 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_error.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_error.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_ERROR 3"
-.TH SSL_GET_ERROR 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_ERROR 3ossl"
+.TH SSL_GET_ERROR 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_extms_support.3 b/secure/lib/libcrypto/man/man3/SSL_get_extms_support.3
index 96f1abc6000e..6ed5ca872a8f 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_extms_support.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_extms_support.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_EXTMS_SUPPORT 3"
-.TH SSL_GET_EXTMS_SUPPORT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_EXTMS_SUPPORT 3ossl"
+.TH SSL_GET_EXTMS_SUPPORT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_fd.3 b/secure/lib/libcrypto/man/man3/SSL_get_fd.3
index 534eb7bf2900..39cb51ab00e3 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_fd.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_fd.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_FD 3"
-.TH SSL_GET_FD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_FD 3ossl"
+.TH SSL_GET_FD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3 b/secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3
index 2e4844d1919e..d383e5f2adbf 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_PEER_CERT_CHAIN 3"
-.TH SSL_GET_PEER_CERT_CHAIN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_PEER_CERT_CHAIN 3ossl"
+.TH SSL_GET_PEER_CERT_CHAIN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3 b/secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3
index 65636cfca65d..eeaa44b6a611 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_PEER_CERTIFICATE 3"
-.TH SSL_GET_PEER_CERTIFICATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_PEER_CERTIFICATE 3ossl"
+.TH SSL_GET_PEER_CERTIFICATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3 b/secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3
index f676eee51e32..26417c582990 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_PEER_SIGNATURE_NID 3"
-.TH SSL_GET_PEER_SIGNATURE_NID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_PEER_SIGNATURE_NID 3ossl"
+.TH SSL_GET_PEER_SIGNATURE_NID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 b/secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3
index 76195999549a..1a1a846a9158 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_PEER_TMP_KEY 3"
-.TH SSL_GET_PEER_TMP_KEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_PEER_TMP_KEY 3ossl"
+.TH SSL_GET_PEER_TMP_KEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3 b/secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3
index e5c613132c5c..731349e9cffc 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_PSK_IDENTITY 3"
-.TH SSL_GET_PSK_IDENTITY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_PSK_IDENTITY 3ossl"
+.TH SSL_GET_PSK_IDENTITY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_rbio.3 b/secure/lib/libcrypto/man/man3/SSL_get_rbio.3
index 4fefccaec42a..c69d63e04f7d 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_rbio.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_rbio.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_RBIO 3"
-.TH SSL_GET_RBIO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_RBIO 3ossl"
+.TH SSL_GET_RBIO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_session.3 b/secure/lib/libcrypto/man/man3/SSL_get_session.3
index 1de2fa12eed9..3f14d2306931 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_session.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_session.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_SESSION 3"
-.TH SSL_GET_SESSION 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_SESSION 3ossl"
+.TH SSL_GET_SESSION 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3 b/secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3
index 7919016431b1..c9b831816c03 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_SHARED_SIGALGS 3"
-.TH SSL_GET_SHARED_SIGALGS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_SHARED_SIGALGS 3ossl"
+.TH SSL_GET_SHARED_SIGALGS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_verify_result.3 b/secure/lib/libcrypto/man/man3/SSL_get_verify_result.3
index c13a79b92e41..b62013695978 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_verify_result.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_verify_result.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_VERIFY_RESULT 3"
-.TH SSL_GET_VERIFY_RESULT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_VERIFY_RESULT 3ossl"
+.TH SSL_GET_VERIFY_RESULT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_get_version.3 b/secure/lib/libcrypto/man/man3/SSL_get_version.3
index efbf9231e6e6..fc82c6c7643f 100644
--- a/secure/lib/libcrypto/man/man3/SSL_get_version.3
+++ b/secure/lib/libcrypto/man/man3/SSL_get_version.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GET_VERSION 3"
-.TH SSL_GET_VERSION 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GET_VERSION 3ossl"
+.TH SSL_GET_VERSION 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_group_to_name.3 b/secure/lib/libcrypto/man/man3/SSL_group_to_name.3
index 77f85af19ed7..a98b43752082 100644
--- a/secure/lib/libcrypto/man/man3/SSL_group_to_name.3
+++ b/secure/lib/libcrypto/man/man3/SSL_group_to_name.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_GROUP_TO_NAME 3"
-.TH SSL_GROUP_TO_NAME 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_GROUP_TO_NAME 3ossl"
+.TH SSL_GROUP_TO_NAME 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_in_init.3 b/secure/lib/libcrypto/man/man3/SSL_in_init.3
index a2b8804cd12f..264f44af1a9b 100644
--- a/secure/lib/libcrypto/man/man3/SSL_in_init.3
+++ b/secure/lib/libcrypto/man/man3/SSL_in_init.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_IN_INIT 3"
-.TH SSL_IN_INIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_IN_INIT 3ossl"
+.TH SSL_IN_INIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_key_update.3 b/secure/lib/libcrypto/man/man3/SSL_key_update.3
index 2410412697a1..517451110331 100644
--- a/secure/lib/libcrypto/man/man3/SSL_key_update.3
+++ b/secure/lib/libcrypto/man/man3/SSL_key_update.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_KEY_UPDATE 3"
-.TH SSL_KEY_UPDATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_KEY_UPDATE 3ossl"
+.TH SSL_KEY_UPDATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_library_init.3 b/secure/lib/libcrypto/man/man3/SSL_library_init.3
index 524a6eae0915..c65b8116f715 100644
--- a/secure/lib/libcrypto/man/man3/SSL_library_init.3
+++ b/secure/lib/libcrypto/man/man3/SSL_library_init.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_LIBRARY_INIT 3"
-.TH SSL_LIBRARY_INIT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_LIBRARY_INIT 3ossl"
+.TH SSL_LIBRARY_INIT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3 b/secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3
index 4b659d13d7b6..cc309149cf5e 100644
--- a/secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3
+++ b/secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_LOAD_CLIENT_CA_FILE 3"
-.TH SSL_LOAD_CLIENT_CA_FILE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_LOAD_CLIENT_CA_FILE 3ossl"
+.TH SSL_LOAD_CLIENT_CA_FILE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_new.3 b/secure/lib/libcrypto/man/man3/SSL_new.3
index 2ef8443e6b85..13e6da7b7309 100644
--- a/secure/lib/libcrypto/man/man3/SSL_new.3
+++ b/secure/lib/libcrypto/man/man3/SSL_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_NEW 3"
-.TH SSL_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_NEW 3ossl"
+.TH SSL_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -172,7 +172,7 @@ For \fBSSL_dup()\fR to work, the connection \s-1MUST\s0 be in its initial state
 their initial state \fBSSL_dup()\fR just increments an internal
 reference count and returns the \fIsame\fR handle.  It may be possible to
 use \fBSSL_clear\fR\|(3) to recycle an \s-1SSL\s0 handle that is not in its initial
-state for re-use, but this is best avoided.  Instead, save and restore
+state for reuse, but this is best avoided.  Instead, save and restore
 the session, if desired, and construct a fresh handle for each connection.
 .PP
 The subset of settings in \fIs\fR that are duplicated are:
@@ -244,7 +244,7 @@ The return value points to an allocated \s-1SSL\s0 structure.
 \&\fBssl\fR\|(7)
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2000\-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/lib/libcrypto/man/man3/SSL_pending.3 b/secure/lib/libcrypto/man/man3/SSL_pending.3
index f254400e82c5..816ba18fb868 100644
--- a/secure/lib/libcrypto/man/man3/SSL_pending.3
+++ b/secure/lib/libcrypto/man/man3/SSL_pending.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_PENDING 3"
-.TH SSL_PENDING 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_PENDING 3ossl"
+.TH SSL_PENDING 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_read.3 b/secure/lib/libcrypto/man/man3/SSL_read.3
index b27fce1e114f..26c31c1762bb 100644
--- a/secure/lib/libcrypto/man/man3/SSL_read.3
+++ b/secure/lib/libcrypto/man/man3/SSL_read.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_READ 3"
-.TH SSL_READ 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_READ 3ossl"
+.TH SSL_READ 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_read_early_data.3 b/secure/lib/libcrypto/man/man3/SSL_read_early_data.3
index 9c34efdaa574..08b73823f526 100644
--- a/secure/lib/libcrypto/man/man3/SSL_read_early_data.3
+++ b/secure/lib/libcrypto/man/man3/SSL_read_early_data.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_READ_EARLY_DATA 3"
-.TH SSL_READ_EARLY_DATA 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_READ_EARLY_DATA 3ossl"
+.TH SSL_READ_EARLY_DATA 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_rstate_string.3 b/secure/lib/libcrypto/man/man3/SSL_rstate_string.3
index 45184b625f26..bef94dfe2dab 100644
--- a/secure/lib/libcrypto/man/man3/SSL_rstate_string.3
+++ b/secure/lib/libcrypto/man/man3/SSL_rstate_string.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_RSTATE_STRING 3"
-.TH SSL_RSTATE_STRING 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_RSTATE_STRING 3ossl"
+.TH SSL_RSTATE_STRING 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_session_reused.3 b/secure/lib/libcrypto/man/man3/SSL_session_reused.3
index 6f9c4c3405c3..c3175bffaae5 100644
--- a/secure/lib/libcrypto/man/man3/SSL_session_reused.3
+++ b/secure/lib/libcrypto/man/man3/SSL_session_reused.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SESSION_REUSED 3"
-.TH SSL_SESSION_REUSED 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SESSION_REUSED 3ossl"
+.TH SSL_SESSION_REUSED 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_set1_host.3 b/secure/lib/libcrypto/man/man3/SSL_set1_host.3
index 9fdb17d83402..94fb9d3800dc 100644
--- a/secure/lib/libcrypto/man/man3/SSL_set1_host.3
+++ b/secure/lib/libcrypto/man/man3/SSL_set1_host.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SET1_HOST 3"
-.TH SSL_SET1_HOST 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SET1_HOST 3ossl"
+.TH SSL_SET1_HOST 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_set_async_callback.3 b/secure/lib/libcrypto/man/man3/SSL_set_async_callback.3
index e1da72469543..c6bbe2887163 100644
--- a/secure/lib/libcrypto/man/man3/SSL_set_async_callback.3
+++ b/secure/lib/libcrypto/man/man3/SSL_set_async_callback.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SET_ASYNC_CALLBACK 3"
-.TH SSL_SET_ASYNC_CALLBACK 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SET_ASYNC_CALLBACK 3ossl"
+.TH SSL_SET_ASYNC_CALLBACK 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_set_bio.3 b/secure/lib/libcrypto/man/man3/SSL_set_bio.3
index 8c1f41749959..e24abca6ba3e 100644
--- a/secure/lib/libcrypto/man/man3/SSL_set_bio.3
+++ b/secure/lib/libcrypto/man/man3/SSL_set_bio.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SET_BIO 3"
-.TH SSL_SET_BIO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SET_BIO 3ossl"
+.TH SSL_SET_BIO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_set_connect_state.3 b/secure/lib/libcrypto/man/man3/SSL_set_connect_state.3
index 9b20b481f0b3..31d0ad6a9589 100644
--- a/secure/lib/libcrypto/man/man3/SSL_set_connect_state.3
+++ b/secure/lib/libcrypto/man/man3/SSL_set_connect_state.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SET_CONNECT_STATE 3"
-.TH SSL_SET_CONNECT_STATE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SET_CONNECT_STATE 3ossl"
+.TH SSL_SET_CONNECT_STATE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_set_fd.3 b/secure/lib/libcrypto/man/man3/SSL_set_fd.3
index 436437ac1d18..c4edfd2c5b12 100644
--- a/secure/lib/libcrypto/man/man3/SSL_set_fd.3
+++ b/secure/lib/libcrypto/man/man3/SSL_set_fd.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SET_FD 3"
-.TH SSL_SET_FD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SET_FD 3ossl"
+.TH SSL_SET_FD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_set_retry_verify.3 b/secure/lib/libcrypto/man/man3/SSL_set_retry_verify.3
index 79d5669c1668..586e894935ec 100644
--- a/secure/lib/libcrypto/man/man3/SSL_set_retry_verify.3
+++ b/secure/lib/libcrypto/man/man3/SSL_set_retry_verify.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SET_RETRY_VERIFY 3"
-.TH SSL_SET_RETRY_VERIFY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SET_RETRY_VERIFY 3ossl"
+.TH SSL_SET_RETRY_VERIFY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_set_session.3 b/secure/lib/libcrypto/man/man3/SSL_set_session.3
index afd4138ac8fc..560dc6cc3ee3 100644
--- a/secure/lib/libcrypto/man/man3/SSL_set_session.3
+++ b/secure/lib/libcrypto/man/man3/SSL_set_session.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SET_SESSION 3"
-.TH SSL_SET_SESSION 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SET_SESSION 3ossl"
+.TH SSL_SET_SESSION 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 b/secure/lib/libcrypto/man/man3/SSL_set_shutdown.3
index a86bcf005640..773d4934542c 100644
--- a/secure/lib/libcrypto/man/man3/SSL_set_shutdown.3
+++ b/secure/lib/libcrypto/man/man3/SSL_set_shutdown.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SET_SHUTDOWN 3"
-.TH SSL_SET_SHUTDOWN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SET_SHUTDOWN 3ossl"
+.TH SSL_SET_SHUTDOWN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_set_verify_result.3 b/secure/lib/libcrypto/man/man3/SSL_set_verify_result.3
index e3eb05cd1f3a..4db55b4e2eb9 100644
--- a/secure/lib/libcrypto/man/man3/SSL_set_verify_result.3
+++ b/secure/lib/libcrypto/man/man3/SSL_set_verify_result.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SET_VERIFY_RESULT 3"
-.TH SSL_SET_VERIFY_RESULT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SET_VERIFY_RESULT 3ossl"
+.TH SSL_SET_VERIFY_RESULT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_shutdown.3 b/secure/lib/libcrypto/man/man3/SSL_shutdown.3
index 7b0c66b06dce..c012c477b682 100644
--- a/secure/lib/libcrypto/man/man3/SSL_shutdown.3
+++ b/secure/lib/libcrypto/man/man3/SSL_shutdown.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_SHUTDOWN 3"
-.TH SSL_SHUTDOWN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_SHUTDOWN 3ossl"
+.TH SSL_SHUTDOWN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_state_string.3 b/secure/lib/libcrypto/man/man3/SSL_state_string.3
index 7f78657a7b97..75815dedbeb8 100644
--- a/secure/lib/libcrypto/man/man3/SSL_state_string.3
+++ b/secure/lib/libcrypto/man/man3/SSL_state_string.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_STATE_STRING 3"
-.TH SSL_STATE_STRING 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_STATE_STRING 3ossl"
+.TH SSL_STATE_STRING 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_want.3 b/secure/lib/libcrypto/man/man3/SSL_want.3
index 4e3f7ffaf2df..22bec6260584 100644
--- a/secure/lib/libcrypto/man/man3/SSL_want.3
+++ b/secure/lib/libcrypto/man/man3/SSL_want.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_WANT 3"
-.TH SSL_WANT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_WANT 3ossl"
+.TH SSL_WANT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/SSL_write.3 b/secure/lib/libcrypto/man/man3/SSL_write.3
index a8f3a3a35468..55cc52a39e01 100644
--- a/secure/lib/libcrypto/man/man3/SSL_write.3
+++ b/secure/lib/libcrypto/man/man3/SSL_write.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL_WRITE 3"
-.TH SSL_WRITE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL_WRITE 3ossl"
+.TH SSL_WRITE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3 b/secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3
index 9d0201078ced..09776774af04 100644
--- a/secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3
+++ b/secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "TS_RESP_CTX_NEW 3"
-.TH TS_RESP_CTX_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "TS_RESP_CTX_NEW 3ossl"
+.TH TS_RESP_CTX_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/TS_VERIFY_CTX_set_certs.3 b/secure/lib/libcrypto/man/man3/TS_VERIFY_CTX_set_certs.3
index 5d964425a895..5e17d435300e 100644
--- a/secure/lib/libcrypto/man/man3/TS_VERIFY_CTX_set_certs.3
+++ b/secure/lib/libcrypto/man/man3/TS_VERIFY_CTX_set_certs.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "TS_VERIFY_CTX_SET_CERTS 3"
-.TH TS_VERIFY_CTX_SET_CERTS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "TS_VERIFY_CTX_SET_CERTS 3ossl"
+.TH TS_VERIFY_CTX_SET_CERTS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/UI_STRING.3 b/secure/lib/libcrypto/man/man3/UI_STRING.3
index 538ef229eefd..d3eb168ef5cd 100644
--- a/secure/lib/libcrypto/man/man3/UI_STRING.3
+++ b/secure/lib/libcrypto/man/man3/UI_STRING.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "UI_STRING 3"
-.TH UI_STRING 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "UI_STRING 3ossl"
+.TH UI_STRING 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 b/secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3
index 4725f1059b74..75a3c4c8961e 100644
--- a/secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3
+++ b/secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "UI_UTIL_READ_PW 3"
-.TH UI_UTIL_READ_PW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "UI_UTIL_READ_PW 3ossl"
+.TH UI_UTIL_READ_PW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/UI_create_method.3 b/secure/lib/libcrypto/man/man3/UI_create_method.3
index 9ebb60a2fdb6..a1c0a05a768a 100644
--- a/secure/lib/libcrypto/man/man3/UI_create_method.3
+++ b/secure/lib/libcrypto/man/man3/UI_create_method.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "UI_CREATE_METHOD 3"
-.TH UI_CREATE_METHOD 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "UI_CREATE_METHOD 3ossl"
+.TH UI_CREATE_METHOD 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/UI_new.3 b/secure/lib/libcrypto/man/man3/UI_new.3
index f6c97bf27366..80490ee91a9e 100644
--- a/secure/lib/libcrypto/man/man3/UI_new.3
+++ b/secure/lib/libcrypto/man/man3/UI_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "UI_NEW 3"
-.TH UI_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "UI_NEW 3ossl"
+.TH UI_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 b/secure/lib/libcrypto/man/man3/X509V3_get_d2i.3
index 9e8df6efd55c..4f0d19a2705e 100644
--- a/secure/lib/libcrypto/man/man3/X509V3_get_d2i.3
+++ b/secure/lib/libcrypto/man/man3/X509V3_get_d2i.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509V3_GET_D2I 3"
-.TH X509V3_GET_D2I 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509V3_GET_D2I 3ossl"
+.TH X509V3_GET_D2I 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509V3_set_ctx.3 b/secure/lib/libcrypto/man/man3/X509V3_set_ctx.3
index 2847abb5bbcf..4aa23e5b998b 100644
--- a/secure/lib/libcrypto/man/man3/X509V3_set_ctx.3
+++ b/secure/lib/libcrypto/man/man3/X509V3_set_ctx.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509V3_SET_CTX 3"
-.TH X509V3_SET_CTX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509V3_SET_CTX 3ossl"
+.TH X509V3_SET_CTX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 b/secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3
index 98da8a828bfc..83e11fc042b2 100644
--- a/secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3
+++ b/secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_ALGOR_DUP 3"
-.TH X509_ALGOR_DUP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_ALGOR_DUP 3ossl"
+.TH X509_ALGOR_DUP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3 b/secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3
index 071fdc82be65..4da2ea149da3 100644
--- a/secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3
+++ b/secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_CRL_GET0_BY_SERIAL 3"
-.TH X509_CRL_GET0_BY_SERIAL 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_CRL_GET0_BY_SERIAL 3ossl"
+.TH X509_CRL_GET0_BY_SERIAL 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3 b/secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3
index 6b5f04562ffa..4bdf52c94378 100644
--- a/secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3
+++ b/secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_EXTENSION_SET_OBJECT 3"
-.TH X509_EXTENSION_SET_OBJECT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_EXTENSION_SET_OBJECT 3ossl"
+.TH X509_EXTENSION_SET_OBJECT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_LOOKUP.3 b/secure/lib/libcrypto/man/man3/X509_LOOKUP.3
index 384a0d57ff9b..25bd9926df54 100644
--- a/secure/lib/libcrypto/man/man3/X509_LOOKUP.3
+++ b/secure/lib/libcrypto/man/man3/X509_LOOKUP.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_LOOKUP 3"
-.TH X509_LOOKUP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_LOOKUP 3ossl"
+.TH X509_LOOKUP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 b/secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3
index fabb5a1bdc4c..f95b9850c389 100644
--- a/secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3
+++ b/secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_LOOKUP_HASH_DIR 3"
-.TH X509_LOOKUP_HASH_DIR 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_LOOKUP_HASH_DIR 3ossl"
+.TH X509_LOOKUP_HASH_DIR 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 b/secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3
index b0e9dd043a5b..85eba110b603 100644
--- a/secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3
+++ b/secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_LOOKUP_METH_NEW 3"
-.TH X509_LOOKUP_METH_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_LOOKUP_METH_NEW 3ossl"
+.TH X509_LOOKUP_METH_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3 b/secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3
index f6c2645e8ecb..e68da175caeb 100644
--- a/secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3
+++ b/secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_NAME_ENTRY_GET_OBJECT 3"
-.TH X509_NAME_ENTRY_GET_OBJECT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_NAME_ENTRY_GET_OBJECT 3ossl"
+.TH X509_NAME_ENTRY_GET_OBJECT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3 b/secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3
index 9f0ffaae2e9f..a321d31e7a7a 100644
--- a/secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3
+++ b/secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_NAME_ADD_ENTRY_BY_TXT 3"
-.TH X509_NAME_ADD_ENTRY_BY_TXT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_NAME_ADD_ENTRY_BY_TXT 3ossl"
+.TH X509_NAME_ADD_ENTRY_BY_TXT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 b/secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3
index 8519a5e90cb0..8d189d34341d 100644
--- a/secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3
+++ b/secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_NAME_GET0_DER 3"
-.TH X509_NAME_GET0_DER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_NAME_GET0_DER 3ossl"
+.TH X509_NAME_GET0_DER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3 b/secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3
index ff897af64605..c1b6634ce56a 100644
--- a/secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3
+++ b/secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_NAME_GET_INDEX_BY_NID 3"
-.TH X509_NAME_GET_INDEX_BY_NID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_NAME_GET_INDEX_BY_NID 3ossl"
+.TH X509_NAME_GET_INDEX_BY_NID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 b/secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3
index dd65c35fd6b9..181a3a1c9cf2 100644
--- a/secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3
+++ b/secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_NAME_PRINT_EX 3"
-.TH X509_NAME_PRINT_EX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_NAME_PRINT_EX 3ossl"
+.TH X509_NAME_PRINT_EX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 b/secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3
index bd6a93424bbd..5bacae99d583 100644
--- a/secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3
+++ b/secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_PUBKEY_NEW 3"
-.TH X509_PUBKEY_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_PUBKEY_NEW 3ossl"
+.TH X509_PUBKEY_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_SIG_get0.3 b/secure/lib/libcrypto/man/man3/X509_SIG_get0.3
index 64bbb65efe12..1ed6d0b967c5 100644
--- a/secure/lib/libcrypto/man/man3/X509_SIG_get0.3
+++ b/secure/lib/libcrypto/man/man3/X509_SIG_get0.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_SIG_GET0 3"
-.TH X509_SIG_GET0 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_SIG_GET0 3ossl"
+.TH X509_SIG_GET0 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3 b/secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3
index 6b3500674c5f..7564a37f514a 100644
--- a/secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3
+++ b/secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_STORE_CTX_GET_ERROR 3"
-.TH X509_STORE_CTX_GET_ERROR 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_STORE_CTX_GET_ERROR 3ossl"
+.TH X509_STORE_CTX_GET_ERROR 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 b/secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3
index 8d4a485192c0..bb2698c82a48 100644
--- a/secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3
+++ b/secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_STORE_CTX_NEW 3"
-.TH X509_STORE_CTX_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_STORE_CTX_NEW 3ossl"
+.TH X509_STORE_CTX_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3 b/secure/lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3
index e6b97a589933..7be7f73c1e17 100644
--- a/secure/lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3
+++ b/secure/lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_STORE_CTX_SET_VERIFY_CB 3"
-.TH X509_STORE_CTX_SET_VERIFY_CB 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_STORE_CTX_SET_VERIFY_CB 3ossl"
+.TH X509_STORE_CTX_SET_VERIFY_CB 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3 b/secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3
index 5590021e668f..678b46ace8cb 100644
--- a/secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3
+++ b/secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_STORE_ADD_CERT 3"
-.TH X509_STORE_ADD_CERT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_STORE_ADD_CERT 3ossl"
+.TH X509_STORE_ADD_CERT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3 b/secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3
index f5bc18db20df..8c9cada1864d 100644
--- a/secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3
+++ b/secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_STORE_GET0_PARAM 3"
-.TH X509_STORE_GET0_PARAM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_STORE_GET0_PARAM 3ossl"
+.TH X509_STORE_GET0_PARAM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_STORE_new.3 b/secure/lib/libcrypto/man/man3/X509_STORE_new.3
index f82d379b0b6b..ade5597e0296 100644
--- a/secure/lib/libcrypto/man/man3/X509_STORE_new.3
+++ b/secure/lib/libcrypto/man/man3/X509_STORE_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_STORE_NEW 3"
-.TH X509_STORE_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_STORE_NEW 3ossl"
+.TH X509_STORE_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3 b/secure/lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3
index 0b49b0de3da0..2229727ece9c 100644
--- a/secure/lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3
+++ b/secure/lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_STORE_SET_VERIFY_CB_FUNC 3"
-.TH X509_STORE_SET_VERIFY_CB_FUNC 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_STORE_SET_VERIFY_CB_FUNC 3ossl"
+.TH X509_STORE_SET_VERIFY_CB_FUNC 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3 b/secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3
index 2ba4fe25af0f..69206547b3e7 100644
--- a/secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3
+++ b/secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_VERIFY_PARAM_SET_FLAGS 3"
-.TH X509_VERIFY_PARAM_SET_FLAGS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_VERIFY_PARAM_SET_FLAGS 3ossl"
+.TH X509_VERIFY_PARAM_SET_FLAGS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_add_cert.3 b/secure/lib/libcrypto/man/man3/X509_add_cert.3
index 6819d65e8d09..019a56436a06 100644
--- a/secure/lib/libcrypto/man/man3/X509_add_cert.3
+++ b/secure/lib/libcrypto/man/man3/X509_add_cert.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_ADD_CERT 3"
-.TH X509_ADD_CERT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_ADD_CERT 3ossl"
+.TH X509_ADD_CERT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_check_ca.3 b/secure/lib/libcrypto/man/man3/X509_check_ca.3
index 3432cc0d6772..054bf84853cf 100644
--- a/secure/lib/libcrypto/man/man3/X509_check_ca.3
+++ b/secure/lib/libcrypto/man/man3/X509_check_ca.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_CHECK_CA 3"
-.TH X509_CHECK_CA 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_CHECK_CA 3ossl"
+.TH X509_CHECK_CA 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_check_host.3 b/secure/lib/libcrypto/man/man3/X509_check_host.3
index d6ce3a495d8f..8d63f545225c 100644
--- a/secure/lib/libcrypto/man/man3/X509_check_host.3
+++ b/secure/lib/libcrypto/man/man3/X509_check_host.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_CHECK_HOST 3"
-.TH X509_CHECK_HOST 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_CHECK_HOST 3ossl"
+.TH X509_CHECK_HOST 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_check_issued.3 b/secure/lib/libcrypto/man/man3/X509_check_issued.3
index 159993a95bc4..745c83445668 100644
--- a/secure/lib/libcrypto/man/man3/X509_check_issued.3
+++ b/secure/lib/libcrypto/man/man3/X509_check_issued.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_CHECK_ISSUED 3"
-.TH X509_CHECK_ISSUED 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_CHECK_ISSUED 3ossl"
+.TH X509_CHECK_ISSUED 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_check_private_key.3 b/secure/lib/libcrypto/man/man3/X509_check_private_key.3
index 091f0b154dfe..4289064f1f7a 100644
--- a/secure/lib/libcrypto/man/man3/X509_check_private_key.3
+++ b/secure/lib/libcrypto/man/man3/X509_check_private_key.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_CHECK_PRIVATE_KEY 3"
-.TH X509_CHECK_PRIVATE_KEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_CHECK_PRIVATE_KEY 3ossl"
+.TH X509_CHECK_PRIVATE_KEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_check_purpose.3 b/secure/lib/libcrypto/man/man3/X509_check_purpose.3
index cdece43a2aa6..def4c4869e60 100644
--- a/secure/lib/libcrypto/man/man3/X509_check_purpose.3
+++ b/secure/lib/libcrypto/man/man3/X509_check_purpose.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_CHECK_PURPOSE 3"
-.TH X509_CHECK_PURPOSE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_CHECK_PURPOSE 3ossl"
+.TH X509_CHECK_PURPOSE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_cmp.3 b/secure/lib/libcrypto/man/man3/X509_cmp.3
index d8a55e6427cf..19543093b2e0 100644
--- a/secure/lib/libcrypto/man/man3/X509_cmp.3
+++ b/secure/lib/libcrypto/man/man3/X509_cmp.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_CMP 3"
-.TH X509_CMP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_CMP 3ossl"
+.TH X509_CMP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_cmp_time.3 b/secure/lib/libcrypto/man/man3/X509_cmp_time.3
index 7875cc48e4c1..21599a556bd0 100644
--- a/secure/lib/libcrypto/man/man3/X509_cmp_time.3
+++ b/secure/lib/libcrypto/man/man3/X509_cmp_time.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_CMP_TIME 3"
-.TH X509_CMP_TIME 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_CMP_TIME 3ossl"
+.TH X509_CMP_TIME 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_digest.3 b/secure/lib/libcrypto/man/man3/X509_digest.3
index 0c0aefcd6d65..661b454dfb18 100644
--- a/secure/lib/libcrypto/man/man3/X509_digest.3
+++ b/secure/lib/libcrypto/man/man3/X509_digest.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_DIGEST 3"
-.TH X509_DIGEST 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_DIGEST 3ossl"
+.TH X509_DIGEST 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_dup.3 b/secure/lib/libcrypto/man/man3/X509_dup.3
index 96153d4473a8..ca6cb8b21897 100644
--- a/secure/lib/libcrypto/man/man3/X509_dup.3
+++ b/secure/lib/libcrypto/man/man3/X509_dup.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_DUP 3"
-.TH X509_DUP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_DUP 3ossl"
+.TH X509_DUP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_get0_distinguishing_id.3 b/secure/lib/libcrypto/man/man3/X509_get0_distinguishing_id.3
index c6754092cb80..81f0ab147b86 100644
--- a/secure/lib/libcrypto/man/man3/X509_get0_distinguishing_id.3
+++ b/secure/lib/libcrypto/man/man3/X509_get0_distinguishing_id.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_GET0_DISTINGUISHING_ID 3"
-.TH X509_GET0_DISTINGUISHING_ID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_GET0_DISTINGUISHING_ID 3ossl"
+.TH X509_GET0_DISTINGUISHING_ID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_get0_notBefore.3 b/secure/lib/libcrypto/man/man3/X509_get0_notBefore.3
index 7c3dbe85a36c..8b880514c1eb 100644
--- a/secure/lib/libcrypto/man/man3/X509_get0_notBefore.3
+++ b/secure/lib/libcrypto/man/man3/X509_get0_notBefore.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_GET0_NOTBEFORE 3"
-.TH X509_GET0_NOTBEFORE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_GET0_NOTBEFORE 3ossl"
+.TH X509_GET0_NOTBEFORE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_get0_signature.3 b/secure/lib/libcrypto/man/man3/X509_get0_signature.3
index c6ff3f76e896..f2490c90e519 100644
--- a/secure/lib/libcrypto/man/man3/X509_get0_signature.3
+++ b/secure/lib/libcrypto/man/man3/X509_get0_signature.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_GET0_SIGNATURE 3"
-.TH X509_GET0_SIGNATURE 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_GET0_SIGNATURE 3ossl"
+.TH X509_GET0_SIGNATURE 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_get0_uids.3 b/secure/lib/libcrypto/man/man3/X509_get0_uids.3
index b70a6e1449dd..3a4e52ee20aa 100644
--- a/secure/lib/libcrypto/man/man3/X509_get0_uids.3
+++ b/secure/lib/libcrypto/man/man3/X509_get0_uids.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_GET0_UIDS 3"
-.TH X509_GET0_UIDS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_GET0_UIDS 3ossl"
+.TH X509_GET0_UIDS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_get_extension_flags.3 b/secure/lib/libcrypto/man/man3/X509_get_extension_flags.3
index b04f3f759495..2a2839daef65 100644
--- a/secure/lib/libcrypto/man/man3/X509_get_extension_flags.3
+++ b/secure/lib/libcrypto/man/man3/X509_get_extension_flags.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_GET_EXTENSION_FLAGS 3"
-.TH X509_GET_EXTENSION_FLAGS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_GET_EXTENSION_FLAGS 3ossl"
+.TH X509_GET_EXTENSION_FLAGS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_get_pubkey.3 b/secure/lib/libcrypto/man/man3/X509_get_pubkey.3
index 4b8d7a3604a3..bee6c9d4d49a 100644
--- a/secure/lib/libcrypto/man/man3/X509_get_pubkey.3
+++ b/secure/lib/libcrypto/man/man3/X509_get_pubkey.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_GET_PUBKEY 3"
-.TH X509_GET_PUBKEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_GET_PUBKEY 3ossl"
+.TH X509_GET_PUBKEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_get_serialNumber.3 b/secure/lib/libcrypto/man/man3/X509_get_serialNumber.3
index 81f5cfcd1665..09159c14ab28 100644
--- a/secure/lib/libcrypto/man/man3/X509_get_serialNumber.3
+++ b/secure/lib/libcrypto/man/man3/X509_get_serialNumber.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_GET_SERIALNUMBER 3"
-.TH X509_GET_SERIALNUMBER 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_GET_SERIALNUMBER 3ossl"
+.TH X509_GET_SERIALNUMBER 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_get_subject_name.3 b/secure/lib/libcrypto/man/man3/X509_get_subject_name.3
index b9ce82083824..88fda03da062 100644
--- a/secure/lib/libcrypto/man/man3/X509_get_subject_name.3
+++ b/secure/lib/libcrypto/man/man3/X509_get_subject_name.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_GET_SUBJECT_NAME 3"
-.TH X509_GET_SUBJECT_NAME 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_GET_SUBJECT_NAME 3ossl"
+.TH X509_GET_SUBJECT_NAME 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_get_version.3 b/secure/lib/libcrypto/man/man3/X509_get_version.3
index 24e32d68794f..dd5ea75bb8f3 100644
--- a/secure/lib/libcrypto/man/man3/X509_get_version.3
+++ b/secure/lib/libcrypto/man/man3/X509_get_version.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_GET_VERSION 3"
-.TH X509_GET_VERSION 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_GET_VERSION 3ossl"
+.TH X509_GET_VERSION 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_load_http.3 b/secure/lib/libcrypto/man/man3/X509_load_http.3
index dd8bb0c71bad..14e7b65d0a7a 100644
--- a/secure/lib/libcrypto/man/man3/X509_load_http.3
+++ b/secure/lib/libcrypto/man/man3/X509_load_http.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_LOAD_HTTP 3"
-.TH X509_LOAD_HTTP 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_LOAD_HTTP 3ossl"
+.TH X509_LOAD_HTTP 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_new.3 b/secure/lib/libcrypto/man/man3/X509_new.3
index c8d0e31bd053..77c89a64e0b6 100644
--- a/secure/lib/libcrypto/man/man3/X509_new.3
+++ b/secure/lib/libcrypto/man/man3/X509_new.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_NEW 3"
-.TH X509_NEW 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_NEW 3ossl"
+.TH X509_NEW 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_sign.3 b/secure/lib/libcrypto/man/man3/X509_sign.3
index 5cc47a851436..82c9a26ed550 100644
--- a/secure/lib/libcrypto/man/man3/X509_sign.3
+++ b/secure/lib/libcrypto/man/man3/X509_sign.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_SIGN 3"
-.TH X509_SIGN 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_SIGN 3ossl"
+.TH X509_SIGN 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_verify.3 b/secure/lib/libcrypto/man/man3/X509_verify.3
index 0c195945529c..b4b73752d211 100644
--- a/secure/lib/libcrypto/man/man3/X509_verify.3
+++ b/secure/lib/libcrypto/man/man3/X509_verify.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_VERIFY 3"
-.TH X509_VERIFY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_VERIFY 3ossl"
+.TH X509_VERIFY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509_verify_cert.3 b/secure/lib/libcrypto/man/man3/X509_verify_cert.3
index ed0065bb4099..b79c1c0e1f92 100644
--- a/secure/lib/libcrypto/man/man3/X509_verify_cert.3
+++ b/secure/lib/libcrypto/man/man3/X509_verify_cert.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509_VERIFY_CERT 3"
-.TH X509_VERIFY_CERT 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509_VERIFY_CERT 3ossl"
+.TH X509_VERIFY_CERT 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 b/secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3
index fe2db064ca96..704810df7af2 100644
--- a/secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3
+++ b/secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509V3_GET_EXT_BY_NID 3"
-.TH X509V3_GET_EXT_BY_NID 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509V3_GET_EXT_BY_NID 3ossl"
+.TH X509V3_GET_EXT_BY_NID 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3 b/secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3
index 4d5c121464c8..5c01f620d50b 100644
--- a/secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3
+++ b/secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "B2I_PVK_BIO_EX 3"
-.TH B2I_PVK_BIO_EX 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "B2I_PVK_BIO_EX 3ossl"
+.TH B2I_PVK_BIO_EX 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 b/secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3
index 6db4304df0d2..cfb26c04d973 100644
--- a/secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3
+++ b/secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "D2I_PKCS8PRIVATEKEY_BIO 3"
-.TH D2I_PKCS8PRIVATEKEY_BIO 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "D2I_PKCS8PRIVATEKEY_BIO 3ossl"
+.TH D2I_PKCS8PRIVATEKEY_BIO 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 b/secure/lib/libcrypto/man/man3/d2i_PrivateKey.3
index 52005f01efd3..60fa242ebc9b 100644
--- a/secure/lib/libcrypto/man/man3/d2i_PrivateKey.3
+++ b/secure/lib/libcrypto/man/man3/d2i_PrivateKey.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "D2I_PRIVATEKEY 3"
-.TH D2I_PRIVATEKEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "D2I_PRIVATEKEY 3ossl"
+.TH D2I_PRIVATEKEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3 b/secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3
index cd8a22f43bae..8d4327d2bdaa 100644
--- a/secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3
+++ b/secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "D2I_RSAPRIVATEKEY 3"
-.TH D2I_RSAPRIVATEKEY 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "D2I_RSAPRIVATEKEY 3ossl"
+.TH D2I_RSAPRIVATEKEY 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -159,7 +159,6 @@ d2i_RSA_PUBKEY_fp,
 d2i_DHparams,
 d2i_DHparams_bio,
 d2i_DHparams_fp,
-d2i_ECPKParameters,
 d2i_ECParameters,
 d2i_ECPrivateKey,
 d2i_ECPrivateKey_bio,
@@ -187,7 +186,6 @@ i2d_DSA_PUBKEY,
 i2d_DSA_PUBKEY_bio,
 i2d_DSA_PUBKEY_fp,
 i2d_DSAparams,
-i2d_ECPKParameters,
 i2d_ECParameters,
 i2d_ECPrivateKey,
 i2d_ECPrivateKey_bio,
@@ -324,7 +322,7 @@ of what part of the \fB\s-1EVP_PKEY\s0\fR should be output, and the structure.
 .IP "\fBi2d_\f(BI\s-1TYPE\s0\fBPrivateKey\fR() translates into:" 4
 .IX Item "i2d_TYPEPrivateKey() translates into:"
 .Vb 2
-\& int selection = EVP_PKEY_PRIVATE_KEY;
+\& int selection = EVP_PKEY_KEYPAIR;
 \& const char *structure = "type\-specific";
 .Ve
 .IP "\fBi2d_\f(BI\s-1TYPE\s0\fBPublicKey\fR() translates into:" 4
@@ -420,7 +418,7 @@ error occurs.
 \&\fBi2d_PUBKEY\fR\|(3)
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2020\-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 b/secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3
index 5c9673ca1e2f..b6a6a615e5b5 100644
--- a/secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3
+++ b/secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "D2I_SSL_SESSION 3"
-.TH D2I_SSL_SESSION 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "D2I_SSL_SESSION 3ossl"
+.TH D2I_SSL_SESSION 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/d2i_X509.3 b/secure/lib/libcrypto/man/man3/d2i_X509.3
index ca1532b32c46..9ada438d0afe 100644
--- a/secure/lib/libcrypto/man/man3/d2i_X509.3
+++ b/secure/lib/libcrypto/man/man3/d2i_X509.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "D2I_X509 3"
-.TH D2I_X509 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "D2I_X509 3ossl"
+.TH D2I_X509 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -183,6 +183,7 @@ d2i_DIST_POINT,
 d2i_DIST_POINT_NAME,
 d2i_DSA_SIG,
 d2i_ECDSA_SIG,
+d2i_ECPKParameters,
 d2i_EDIPARTYNAME,
 d2i_ESS_CERT_ID,
 d2i_ESS_CERT_ID_V2,
@@ -353,6 +354,7 @@ i2d_DIST_POINT,
 i2d_DIST_POINT_NAME,
 i2d_DSA_SIG,
 i2d_ECDSA_SIG,
+i2d_ECPKParameters,
 i2d_EDIPARTYNAME,
 i2d_ESS_CERT_ID,
 i2d_ESS_CERT_ID_V2,
diff --git a/secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 b/secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3
index 8632ae2f3446..cc685c6581de 100644
--- a/secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3
+++ b/secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "I2D_CMS_BIO_STREAM 3"
-.TH I2D_CMS_BIO_STREAM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "I2D_CMS_BIO_STREAM 3ossl"
+.TH I2D_CMS_BIO_STREAM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 b/secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3
index 26fb673b856e..25c50271235a 100644
--- a/secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3
+++ b/secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "I2D_PKCS7_BIO_STREAM 3"
-.TH I2D_PKCS7_BIO_STREAM 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "I2D_PKCS7_BIO_STREAM 3ossl"
+.TH I2D_PKCS7_BIO_STREAM 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 b/secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3
index 6b95e63944b6..55e44c64fc75 100644
--- a/secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3
+++ b/secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "I2D_RE_X509_TBS 3"
-.TH I2D_RE_X509_TBS 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "I2D_RE_X509_TBS 3ossl"
+.TH I2D_RE_X509_TBS 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 b/secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3
index ebe75c237aca..d406ef367777 100644
--- a/secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3
+++ b/secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "O2I_SCT_LIST 3"
-.TH O2I_SCT_LIST 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "O2I_SCT_LIST 3ossl"
+.TH O2I_SCT_LIST 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3 b/secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3
index 46b93e77dcf2..a51ada489bb5 100644
--- a/secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3
+++ b/secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "S2I_ASN1_IA5STRING 3"
-.TH S2I_ASN1_IA5STRING 3 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "S2I_ASN1_IA5STRING 3ossl"
+.TH S2I_ASN1_IA5STRING 3ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man5/config.5 b/secure/lib/libcrypto/man/man5/config.5
index c7fb974efe8b..94df12885b24 100644
--- a/secure/lib/libcrypto/man/man5/config.5
+++ b/secure/lib/libcrypto/man/man5/config.5
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CONFIG 5"
-.TH CONFIG 5 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CONFIG 5ossl"
+.TH CONFIG 5ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man5/fips_config.5 b/secure/lib/libcrypto/man/man5/fips_config.5
index f42d21b53ce0..9791989c9907 100644
--- a/secure/lib/libcrypto/man/man5/fips_config.5
+++ b/secure/lib/libcrypto/man/man5/fips_config.5
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "FIPS_CONFIG 5"
-.TH FIPS_CONFIG 5 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "FIPS_CONFIG 5ossl"
+.TH FIPS_CONFIG 5ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man5/x509v3_config.5 b/secure/lib/libcrypto/man/man5/x509v3_config.5
index dd5f85c7e12b..3854fbf0caa0 100644
--- a/secure/lib/libcrypto/man/man5/x509v3_config.5
+++ b/secure/lib/libcrypto/man/man5/x509v3_config.5
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509V3_CONFIG 5"
-.TH X509V3_CONFIG 5 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509V3_CONFIG 5ossl"
+.TH X509V3_CONFIG 5ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -245,7 +245,7 @@ numeric identifier, as shown here:
 .Ve
 .PP
 The syntax of raw extensions is defined by the source code that parses
-the extension but should be documened.
+the extension but should be documented.
 See \*(L"Certificate Policies\*(R" for an example of a raw extension.
 .PP
 If an extension type is unsupported, then the \fIarbitrary\fR extension syntax
@@ -754,7 +754,7 @@ invalid extensions if they are not used carefully.
 \&\fBASN1_generate_nconf\fR\|(3)
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2004\-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2004\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7 b/secure/lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7
index 44739581315b..680032039d3d 100644
--- a/secure/lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7
+++ b/secure/lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_ASYM_CIPHER-RSA 7"
-.TH EVP_ASYM_CIPHER-RSA 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_ASYM_CIPHER-RSA 7ossl"
+.TH EVP_ASYM_CIPHER-RSA 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7 b/secure/lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7
index e9557bdfc6b4..313ac56d39c3 100644
--- a/secure/lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7
+++ b/secure/lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_ASYM_CIPHER-SM2 7"
-.TH EVP_ASYM_CIPHER-SM2 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_ASYM_CIPHER-SM2 7ossl"
+.TH EVP_ASYM_CIPHER-SM2 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7
index 1facf52d1ee4..cfe0eb7597e2 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-AES 7"
-.TH EVP_CIPHER-AES 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-AES 7ossl"
+.TH EVP_CIPHER-AES 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7
index 9c2b797b27a4..a27b32958d29 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-ARIA 7"
-.TH EVP_CIPHER-ARIA 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-ARIA 7ossl"
+.TH EVP_CIPHER-ARIA 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7
index c364fcc16607..f317d1363d71 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-BLOWFISH 7"
-.TH EVP_CIPHER-BLOWFISH 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-BLOWFISH 7ossl"
+.TH EVP_CIPHER-BLOWFISH 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7
index 00af0750b06f..81421346fe57 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-CAMELLIA 7"
-.TH EVP_CIPHER-CAMELLIA 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-CAMELLIA 7ossl"
+.TH EVP_CIPHER-CAMELLIA 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7
index 75bb6188f516..ef5147f2eff6 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-CAST 7"
-.TH EVP_CIPHER-CAST 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-CAST 7ossl"
+.TH EVP_CIPHER-CAST 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7
index 787ccea22662..b4b83e77bc5b 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-CHACHA 7"
-.TH EVP_CIPHER-CHACHA 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-CHACHA 7ossl"
+.TH EVP_CIPHER-CHACHA 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7
index 528709b5a8d9..68adc7b166f4 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-DES 7"
-.TH EVP_CIPHER-DES 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-DES 7ossl"
+.TH EVP_CIPHER-DES 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7
index 179ffab424af..1cc57ce6daf9 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-IDEA 7"
-.TH EVP_CIPHER-IDEA 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-IDEA 7ossl"
+.TH EVP_CIPHER-IDEA 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7
index 350c54861b43..796b002ee46a 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-NULL 7"
-.TH EVP_CIPHER-NULL 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-NULL 7ossl"
+.TH EVP_CIPHER-NULL 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7
index efb7e38a8629..480b781c5141 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-RC2 7"
-.TH EVP_CIPHER-RC2 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-RC2 7ossl"
+.TH EVP_CIPHER-RC2 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7
index d46148602a0e..73c5f3667bb8 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-RC4 7"
-.TH EVP_CIPHER-RC4 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-RC4 7ossl"
+.TH EVP_CIPHER-RC4 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7
index 406edd1eeb69..cd711cdd8c43 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-RC5 7"
-.TH EVP_CIPHER-RC5 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-RC5 7ossl"
+.TH EVP_CIPHER-RC5 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7
index 510dc374b47d..cc22be395944 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-SEED 7"
-.TH EVP_CIPHER-SEED 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-SEED 7ossl"
+.TH EVP_CIPHER-SEED 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7 b/secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7
index 683b7db0c4ce..fb18b891e504 100644
--- a/secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7
+++ b/secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_CIPHER-SM4 7"
-.TH EVP_CIPHER-SM4 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_CIPHER-SM4 7ossl"
+.TH EVP_CIPHER-SM4 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7
index 399c8a6dea2d..1002e00720c9 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-HKDF 7"
-.TH EVP_KDF-HKDF 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-HKDF 7ossl"
+.TH EVP_KDF-HKDF 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-KB.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-KB.7
index 54bb818c8fb7..8a6a822cddb6 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-KB.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-KB.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-KB 7"
-.TH EVP_KDF-KB 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-KB 7ossl"
+.TH EVP_KDF-KB 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7
index dc143ca23f05..fb737fd203b0 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-KRB5KDF 7"
-.TH EVP_KDF-KRB5KDF 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-KRB5KDF 7ossl"
+.TH EVP_KDF-KRB5KDF 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7
index eecaf7951da4..6635b002f509 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-PBKDF1 7"
-.TH EVP_KDF-PBKDF1 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-PBKDF1 7ossl"
+.TH EVP_KDF-PBKDF1 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7
index b8d54cb4b148..f85cb80b6f2a 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-PBKDF2 7"
-.TH EVP_KDF-PBKDF2 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-PBKDF2 7ossl"
+.TH EVP_KDF-PBKDF2 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7
index 6e461e785849..9b43ac03c3db 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-PKCS12KDF 7"
-.TH EVP_KDF-PKCS12KDF 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-PKCS12KDF 7ossl"
+.TH EVP_KDF-PKCS12KDF 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -181,6 +181,9 @@ This parameter is used to specify the intended usage of the output bits, as per
 \&\s-1RFC 7292\s0 section B.3.
 .SH "NOTES"
 .IX Header "NOTES"
+This algorithm is not available in the \s-1FIPS\s0 provider as it is not \s-1FIPS\s0
+approvable.
+.PP
 A typical application of this algorithm is to derive keying material for an
 encryption algorithm from a password in the \*(L"pass\*(R", a salt in \*(L"salt\*(R",
 and an iteration count.
@@ -201,13 +204,14 @@ byte sequence.
 \&\fBEVP_KDF_CTX_free\fR\|(3),
 \&\fBEVP_KDF_CTX_set_params\fR\|(3),
 \&\fBEVP_KDF_derive\fR\|(3),
-\&\*(L"\s-1PARAMETERS\*(R"\s0 in \s-1\fBEVP_KDF\s0\fR\|(3)
+\&\*(L"\s-1PARAMETERS\*(R"\s0 in \s-1\fBEVP_KDF\s0\fR\|(3),
+\&\s-1\fBOSSL_PROVIDER\-FIPS\s0\fR\|(7)
 .SH "HISTORY"
 .IX Header "HISTORY"
 This functionality was added in OpenSSL 3.0.
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7
index c9fff4856678..553167d54695 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-SCRYPT 7"
-.TH EVP_KDF-SCRYPT 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-SCRYPT 7ossl"
+.TH EVP_KDF-SCRYPT 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-SS.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-SS.7
index a866ae0b286a..a5b8a692cd89 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-SS.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-SS.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-SS 7"
-.TH EVP_KDF-SS 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-SS 7ossl"
+.TH EVP_KDF-SS 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7
index 68551202a7d8..d231d9998865 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-SSHKDF 7"
-.TH EVP_KDF-SSHKDF 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-SSHKDF 7ossl"
+.TH EVP_KDF-SSHKDF 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7
index 916fe92e9642..1378fe1e2b41 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-TLS13_KDF 7"
-.TH EVP_KDF-TLS13_KDF 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-TLS13_KDF 7ossl"
+.TH EVP_KDF-TLS13_KDF 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7
index 802609c00e32..45d7dbbe0c96 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-TLS1_PRF 7"
-.TH EVP_KDF-TLS1_PRF 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-TLS1_PRF 7ossl"
+.TH EVP_KDF-TLS1_PRF 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7
index cf11b3dbb962..d4fb6de89dcd 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-X942-ASN1 7"
-.TH EVP_KDF-X942-ASN1 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-X942-ASN1 7ossl"
+.TH EVP_KDF-X942-ASN1 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7
index a4b71b34f192..6f55b942b147 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-X942-CONCAT 7"
-.TH EVP_KDF-X942-CONCAT 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-X942-CONCAT 7ossl"
+.TH EVP_KDF-X942-CONCAT 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KDF-X963.7 b/secure/lib/libcrypto/man/man7/EVP_KDF-X963.7
index ca76721b3790..39831c1b38a6 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KDF-X963.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KDF-X963.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KDF-X963 7"
-.TH EVP_KDF-X963 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KDF-X963 7ossl"
+.TH EVP_KDF-X963 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7 b/secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7
index 4bd1d51b3a61..6a7ee74133f5 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KEM-RSA 7"
-.TH EVP_KEM-RSA 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KEM-RSA 7ossl"
+.TH EVP_KEM-RSA 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7 b/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7
index 80fce7719a15..2010fa38dc62 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KEYEXCH-DH 7"
-.TH EVP_KEYEXCH-DH 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KEYEXCH-DH 7ossl"
+.TH EVP_KEYEXCH-DH 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7 b/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7
index 30d2aa04752b..a925e6849b86 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KEYEXCH-ECDH 7"
-.TH EVP_KEYEXCH-ECDH 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KEYEXCH-ECDH 7ossl"
+.TH EVP_KEYEXCH-ECDH 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7 b/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7
index 79f07ea1a472..3fce6a8d99a2 100644
--- a/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7
+++ b/secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_KEYEXCH-X25519 7"
-.TH EVP_KEYEXCH-X25519 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_KEYEXCH-X25519 7ossl"
+.TH EVP_KEYEXCH-X25519 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7 b/secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7
index b5737da13d24..ee9b73899955 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MAC-BLAKE2 7"
-.TH EVP_MAC-BLAKE2 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MAC-BLAKE2 7ossl"
+.TH EVP_MAC-BLAKE2 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7 b/secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7
index b817d18df18c..1799615c145f 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MAC-CMAC 7"
-.TH EVP_MAC-CMAC 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MAC-CMAC 7ossl"
+.TH EVP_MAC-CMAC 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7 b/secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7
index 57539ddbf6b1..ef62ef78aa9d 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MAC-GMAC 7"
-.TH EVP_MAC-GMAC 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MAC-GMAC 7ossl"
+.TH EVP_MAC-GMAC 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7 b/secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7
index 200922a7448e..aae90aa9e2cf 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MAC-HMAC 7"
-.TH EVP_MAC-HMAC 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MAC-HMAC 7ossl"
+.TH EVP_MAC-HMAC 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7 b/secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7
index 5482343beedf..5098d224c05e 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MAC-KMAC 7"
-.TH EVP_MAC-KMAC 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MAC-KMAC 7ossl"
+.TH EVP_MAC-KMAC 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7 b/secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7
index 82c7f6e63f71..1a8fbc293831 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MAC-POLY1305 7"
-.TH EVP_MAC-POLY1305 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MAC-POLY1305 7ossl"
+.TH EVP_MAC-POLY1305 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7 b/secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7
index 562f1e40bb09..4cc756d75e20 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MAC-SIPHASH 7"
-.TH EVP_MAC-SIPHASH 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MAC-SIPHASH 7ossl"
+.TH EVP_MAC-SIPHASH 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7 b/secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7
index 71da96c0a65c..15ae0070763f 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-BLAKE2 7"
-.TH EVP_MD-BLAKE2 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-BLAKE2 7ossl"
+.TH EVP_MD-BLAKE2 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-MD2.7 b/secure/lib/libcrypto/man/man7/EVP_MD-MD2.7
index fa1451cde1bf..ba0d56d31dbc 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-MD2.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-MD2.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-MD2 7"
-.TH EVP_MD-MD2 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-MD2 7ossl"
+.TH EVP_MD-MD2 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-MD4.7 b/secure/lib/libcrypto/man/man7/EVP_MD-MD4.7
index d6e55f0c35a4..7e2c1f1ccfce 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-MD4.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-MD4.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-MD4 7"
-.TH EVP_MD-MD4 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-MD4 7ossl"
+.TH EVP_MD-MD4 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7 b/secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7
index cf1db1c665f5..7037b6fb5f1c 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-MD5-SHA1 7"
-.TH EVP_MD-MD5-SHA1 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-MD5-SHA1 7ossl"
+.TH EVP_MD-MD5-SHA1 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-MD5.7 b/secure/lib/libcrypto/man/man7/EVP_MD-MD5.7
index 72db6e73d2e7..2281dedb2d1c 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-MD5.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-MD5.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-MD5 7"
-.TH EVP_MD-MD5 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-MD5 7ossl"
+.TH EVP_MD-MD5 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7 b/secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7
index da3c38e88354..b417069750ba 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-MDC2 7"
-.TH EVP_MD-MDC2 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-MDC2 7ossl"
+.TH EVP_MD-MDC2 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-NULL.7 b/secure/lib/libcrypto/man/man7/EVP_MD-NULL.7
index e48f81dd07d1..34c2924223c4 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-NULL.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-NULL.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-NULL 7"
-.TH EVP_MD-NULL 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-NULL 7ossl"
+.TH EVP_MD-NULL 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7 b/secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7
index 0c5c80940515..27a42740b5e6 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-RIPEMD160 7"
-.TH EVP_MD-RIPEMD160 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-RIPEMD160 7ossl"
+.TH EVP_MD-RIPEMD160 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7 b/secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7
index 314926981882..ee8174ff0334 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-SHA1 7"
-.TH EVP_MD-SHA1 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-SHA1 7ossl"
+.TH EVP_MD-SHA1 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7 b/secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7
index 6eef2c513546..233522bb8d4e 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-SHA2 7"
-.TH EVP_MD-SHA2 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-SHA2 7ossl"
+.TH EVP_MD-SHA2 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7 b/secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7
index 04d0be70b90b..027370f0a495 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-SHA3 7"
-.TH EVP_MD-SHA3 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-SHA3 7ossl"
+.TH EVP_MD-SHA3 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7 b/secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7
index a86f7b4576b9..4cbbdb1563c5 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-SHAKE 7"
-.TH EVP_MD-SHAKE 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-SHAKE 7ossl"
+.TH EVP_MD-SHAKE 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-SM3.7 b/secure/lib/libcrypto/man/man7/EVP_MD-SM3.7
index 58d90d17a1ab..06155ea3b94b 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-SM3.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-SM3.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-SM3 7"
-.TH EVP_MD-SM3 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-SM3 7ossl"
+.TH EVP_MD-SM3 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7 b/secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7
index 67c006a4588e..f2849b14e9df 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-WHIRLPOOL 7"
-.TH EVP_MD-WHIRLPOOL 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-WHIRLPOOL 7ossl"
+.TH EVP_MD-WHIRLPOOL 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_MD-common.7 b/secure/lib/libcrypto/man/man7/EVP_MD-common.7
index 9669a06cf23f..545a8f214d29 100644
--- a/secure/lib/libcrypto/man/man7/EVP_MD-common.7
+++ b/secure/lib/libcrypto/man/man7/EVP_MD-common.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_MD-COMMON 7"
-.TH EVP_MD-COMMON 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_MD-COMMON 7ossl"
+.TH EVP_MD-COMMON 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7 b/secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7
index 01b49ae65364..7bfe66d98380 100644
--- a/secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7
+++ b/secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY-DH 7"
-.TH EVP_PKEY-DH 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY-DH 7ossl"
+.TH EVP_PKEY-DH 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7 b/secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7
index b287ae9b551b..0d70b56a2f87 100644
--- a/secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7
+++ b/secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY-DSA 7"
-.TH EVP_PKEY-DSA 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY-DSA 7ossl"
+.TH EVP_PKEY-DSA 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7 b/secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7
index 21020b714324..5cd6634ea91f 100644
--- a/secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7
+++ b/secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY-EC 7"
-.TH EVP_PKEY-EC 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY-EC 7ossl"
+.TH EVP_PKEY-EC 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7 b/secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7
index 10f79ae69ae6..035aa9bf87fc 100644
--- a/secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7
+++ b/secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY-FFC 7"
-.TH EVP_PKEY-FFC 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY-FFC 7ossl"
+.TH EVP_PKEY-FFC 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7 b/secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7
index 1cc6da177bab..44c99e6a48c4 100644
--- a/secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7
+++ b/secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY-HMAC 7"
-.TH EVP_PKEY-HMAC 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY-HMAC 7ossl"
+.TH EVP_PKEY-HMAC 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7 b/secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7
index 970fcf285f49..e05bd1b7b0da 100644
--- a/secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7
+++ b/secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY-RSA 7"
-.TH EVP_PKEY-RSA 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY-RSA 7ossl"
+.TH EVP_PKEY-RSA 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7 b/secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7
index 36dde314d3c0..365c13dc6f29 100644
--- a/secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7
+++ b/secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY-SM2 7"
-.TH EVP_PKEY-SM2 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY-SM2 7ossl"
+.TH EVP_PKEY-SM2 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7 b/secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7
index 1f4e76c3b02a..802d765b6de0 100644
--- a/secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7
+++ b/secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_PKEY-X25519 7"
-.TH EVP_PKEY-X25519 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_PKEY-X25519 7ossl"
+.TH EVP_PKEY-X25519 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7 b/secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7
index d32904623c5b..8994406de82c 100644
--- a/secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7
+++ b/secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_RAND-CTR-DRBG 7"
-.TH EVP_RAND-CTR-DRBG 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_RAND-CTR-DRBG 7ossl"
+.TH EVP_RAND-CTR-DRBG 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7 b/secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7
index e33a3157d120..cc3104608132 100644
--- a/secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7
+++ b/secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_RAND-HASH-DRBG 7"
-.TH EVP_RAND-HASH-DRBG 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_RAND-HASH-DRBG 7ossl"
+.TH EVP_RAND-HASH-DRBG 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7 b/secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7
index 1c9383e5a3b9..f393c1f6b4cf 100644
--- a/secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7
+++ b/secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_RAND-HMAC-DRBG 7"
-.TH EVP_RAND-HMAC-DRBG 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_RAND-HMAC-DRBG 7ossl"
+.TH EVP_RAND-HMAC-DRBG 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7 b/secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7
index 74ee7b30ce91..1b86a1d43a88 100644
--- a/secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7
+++ b/secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_RAND-SEED-SRC 7"
-.TH EVP_RAND-SEED-SRC 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_RAND-SEED-SRC 7ossl"
+.TH EVP_RAND-SEED-SRC 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7 b/secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7
index 6dcca2fcf534..0237a5c1d5f3 100644
--- a/secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7
+++ b/secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_RAND-TEST-RAND 7"
-.TH EVP_RAND-TEST-RAND 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_RAND-TEST-RAND 7ossl"
+.TH EVP_RAND-TEST-RAND 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_RAND.7 b/secure/lib/libcrypto/man/man7/EVP_RAND.7
index 9493438804da..2d5f87be4c46 100644
--- a/secure/lib/libcrypto/man/man7/EVP_RAND.7
+++ b/secure/lib/libcrypto/man/man7/EVP_RAND.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_RAND 7"
-.TH EVP_RAND 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_RAND 7ossl"
+.TH EVP_RAND 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7 b/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7
index cc1d664fd64f..f71568d544cb 100644
--- a/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7
+++ b/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SIGNATURE-DSA 7"
-.TH EVP_SIGNATURE-DSA 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SIGNATURE-DSA 7ossl"
+.TH EVP_SIGNATURE-DSA 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7 b/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7
index a8bbaa1bf3ad..02142c40f51f 100644
--- a/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7
+++ b/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SIGNATURE-ECDSA 7"
-.TH EVP_SIGNATURE-ECDSA 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SIGNATURE-ECDSA 7ossl"
+.TH EVP_SIGNATURE-ECDSA 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7 b/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7
index d8a49cfc4d93..30b4898862b7 100644
--- a/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7
+++ b/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SIGNATURE-ED25519 7"
-.TH EVP_SIGNATURE-ED25519 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SIGNATURE-ED25519 7ossl"
+.TH EVP_SIGNATURE-ED25519 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7 b/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7
index ff1c081177ff..5fd61581d7ea 100644
--- a/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7
+++ b/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SIGNATURE-HMAC 7"
-.TH EVP_SIGNATURE-HMAC 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SIGNATURE-HMAC 7ossl"
+.TH EVP_SIGNATURE-HMAC 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7 b/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7
index 33a02b60f8fb..e910dab5bad4 100644
--- a/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7
+++ b/secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_SIGNATURE-RSA 7"
-.TH EVP_SIGNATURE-RSA 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP_SIGNATURE-RSA 7ossl"
+.TH EVP_SIGNATURE-RSA 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7 b/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7
index 0e2b89df5935..5886fc4355da 100644
--- a/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7
+++ b/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_PROVIDER-FIPS 7"
-.TH OSSL_PROVIDER-FIPS 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_PROVIDER-FIPS 7ossl"
+.TH OSSL_PROVIDER-FIPS 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7 b/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7
index a0d9eadffe45..33c6e49d8ea5 100644
--- a/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7
+++ b/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_PROVIDER-BASE 7"
-.TH OSSL_PROVIDER-BASE 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_PROVIDER-BASE 7ossl"
+.TH OSSL_PROVIDER-BASE 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-default.7 b/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-default.7
index c910be3287eb..b5aed1ccdf1c 100644
--- a/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-default.7
+++ b/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-default.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_PROVIDER-DEFAULT 7"
-.TH OSSL_PROVIDER-DEFAULT 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_PROVIDER-DEFAULT 7ossl"
+.TH OSSL_PROVIDER-DEFAULT 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7 b/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7
index 072668d0b9b3..2b001cfb51c0 100644
--- a/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7
+++ b/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_PROVIDER-LEGACY 7"
-.TH OSSL_PROVIDER-LEGACY 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_PROVIDER-LEGACY 7ossl"
+.TH OSSL_PROVIDER-LEGACY 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7 b/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7
index a3ed7502a6b1..c8c64d301378 100644
--- a/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7
+++ b/secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_PROVIDER-NULL 7"
-.TH OSSL_PROVIDER-NULL 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_PROVIDER-NULL 7ossl"
+.TH OSSL_PROVIDER-NULL 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/RAND.7 b/secure/lib/libcrypto/man/man7/RAND.7
index 0a126a841283..8f6f32956eb4 100644
--- a/secure/lib/libcrypto/man/man7/RAND.7
+++ b/secure/lib/libcrypto/man/man7/RAND.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RAND 7"
-.TH RAND 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RAND 7ossl"
+.TH RAND 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/RSA-PSS.7 b/secure/lib/libcrypto/man/man7/RSA-PSS.7
index 3529bd1f5506..51b88e4475ea 100644
--- a/secure/lib/libcrypto/man/man7/RSA-PSS.7
+++ b/secure/lib/libcrypto/man/man7/RSA-PSS.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "RSA-PSS 7"
-.TH RSA-PSS 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "RSA-PSS 7ossl"
+.TH RSA-PSS 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/X25519.7 b/secure/lib/libcrypto/man/man7/X25519.7
index 1763c7858a10..a2f2fabd06a1 100644
--- a/secure/lib/libcrypto/man/man7/X25519.7
+++ b/secure/lib/libcrypto/man/man7/X25519.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X25519 7"
-.TH X25519 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X25519 7ossl"
+.TH X25519 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/bio.7 b/secure/lib/libcrypto/man/man7/bio.7
index 7bdcd1abff44..00d71552b549 100644
--- a/secure/lib/libcrypto/man/man7/bio.7
+++ b/secure/lib/libcrypto/man/man7/bio.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "BIO 7"
-.TH BIO 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "BIO 7ossl"
+.TH BIO 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/crypto.7 b/secure/lib/libcrypto/man/man7/crypto.7
index c3b72b9f06d9..03dcd53ec2e2 100644
--- a/secure/lib/libcrypto/man/man7/crypto.7
+++ b/secure/lib/libcrypto/man/man7/crypto.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CRYPTO 7"
-.TH CRYPTO 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CRYPTO 7ossl"
+.TH CRYPTO 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/ct.7 b/secure/lib/libcrypto/man/man7/ct.7
index ce57c4c3fcfa..62185851e4cd 100644
--- a/secure/lib/libcrypto/man/man7/ct.7
+++ b/secure/lib/libcrypto/man/man7/ct.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CT 7"
-.TH CT 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CT 7ossl"
+.TH CT 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/des_modes.7 b/secure/lib/libcrypto/man/man7/des_modes.7
index f7f9d1390bc9..0d53b796e22f 100644
--- a/secure/lib/libcrypto/man/man7/des_modes.7
+++ b/secure/lib/libcrypto/man/man7/des_modes.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DES_MODES 7"
-.TH DES_MODES 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "DES_MODES 7ossl"
+.TH DES_MODES 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/evp.7 b/secure/lib/libcrypto/man/man7/evp.7
index 9bef7ca75651..9ca48e978f4f 100644
--- a/secure/lib/libcrypto/man/man7/evp.7
+++ b/secure/lib/libcrypto/man/man7/evp.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP 7"
-.TH EVP 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "EVP 7ossl"
+.TH EVP 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/fips_module.7 b/secure/lib/libcrypto/man/man7/fips_module.7
index a2ec8030ff25..b34ff6419790 100644
--- a/secure/lib/libcrypto/man/man7/fips_module.7
+++ b/secure/lib/libcrypto/man/man7/fips_module.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "FIPS_MODULE 7"
-.TH FIPS_MODULE 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "FIPS_MODULE 7ossl"
+.TH FIPS_MODULE 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -186,7 +186,7 @@ file by running this command:
 .PP
 .Vb 2
 \&    $ openssl version \-d
-\&    OPENSSLDIR: "/usr/local/ssl"
+\&    OPENSSLDIR: "/etc/ssl"
 .Ve
 .PP
 Caution: Many Operating Systems install OpenSSL by default. It is a common error
@@ -200,7 +200,7 @@ running an OpenSSL 3.0 version like this:
 .PP
 The \fB\s-1OPENSSLDIR\s0\fR value above gives the directory name for where the default
 config file is stored. So in this case the default config file will be called
-\&\fI/usr/local/ssl/openssl.cnf\fR.
+\&\fI/etc/ssl/openssl.cnf\fR.
 .PP
 Edit the config file to add the following lines near the beginning:
 .PP
@@ -208,7 +208,7 @@ Edit the config file to add the following lines near the beginning:
 \&    config_diagnostics = 1
 \&    openssl_conf = openssl_init
 \&
-\&    .include /usr/local/ssl/fipsmodule.cnf
+\&    .include /etc/ssl/fipsmodule.cnf
 \&
 \&    [openssl_init]
 \&    providers = provider_sect
@@ -410,7 +410,7 @@ are also in \*(L"default\*(R", so it is unnecessary in this case:
 \&    config_diagnostics = 1
 \&    openssl_conf = openssl_init
 \&
-\&    .include /usr/local/ssl/fipsmodule.cnf
+\&    .include /etc/ssl/fipsmodule.cnf
 \&
 \&    [openssl_init]
 \&    providers = provider_sect
diff --git a/secure/lib/libcrypto/man/man7/life_cycle-cipher.7 b/secure/lib/libcrypto/man/man7/life_cycle-cipher.7
index 665cfea9ff73..600576e6f782 100644
--- a/secure/lib/libcrypto/man/man7/life_cycle-cipher.7
+++ b/secure/lib/libcrypto/man/man7/life_cycle-cipher.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "LIFE_CYCLE-CIPHER 7"
-.TH LIFE_CYCLE-CIPHER 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "LIFE_CYCLE-CIPHER 7ossl"
+.TH LIFE_CYCLE-CIPHER 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/life_cycle-digest.7 b/secure/lib/libcrypto/man/man7/life_cycle-digest.7
index 2d843e994353..e156fb690cd4 100644
--- a/secure/lib/libcrypto/man/man7/life_cycle-digest.7
+++ b/secure/lib/libcrypto/man/man7/life_cycle-digest.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "LIFE_CYCLE-DIGEST 7"
-.TH LIFE_CYCLE-DIGEST 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "LIFE_CYCLE-DIGEST 7ossl"
+.TH LIFE_CYCLE-DIGEST 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/life_cycle-kdf.7 b/secure/lib/libcrypto/man/man7/life_cycle-kdf.7
index 53151c7cdf19..a2c85d4ef0f9 100644
--- a/secure/lib/libcrypto/man/man7/life_cycle-kdf.7
+++ b/secure/lib/libcrypto/man/man7/life_cycle-kdf.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "LIFE_CYCLE-KDF 7"
-.TH LIFE_CYCLE-KDF 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "LIFE_CYCLE-KDF 7ossl"
+.TH LIFE_CYCLE-KDF 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/life_cycle-mac.7 b/secure/lib/libcrypto/man/man7/life_cycle-mac.7
index 3c1c67ac8a5c..8b2f45490b38 100644
--- a/secure/lib/libcrypto/man/man7/life_cycle-mac.7
+++ b/secure/lib/libcrypto/man/man7/life_cycle-mac.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "LIFE_CYCLE-MAC 7"
-.TH LIFE_CYCLE-MAC 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "LIFE_CYCLE-MAC 7ossl"
+.TH LIFE_CYCLE-MAC 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/life_cycle-pkey.7 b/secure/lib/libcrypto/man/man7/life_cycle-pkey.7
index 49e72d7a18c3..f92e51d1e781 100644
--- a/secure/lib/libcrypto/man/man7/life_cycle-pkey.7
+++ b/secure/lib/libcrypto/man/man7/life_cycle-pkey.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "LIFE_CYCLE-PKEY 7"
-.TH LIFE_CYCLE-PKEY 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "LIFE_CYCLE-PKEY 7ossl"
+.TH LIFE_CYCLE-PKEY 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/life_cycle-rand.7 b/secure/lib/libcrypto/man/man7/life_cycle-rand.7
index b901c1240371..5be77e5c6a43 100644
--- a/secure/lib/libcrypto/man/man7/life_cycle-rand.7
+++ b/secure/lib/libcrypto/man/man7/life_cycle-rand.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "LIFE_CYCLE-RAND 7"
-.TH LIFE_CYCLE-RAND 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "LIFE_CYCLE-RAND 7ossl"
+.TH LIFE_CYCLE-RAND 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/migration_guide.7 b/secure/lib/libcrypto/man/man7/migration_guide.7
index f378160cebb1..4876f32fd2b5 100644
--- a/secure/lib/libcrypto/man/man7/migration_guide.7
+++ b/secure/lib/libcrypto/man/man7/migration_guide.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "MIGRATION_GUIDE 7"
-.TH MIGRATION_GUIDE 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "MIGRATION_GUIDE 7ossl"
+.TH MIGRATION_GUIDE 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -430,6 +430,16 @@ context and property query and will call an extended version of the key/IV
 derivation function which supports these parameters. This includes
 \&\fBEVP_PBE_CipherInit_ex\fR\|(3), \fBEVP_PBE_find_ex\fR\|(3) and \fBEVP_PBE_scrypt_ex\fR\|(3).
 .PP
+PKCS#12 \s-1KDF\s0 versus \s-1FIPS\s0
+.IX Subsection "PKCS#12 KDF versus FIPS"
+.PP
+Unlike in 1.x.y, the \s-1PKCS12KDF\s0 algorithm used when a PKCS#12 structure
+is created with a \s-1MAC\s0 that does not work with the \s-1FIPS\s0 provider as the \s-1PKCS12KDF\s0
+is not a \s-1FIPS\s0 approvable mechanism.
+.PP
+See \s-1\fBEVP_KDF\-PKCS12KDF\s0\fR\|(7), \fBPKCS12_create\fR\|(3), \fBopenssl\-pkcs12\fR\|(1),
+\&\s-1\fBOSSL_PROVIDER\-FIPS\s0\fR\|(7).
+.PP
 Windows thread synchronization changes
 .IX Subsection "Windows thread synchronization changes"
 .PP
diff --git a/secure/lib/libcrypto/man/man7/openssl-core.h.7 b/secure/lib/libcrypto/man/man7/openssl-core.h.7
index 78d7be85fd0f..9ea3bfa67ae2 100644
--- a/secure/lib/libcrypto/man/man7/openssl-core.h.7
+++ b/secure/lib/libcrypto/man/man7/openssl-core.h.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-CORE.H 7"
-.TH OPENSSL-CORE.H 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-CORE.H 7ossl"
+.TH OPENSSL-CORE.H 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/openssl-core_dispatch.h.7 b/secure/lib/libcrypto/man/man7/openssl-core_dispatch.h.7
index 3c520fe5bf45..10b924f83a4d 100644
--- a/secure/lib/libcrypto/man/man7/openssl-core_dispatch.h.7
+++ b/secure/lib/libcrypto/man/man7/openssl-core_dispatch.h.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-CORE_DISPATCH.H 7"
-.TH OPENSSL-CORE_DISPATCH.H 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-CORE_DISPATCH.H 7ossl"
+.TH OPENSSL-CORE_DISPATCH.H 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/openssl-core_names.h.7 b/secure/lib/libcrypto/man/man7/openssl-core_names.h.7
index 5e33a3aa70b1..1c55b4f34ac3 100644
--- a/secure/lib/libcrypto/man/man7/openssl-core_names.h.7
+++ b/secure/lib/libcrypto/man/man7/openssl-core_names.h.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-CORE_NAMES.H 7"
-.TH OPENSSL-CORE_NAMES.H 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-CORE_NAMES.H 7ossl"
+.TH OPENSSL-CORE_NAMES.H 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/openssl-env.7 b/secure/lib/libcrypto/man/man7/openssl-env.7
index 71a2ab0741c7..4004eded65d4 100644
--- a/secure/lib/libcrypto/man/man7/openssl-env.7
+++ b/secure/lib/libcrypto/man/man7/openssl-env.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-ENV 7"
-.TH OPENSSL-ENV 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-ENV 7ossl"
+.TH OPENSSL-ENV 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/openssl-glossary.7 b/secure/lib/libcrypto/man/man7/openssl-glossary.7
index 9bbceee6abf5..31b7d7f7abfb 100644
--- a/secure/lib/libcrypto/man/man7/openssl-glossary.7
+++ b/secure/lib/libcrypto/man/man7/openssl-glossary.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-GLOSSARY 7"
-.TH OPENSSL-GLOSSARY 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-GLOSSARY 7ossl"
+.TH OPENSSL-GLOSSARY 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/openssl-threads.7 b/secure/lib/libcrypto/man/man7/openssl-threads.7
index 2f79653def9d..4b0de0a54946 100644
--- a/secure/lib/libcrypto/man/man7/openssl-threads.7
+++ b/secure/lib/libcrypto/man/man7/openssl-threads.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-THREADS 7"
-.TH OPENSSL-THREADS 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-THREADS 7ossl"
+.TH OPENSSL-THREADS 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/openssl_user_macros.7 b/secure/lib/libcrypto/man/man7/openssl_user_macros.7
index d9bbb87fdcc8..ca5282438cf4 100644
--- a/secure/lib/libcrypto/man/man7/openssl_user_macros.7
+++ b/secure/lib/libcrypto/man/man7/openssl_user_macros.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL_USER_MACROS 7"
-.TH OPENSSL_USER_MACROS 7 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL_USER_MACROS 7ossl"
+.TH OPENSSL_USER_MACROS 7ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/ossl_store-file.7 b/secure/lib/libcrypto/man/man7/ossl_store-file.7
index 3703cca1de0d..59b831c1cd41 100644
--- a/secure/lib/libcrypto/man/man7/ossl_store-file.7
+++ b/secure/lib/libcrypto/man/man7/ossl_store-file.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_STORE-FILE 7"
-.TH OSSL_STORE-FILE 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_STORE-FILE 7ossl"
+.TH OSSL_STORE-FILE 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/ossl_store.7 b/secure/lib/libcrypto/man/man7/ossl_store.7
index 540396b5b67b..8074fe127d65 100644
--- a/secure/lib/libcrypto/man/man7/ossl_store.7
+++ b/secure/lib/libcrypto/man/man7/ossl_store.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OSSL_STORE 7"
-.TH OSSL_STORE 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OSSL_STORE 7ossl"
+.TH OSSL_STORE 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/passphrase-encoding.7 b/secure/lib/libcrypto/man/man7/passphrase-encoding.7
index 2adf392d0210..b7c22a7581e6 100644
--- a/secure/lib/libcrypto/man/man7/passphrase-encoding.7
+++ b/secure/lib/libcrypto/man/man7/passphrase-encoding.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PASSPHRASE-ENCODING 7"
-.TH PASSPHRASE-ENCODING 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PASSPHRASE-ENCODING 7ossl"
+.TH PASSPHRASE-ENCODING 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/property.7 b/secure/lib/libcrypto/man/man7/property.7
index 49c0a0993a61..222916d8e87e 100644
--- a/secure/lib/libcrypto/man/man7/property.7
+++ b/secure/lib/libcrypto/man/man7/property.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROPERTY 7"
-.TH PROPERTY 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROPERTY 7ossl"
+.TH PROPERTY 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-asym_cipher.7 b/secure/lib/libcrypto/man/man7/provider-asym_cipher.7
index 930a23fc200d..99780a17db54 100644
--- a/secure/lib/libcrypto/man/man7/provider-asym_cipher.7
+++ b/secure/lib/libcrypto/man/man7/provider-asym_cipher.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-ASYM_CIPHER 7"
-.TH PROVIDER-ASYM_CIPHER 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-ASYM_CIPHER 7ossl"
+.TH PROVIDER-ASYM_CIPHER 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-base.7 b/secure/lib/libcrypto/man/man7/provider-base.7
index 86fb82121106..6a545bdb19a8 100644
--- a/secure/lib/libcrypto/man/man7/provider-base.7
+++ b/secure/lib/libcrypto/man/man7/provider-base.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-BASE 7"
-.TH PROVIDER-BASE 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-BASE 7ossl"
+.TH PROVIDER-BASE 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-cipher.7 b/secure/lib/libcrypto/man/man7/provider-cipher.7
index 5fc7d886a450..4365508a6819 100644
--- a/secure/lib/libcrypto/man/man7/provider-cipher.7
+++ b/secure/lib/libcrypto/man/man7/provider-cipher.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-CIPHER 7"
-.TH PROVIDER-CIPHER 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-CIPHER 7ossl"
+.TH PROVIDER-CIPHER 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-decoder.7 b/secure/lib/libcrypto/man/man7/provider-decoder.7
index 9f5a96e59f70..c7bf30239de6 100644
--- a/secure/lib/libcrypto/man/man7/provider-decoder.7
+++ b/secure/lib/libcrypto/man/man7/provider-decoder.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-DECODER 7"
-.TH PROVIDER-DECODER 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-DECODER 7ossl"
+.TH PROVIDER-DECODER 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-digest.7 b/secure/lib/libcrypto/man/man7/provider-digest.7
index 509192d0da61..29856393c3df 100644
--- a/secure/lib/libcrypto/man/man7/provider-digest.7
+++ b/secure/lib/libcrypto/man/man7/provider-digest.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-DIGEST 7"
-.TH PROVIDER-DIGEST 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-DIGEST 7ossl"
+.TH PROVIDER-DIGEST 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-encoder.7 b/secure/lib/libcrypto/man/man7/provider-encoder.7
index 5639a4da8587..014465b7fb73 100644
--- a/secure/lib/libcrypto/man/man7/provider-encoder.7
+++ b/secure/lib/libcrypto/man/man7/provider-encoder.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-ENCODER 7"
-.TH PROVIDER-ENCODER 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-ENCODER 7ossl"
+.TH PROVIDER-ENCODER 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-kdf.7 b/secure/lib/libcrypto/man/man7/provider-kdf.7
index 410e6b59237b..644ffbedc156 100644
--- a/secure/lib/libcrypto/man/man7/provider-kdf.7
+++ b/secure/lib/libcrypto/man/man7/provider-kdf.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-KDF 7"
-.TH PROVIDER-KDF 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-KDF 7ossl"
+.TH PROVIDER-KDF 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-kem.7 b/secure/lib/libcrypto/man/man7/provider-kem.7
index ddc851da6b68..e79bc51dd396 100644
--- a/secure/lib/libcrypto/man/man7/provider-kem.7
+++ b/secure/lib/libcrypto/man/man7/provider-kem.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-KEM 7"
-.TH PROVIDER-KEM 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-KEM 7ossl"
+.TH PROVIDER-KEM 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-keyexch.7 b/secure/lib/libcrypto/man/man7/provider-keyexch.7
index 50890fbcba99..a0787e3669cb 100644
--- a/secure/lib/libcrypto/man/man7/provider-keyexch.7
+++ b/secure/lib/libcrypto/man/man7/provider-keyexch.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-KEYEXCH 7"
-.TH PROVIDER-KEYEXCH 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-KEYEXCH 7ossl"
+.TH PROVIDER-KEYEXCH 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-keymgmt.7 b/secure/lib/libcrypto/man/man7/provider-keymgmt.7
index 14a14e39f018..9c851c5d1178 100644
--- a/secure/lib/libcrypto/man/man7/provider-keymgmt.7
+++ b/secure/lib/libcrypto/man/man7/provider-keymgmt.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-KEYMGMT 7"
-.TH PROVIDER-KEYMGMT 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-KEYMGMT 7ossl"
+.TH PROVIDER-KEYMGMT 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-mac.7 b/secure/lib/libcrypto/man/man7/provider-mac.7
index 4af70ff028e1..eeeb4b36c843 100644
--- a/secure/lib/libcrypto/man/man7/provider-mac.7
+++ b/secure/lib/libcrypto/man/man7/provider-mac.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-MAC 7"
-.TH PROVIDER-MAC 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-MAC 7ossl"
+.TH PROVIDER-MAC 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-object.7 b/secure/lib/libcrypto/man/man7/provider-object.7
index a0d235014691..0d40733164f6 100644
--- a/secure/lib/libcrypto/man/man7/provider-object.7
+++ b/secure/lib/libcrypto/man/man7/provider-object.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-OBJECT 7"
-.TH PROVIDER-OBJECT 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-OBJECT 7ossl"
+.TH PROVIDER-OBJECT 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-rand.7 b/secure/lib/libcrypto/man/man7/provider-rand.7
index ecbb1451dc83..f87e32b30ff6 100644
--- a/secure/lib/libcrypto/man/man7/provider-rand.7
+++ b/secure/lib/libcrypto/man/man7/provider-rand.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-RAND 7"
-.TH PROVIDER-RAND 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-RAND 7ossl"
+.TH PROVIDER-RAND 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-signature.7 b/secure/lib/libcrypto/man/man7/provider-signature.7
index b861c686ed0d..2b67cd8b2ac3 100644
--- a/secure/lib/libcrypto/man/man7/provider-signature.7
+++ b/secure/lib/libcrypto/man/man7/provider-signature.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-SIGNATURE 7"
-.TH PROVIDER-SIGNATURE 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-SIGNATURE 7ossl"
+.TH PROVIDER-SIGNATURE 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider-storemgmt.7 b/secure/lib/libcrypto/man/man7/provider-storemgmt.7
index 3ff2070591a9..3df2c624a40b 100644
--- a/secure/lib/libcrypto/man/man7/provider-storemgmt.7
+++ b/secure/lib/libcrypto/man/man7/provider-storemgmt.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER-STOREMGMT 7"
-.TH PROVIDER-STOREMGMT 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER-STOREMGMT 7ossl"
+.TH PROVIDER-STOREMGMT 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/provider.7 b/secure/lib/libcrypto/man/man7/provider.7
index fff5aafaa171..601eb71712c9 100644
--- a/secure/lib/libcrypto/man/man7/provider.7
+++ b/secure/lib/libcrypto/man/man7/provider.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROVIDER 7"
-.TH PROVIDER 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROVIDER 7ossl"
+.TH PROVIDER 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/proxy-certificates.7 b/secure/lib/libcrypto/man/man7/proxy-certificates.7
index 2dd53c564be4..d6f9bd2a4618 100644
--- a/secure/lib/libcrypto/man/man7/proxy-certificates.7
+++ b/secure/lib/libcrypto/man/man7/proxy-certificates.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "PROXY-CERTIFICATES 7"
-.TH PROXY-CERTIFICATES 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "PROXY-CERTIFICATES 7ossl"
+.TH PROXY-CERTIFICATES 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/ssl.7 b/secure/lib/libcrypto/man/man7/ssl.7
index 5a06e2351a66..bb42ba30be81 100644
--- a/secure/lib/libcrypto/man/man7/ssl.7
+++ b/secure/lib/libcrypto/man/man7/ssl.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "SSL 7"
-.TH SSL 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "SSL 7ossl"
+.TH SSL 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/man7/x509.7 b/secure/lib/libcrypto/man/man7/x509.7
index c500d2306ea2..39a595ac8307 100644
--- a/secure/lib/libcrypto/man/man7/x509.7
+++ b/secure/lib/libcrypto/man/man7/x509.7
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "X509 7"
-.TH X509 7 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "X509 7ossl"
+.TH X509 7ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/CA.pl.1 b/secure/usr.bin/openssl/man/CA.pl.1
index b92be2e98d11..ab38f81627dd 100644
--- a/secure/usr.bin/openssl/man/CA.pl.1
+++ b/secure/usr.bin/openssl/man/CA.pl.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "CA.PL 1"
-.TH CA.PL 1 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "CA.PL 1ossl"
+.TH CA.PL 1ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-asn1parse.1 b/secure/usr.bin/openssl/man/openssl-asn1parse.1
index 68430f4c1599..e71615ae40cc 100644
--- a/secure/usr.bin/openssl/man/openssl-asn1parse.1
+++ b/secure/usr.bin/openssl/man/openssl-asn1parse.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-ASN1PARSE 1"
-.TH OPENSSL-ASN1PARSE 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-ASN1PARSE 1ossl"
+.TH OPENSSL-ASN1PARSE 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-ca.1 b/secure/usr.bin/openssl/man/openssl-ca.1
index 22f4c93bf582..0c175ca2f021 100644
--- a/secure/usr.bin/openssl/man/openssl-ca.1
+++ b/secure/usr.bin/openssl/man/openssl-ca.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-CA 1"
-.TH OPENSSL-CA 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-CA 1ossl"
+.TH OPENSSL-CA 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -793,7 +793,7 @@ configuration file entries, environment variables or command line options.
 The values below reflect the default values.
 .PP
 .Vb 9
-\& /usr/local/ssl/lib/openssl.cnf \- master configuration file
+\& /etc/ssl/openssl.cnf \- master configuration file
 \& ./demoCA                       \- main CA directory
 \& ./demoCA/cacert.pem            \- CA certificate
 \& ./demoCA/private/cakey.pem     \- CA private key
diff --git a/secure/usr.bin/openssl/man/openssl-ciphers.1 b/secure/usr.bin/openssl/man/openssl-ciphers.1
index 73676d44c0b0..7028272d26ad 100644
--- a/secure/usr.bin/openssl/man/openssl-ciphers.1
+++ b/secure/usr.bin/openssl/man/openssl-ciphers.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-CIPHERS 1"
-.TH OPENSSL-CIPHERS 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-CIPHERS 1ossl"
+.TH OPENSSL-CIPHERS 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-cmds.1 b/secure/usr.bin/openssl/man/openssl-cmds.1
index 1f50a008a0be..c0c5141bcfb8 100644
--- a/secure/usr.bin/openssl/man/openssl-cmds.1
+++ b/secure/usr.bin/openssl/man/openssl-cmds.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-CMDS 1"
-.TH OPENSSL-CMDS 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-CMDS 1ossl"
+.TH OPENSSL-CMDS 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-cmp.1 b/secure/usr.bin/openssl/man/openssl-cmp.1
index 97b54c622b5d..b7eb6c2dea40 100644
--- a/secure/usr.bin/openssl/man/openssl-cmp.1
+++ b/secure/usr.bin/openssl/man/openssl-cmp.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-CMP 1"
-.TH OPENSSL-CMP 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-CMP 1ossl"
+.TH OPENSSL-CMP 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -757,11 +757,12 @@ if no sender name can be determined from the \fB\-cert\fR or <\-subject> options
 is typically used when authenticating with pre-shared key (password-based \s-1MAC\s0).
 .IP "\fB\-secret\fR \fIarg\fR" 4
 .IX Item "-secret arg"
-Prefer PBM-based message protection with given source of a secret value.
-The secret is used for creating PBM-based protection of outgoing messages
-and (as far as needed) for validating PBM-based protection of incoming messages.
-\&\s-1PBM\s0 stands for Password-Based Message Authentication Code.
+Provides the source of a secret value to use with MAC-based message protection.
 This takes precedence over the \fB\-cert\fR and \fB\-key\fR options.
+The secret is used for creating MAC-based protection of outgoing messages
+and for validating incoming messages that have MAC-based protection.
+The algorithm used by default is Password-Based Message Authentication Code (\s-1PBM\s0)
+as defined in \s-1RFC 4210\s0 section 5.1.3.1.
 .Sp
 For more information about the format of \fIarg\fR see
 \&\fBopenssl\-passphrase\-options\fR\|(1).
@@ -779,7 +780,8 @@ while the subject of \fB\-oldcert\fR or \fB\-subjectName\fR may provide fallback
 The issuer of this certificate is used as one of the recipient fallback values
 and as fallback issuer entry in the certificate template of \s-1IR/CR/KUR\s0 messages.
 .Sp
-When using signature-based message protection, this \*(L"protection certificate\*(R"
+When performing signature-based message protection,
+this \*(L"protection certificate\*(R", also called \*(L"signer certificate\*(R",
 will be included first in the extraCerts field of outgoing messages
 and the signature is done with the corresponding key.
 In Initialization Request (\s-1IR\s0) messages this can be used for authenticating
@@ -808,8 +810,8 @@ have no effect on the certificate verification enabled via this option.
 .IX Item "-key filename|uri"
 The corresponding private key file for the client's current certificate given in
 the \fB\-cert\fR option.
-This will be used for signature-based message protection unless
-the \fB\-secret\fR option indicating \s-1PBM\s0 or \fB\-unprotected_requests\fR is given.
+This will be used for signature-based message protection unless the \fB\-secret\fR
+option indicating MAC-based protection or \fB\-unprotected_requests\fR is given.
 .Sp
 It is also used as a fallback for the \fB\-newkey\fR option with \s-1IR/CR/KUR\s0 messages.
 .IP "\fB\-keypass\fR \fIarg\fR" 4
@@ -823,14 +825,14 @@ For more information about the format of \fIarg\fR see
 .IP "\fB\-digest\fR \fIname\fR" 4
 .IX Item "-digest name"
 Specifies name of supported digest to use in \s-1RFC 4210\s0's \s-1MSG_SIG_ALG\s0
-and as the one-way function (\s-1OWF\s0) in \s-1MSG_MAC_ALG.\s0
+and as the one-way function (\s-1OWF\s0) in \f(CW\*(C`MSG_MAC_ALG\*(C'\fR.
 If applicable, this is used for message protection and
 proof-of-possession (\s-1POPO\s0) signatures.
 To see the list of supported digests, use \f(CW\*(C`openssl list \-digest\-commands\*(C'\fR.
 Defaults to \f(CW\*(C`sha256\*(C'\fR.
 .IP "\fB\-mac\fR \fIname\fR" 4
 .IX Item "-mac name"
-Specifies the name of the \s-1MAC\s0 algorithm in \s-1MSG_MAC_ALG.\s0
+Specifies the name of the \s-1MAC\s0 algorithm in \f(CW\*(C`MSG_MAC_ALG\*(C'\fR.
 To get the names of supported \s-1MAC\s0 algorithms use \f(CW\*(C`openssl list \-mac\-algorithms\*(C'\fR
 and possibly combine such a name with the name of a supported digest algorithm,
 e.g., hmacWithSHA256.
@@ -1128,6 +1130,13 @@ The certificate verification options
 only affect the certificate verification enabled via the \fB\-out_trusted\fR option.
 .SH "NOTES"
 .IX Header "NOTES"
+When a client obtains from a \s-1CMP\s0 server \s-1CA\s0 certificates that it is going to
+trust, for instance via the \f(CW\*(C`caPubs\*(C'\fR field of a certificate response,
+authentication of the \s-1CMP\s0 server is particularly critical.
+So special care must be taken setting up server authentication
+using \fB\-trusted\fR and related options for certificate-based authentication
+or \fB\-secret\fR for MAC-based protection.
+.PP
 When setting up \s-1CMP\s0 configurations and experimenting with enrollment options
 typically various errors occur until the configuration is correct and complete.
 When the \s-1CMP\s0 server reports an error the client will by default
@@ -1205,7 +1214,7 @@ In order to update the enrolled certificate one may call
 \&  openssl cmp \-section insta,kur
 .Ve
 .PP
-using with PBM-based protection or
+using MAC-based protection with \s-1PBM\s0 or
 .PP
 .Vb 1
 \&  openssl cmp \-section insta,kur,signature
@@ -1274,7 +1283,7 @@ Then it can start using the new cert and key.
 \&  cp cl_key_new.pem cl_key.pem
 .Ve
 .PP
-This command sequence can be repated as often as needed.
+This command sequence can be repeated as often as needed.
 .SS "Requesting information from \s-1CMP\s0 server"
 .IX Subsection "Requesting information from CMP server"
 Requesting \*(L"all relevant information\*(R" with an empty General Message.
diff --git a/secure/usr.bin/openssl/man/openssl-cms.1 b/secure/usr.bin/openssl/man/openssl-cms.1
index 2d14e1cf415e..eed35b07d00e 100644
--- a/secure/usr.bin/openssl/man/openssl-cms.1
+++ b/secure/usr.bin/openssl/man/openssl-cms.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-CMS 1"
-.TH OPENSSL-CMS 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-CMS 1ossl"
+.TH OPENSSL-CMS 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -514,7 +514,7 @@ option.
 .IP "\fIrecipient-cert\fR ..." 4
 .IX Item "recipient-cert ..."
 This is an alternative to using the \fB\-recip\fR option when encrypting a message.
-One or more certificate filennames may be given.
+One or more certificate filenames may be given.
 .IP "\fB\-\f(BIcipher\fB\fR" 4
 .IX Item "-cipher"
 The encryption algorithm to use. For example triple \s-1DES\s0 (168 bits) \- \fB\-des3\fR
@@ -974,7 +974,7 @@ The \fB\-nameopt\fR option was added in OpenSSL 3.0.0.
 The \fB\-engine\fR option was deprecated in OpenSSL 3.0.
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2008\-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/usr.bin/openssl/man/openssl-crl.1 b/secure/usr.bin/openssl/man/openssl-crl.1
index 38e41d83782f..6c1f778f8e13 100644
--- a/secure/usr.bin/openssl/man/openssl-crl.1
+++ b/secure/usr.bin/openssl/man/openssl-crl.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-CRL 1"
-.TH OPENSSL-CRL 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-CRL 1ossl"
+.TH OPENSSL-CRL 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-crl2pkcs7.1 b/secure/usr.bin/openssl/man/openssl-crl2pkcs7.1
index 6048f9d070a4..5c1877aee3f1 100644
--- a/secure/usr.bin/openssl/man/openssl-crl2pkcs7.1
+++ b/secure/usr.bin/openssl/man/openssl-crl2pkcs7.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-CRL2PKCS7 1"
-.TH OPENSSL-CRL2PKCS7 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-CRL2PKCS7 1ossl"
+.TH OPENSSL-CRL2PKCS7 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-dgst.1 b/secure/usr.bin/openssl/man/openssl-dgst.1
index 495b71414a71..1ca85d716d26 100644
--- a/secure/usr.bin/openssl/man/openssl-dgst.1
+++ b/secure/usr.bin/openssl/man/openssl-dgst.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-DGST 1"
-.TH OPENSSL-DGST 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-DGST 1ossl"
+.TH OPENSSL-DGST 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-dhparam.1 b/secure/usr.bin/openssl/man/openssl-dhparam.1
index 9beeb93ea9bd..a39bcaf14799 100644
--- a/secure/usr.bin/openssl/man/openssl-dhparam.1
+++ b/secure/usr.bin/openssl/man/openssl-dhparam.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-DHPARAM 1"
-.TH OPENSSL-DHPARAM 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-DHPARAM 1ossl"
+.TH OPENSSL-DHPARAM 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-dsa.1 b/secure/usr.bin/openssl/man/openssl-dsa.1
index aff57cb2f3b6..4e45bbafdb05 100644
--- a/secure/usr.bin/openssl/man/openssl-dsa.1
+++ b/secure/usr.bin/openssl/man/openssl-dsa.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-DSA 1"
-.TH OPENSSL-DSA 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-DSA 1ossl"
+.TH OPENSSL-DSA 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-dsaparam.1 b/secure/usr.bin/openssl/man/openssl-dsaparam.1
index 882b305a1188..e2c13a6fc7c2 100644
--- a/secure/usr.bin/openssl/man/openssl-dsaparam.1
+++ b/secure/usr.bin/openssl/man/openssl-dsaparam.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-DSAPARAM 1"
-.TH OPENSSL-DSAPARAM 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-DSAPARAM 1ossl"
+.TH OPENSSL-DSAPARAM 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-ec.1 b/secure/usr.bin/openssl/man/openssl-ec.1
index caf3545931f3..bb948885bdfb 100644
--- a/secure/usr.bin/openssl/man/openssl-ec.1
+++ b/secure/usr.bin/openssl/man/openssl-ec.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-EC 1"
-.TH OPENSSL-EC 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-EC 1ossl"
+.TH OPENSSL-EC 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-ecparam.1 b/secure/usr.bin/openssl/man/openssl-ecparam.1
index d0292b52056c..d5600029822c 100644
--- a/secure/usr.bin/openssl/man/openssl-ecparam.1
+++ b/secure/usr.bin/openssl/man/openssl-ecparam.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-ECPARAM 1"
-.TH OPENSSL-ECPARAM 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-ECPARAM 1ossl"
+.TH OPENSSL-ECPARAM 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-enc.1 b/secure/usr.bin/openssl/man/openssl-enc.1
index 7de027fe619f..3224be3edbf0 100644
--- a/secure/usr.bin/openssl/man/openssl-enc.1
+++ b/secure/usr.bin/openssl/man/openssl-enc.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-ENC 1"
-.TH OPENSSL-ENC 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-ENC 1ossl"
+.TH OPENSSL-ENC 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-engine.1 b/secure/usr.bin/openssl/man/openssl-engine.1
index 074f78a1ed83..989be9bad124 100644
--- a/secure/usr.bin/openssl/man/openssl-engine.1
+++ b/secure/usr.bin/openssl/man/openssl-engine.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-ENGINE 1"
-.TH OPENSSL-ENGINE 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-ENGINE 1ossl"
+.TH OPENSSL-ENGINE 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-errstr.1 b/secure/usr.bin/openssl/man/openssl-errstr.1
index fbe6c4172961..519b1d7dd0da 100644
--- a/secure/usr.bin/openssl/man/openssl-errstr.1
+++ b/secure/usr.bin/openssl/man/openssl-errstr.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-ERRSTR 1"
-.TH OPENSSL-ERRSTR 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-ERRSTR 1ossl"
+.TH OPENSSL-ERRSTR 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-fipsinstall.1 b/secure/usr.bin/openssl/man/openssl-fipsinstall.1
index 83e38406d683..80976c269448 100644
--- a/secure/usr.bin/openssl/man/openssl-fipsinstall.1
+++ b/secure/usr.bin/openssl/man/openssl-fipsinstall.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-FIPSINSTALL 1"
-.TH OPENSSL-FIPSINSTALL 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-FIPSINSTALL 1ossl"
+.TH OPENSSL-FIPSINSTALL 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-format-options.1 b/secure/usr.bin/openssl/man/openssl-format-options.1
index 12ebae35a0c6..c18796028ee9 100644
--- a/secure/usr.bin/openssl/man/openssl-format-options.1
+++ b/secure/usr.bin/openssl/man/openssl-format-options.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-FORMAT-OPTIONS 1"
-.TH OPENSSL-FORMAT-OPTIONS 1 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-FORMAT-OPTIONS 1ossl"
+.TH OPENSSL-FORMAT-OPTIONS 1ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-gendsa.1 b/secure/usr.bin/openssl/man/openssl-gendsa.1
index 096c6721d448..514c67f601b2 100644
--- a/secure/usr.bin/openssl/man/openssl-gendsa.1
+++ b/secure/usr.bin/openssl/man/openssl-gendsa.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-GENDSA 1"
-.TH OPENSSL-GENDSA 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-GENDSA 1ossl"
+.TH OPENSSL-GENDSA 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-genpkey.1 b/secure/usr.bin/openssl/man/openssl-genpkey.1
index e49c7ab47e53..9353b0a20253 100644
--- a/secure/usr.bin/openssl/man/openssl-genpkey.1
+++ b/secure/usr.bin/openssl/man/openssl-genpkey.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-GENPKEY 1"
-.TH OPENSSL-GENPKEY 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-GENPKEY 1ossl"
+.TH OPENSSL-GENPKEY 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-genrsa.1 b/secure/usr.bin/openssl/man/openssl-genrsa.1
index 1ea08e39e217..aafd650f1a6b 100644
--- a/secure/usr.bin/openssl/man/openssl-genrsa.1
+++ b/secure/usr.bin/openssl/man/openssl-genrsa.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-GENRSA 1"
-.TH OPENSSL-GENRSA 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-GENRSA 1ossl"
+.TH OPENSSL-GENRSA 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-info.1 b/secure/usr.bin/openssl/man/openssl-info.1
index 9c4116711a52..0af27f833b76 100644
--- a/secure/usr.bin/openssl/man/openssl-info.1
+++ b/secure/usr.bin/openssl/man/openssl-info.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-INFO 1"
-.TH OPENSSL-INFO 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-INFO 1ossl"
+.TH OPENSSL-INFO 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-kdf.1 b/secure/usr.bin/openssl/man/openssl-kdf.1
index 4bbc271b29b1..ed98e59e7dea 100644
--- a/secure/usr.bin/openssl/man/openssl-kdf.1
+++ b/secure/usr.bin/openssl/man/openssl-kdf.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-KDF 1"
-.TH OPENSSL-KDF 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-KDF 1ossl"
+.TH OPENSSL-KDF 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-list.1 b/secure/usr.bin/openssl/man/openssl-list.1
index 8ff75f7f2480..2fe679d48154 100644
--- a/secure/usr.bin/openssl/man/openssl-list.1
+++ b/secure/usr.bin/openssl/man/openssl-list.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-LIST 1"
-.TH OPENSSL-LIST 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-LIST 1ossl"
+.TH OPENSSL-LIST 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-mac.1 b/secure/usr.bin/openssl/man/openssl-mac.1
index 658d6374c47f..01eb983a1ae9 100644
--- a/secure/usr.bin/openssl/man/openssl-mac.1
+++ b/secure/usr.bin/openssl/man/openssl-mac.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-MAC 1"
-.TH OPENSSL-MAC 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-MAC 1ossl"
+.TH OPENSSL-MAC 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-namedisplay-options.1 b/secure/usr.bin/openssl/man/openssl-namedisplay-options.1
index 4fedb2b9a9ac..bd6424b499e4 100644
--- a/secure/usr.bin/openssl/man/openssl-namedisplay-options.1
+++ b/secure/usr.bin/openssl/man/openssl-namedisplay-options.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-NAMEDISPLAY-OPTIONS 1"
-.TH OPENSSL-NAMEDISPLAY-OPTIONS 1 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-NAMEDISPLAY-OPTIONS 1ossl"
+.TH OPENSSL-NAMEDISPLAY-OPTIONS 1ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-nseq.1 b/secure/usr.bin/openssl/man/openssl-nseq.1
index e7c2eeb10c0f..625cb568e9a5 100644
--- a/secure/usr.bin/openssl/man/openssl-nseq.1
+++ b/secure/usr.bin/openssl/man/openssl-nseq.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-NSEQ 1"
-.TH OPENSSL-NSEQ 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-NSEQ 1ossl"
+.TH OPENSSL-NSEQ 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-ocsp.1 b/secure/usr.bin/openssl/man/openssl-ocsp.1
index ba74873997ec..5e5d70daafce 100644
--- a/secure/usr.bin/openssl/man/openssl-ocsp.1
+++ b/secure/usr.bin/openssl/man/openssl-ocsp.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-OCSP 1"
-.TH OPENSSL-OCSP 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-OCSP 1ossl"
+.TH OPENSSL-OCSP 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-passphrase-options.1 b/secure/usr.bin/openssl/man/openssl-passphrase-options.1
index de444d096fb7..5bbe4e5b39bc 100644
--- a/secure/usr.bin/openssl/man/openssl-passphrase-options.1
+++ b/secure/usr.bin/openssl/man/openssl-passphrase-options.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-PASSPHRASE-OPTIONS 1"
-.TH OPENSSL-PASSPHRASE-OPTIONS 1 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-PASSPHRASE-OPTIONS 1ossl"
+.TH OPENSSL-PASSPHRASE-OPTIONS 1ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-passwd.1 b/secure/usr.bin/openssl/man/openssl-passwd.1
index 3204861e0d39..40ee470497e1 100644
--- a/secure/usr.bin/openssl/man/openssl-passwd.1
+++ b/secure/usr.bin/openssl/man/openssl-passwd.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-PASSWD 1"
-.TH OPENSSL-PASSWD 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-PASSWD 1ossl"
+.TH OPENSSL-PASSWD 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-pkcs12.1 b/secure/usr.bin/openssl/man/openssl-pkcs12.1
index f9b9ecdf916f..e4092392ff09 100644
--- a/secure/usr.bin/openssl/man/openssl-pkcs12.1
+++ b/secure/usr.bin/openssl/man/openssl-pkcs12.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-PKCS12 1"
-.TH OPENSSL-PKCS12 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-PKCS12 1ossl"
+.TH OPENSSL-PKCS12 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-pkcs7.1 b/secure/usr.bin/openssl/man/openssl-pkcs7.1
index d3c7451ada49..eca0cce8c51a 100644
--- a/secure/usr.bin/openssl/man/openssl-pkcs7.1
+++ b/secure/usr.bin/openssl/man/openssl-pkcs7.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-PKCS7 1"
-.TH OPENSSL-PKCS7 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-PKCS7 1ossl"
+.TH OPENSSL-PKCS7 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-pkcs8.1 b/secure/usr.bin/openssl/man/openssl-pkcs8.1
index 7cf147d40ebb..fbbc91c6fa11 100644
--- a/secure/usr.bin/openssl/man/openssl-pkcs8.1
+++ b/secure/usr.bin/openssl/man/openssl-pkcs8.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-PKCS8 1"
-.TH OPENSSL-PKCS8 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-PKCS8 1ossl"
+.TH OPENSSL-PKCS8 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-pkey.1 b/secure/usr.bin/openssl/man/openssl-pkey.1
index bac7cfe640d4..503acdf37edf 100644
--- a/secure/usr.bin/openssl/man/openssl-pkey.1
+++ b/secure/usr.bin/openssl/man/openssl-pkey.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-PKEY 1"
-.TH OPENSSL-PKEY 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-PKEY 1ossl"
+.TH OPENSSL-PKEY 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-pkeyparam.1 b/secure/usr.bin/openssl/man/openssl-pkeyparam.1
index 316f6dfc95a6..b36e270e279a 100644
--- a/secure/usr.bin/openssl/man/openssl-pkeyparam.1
+++ b/secure/usr.bin/openssl/man/openssl-pkeyparam.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-PKEYPARAM 1"
-.TH OPENSSL-PKEYPARAM 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-PKEYPARAM 1ossl"
+.TH OPENSSL-PKEYPARAM 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-pkeyutl.1 b/secure/usr.bin/openssl/man/openssl-pkeyutl.1
index 90d3cd7ba383..896e95029f2d 100644
--- a/secure/usr.bin/openssl/man/openssl-pkeyutl.1
+++ b/secure/usr.bin/openssl/man/openssl-pkeyutl.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-PKEYUTL 1"
-.TH OPENSSL-PKEYUTL 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-PKEYUTL 1ossl"
+.TH OPENSSL-PKEYUTL 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-prime.1 b/secure/usr.bin/openssl/man/openssl-prime.1
index 9ccaf5aad83d..fb5b212a0466 100644
--- a/secure/usr.bin/openssl/man/openssl-prime.1
+++ b/secure/usr.bin/openssl/man/openssl-prime.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-PRIME 1"
-.TH OPENSSL-PRIME 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-PRIME 1ossl"
+.TH OPENSSL-PRIME 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-rand.1 b/secure/usr.bin/openssl/man/openssl-rand.1
index a5cac3015d37..51ea3e2f4d33 100644
--- a/secure/usr.bin/openssl/man/openssl-rand.1
+++ b/secure/usr.bin/openssl/man/openssl-rand.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-RAND 1"
-.TH OPENSSL-RAND 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-RAND 1ossl"
+.TH OPENSSL-RAND 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-rehash.1 b/secure/usr.bin/openssl/man/openssl-rehash.1
index 465af71d2bb3..82315c1af07c 100644
--- a/secure/usr.bin/openssl/man/openssl-rehash.1
+++ b/secure/usr.bin/openssl/man/openssl-rehash.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-REHASH 1"
-.TH OPENSSL-REHASH 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-REHASH 1ossl"
+.TH OPENSSL-REHASH 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -185,7 +185,7 @@ processed in turn. If not, then the \fB\s-1SSL_CERT_DIR\s0\fR environment variab
 is consulted; this should be a colon-separated list of directories,
 like the Unix \fB\s-1PATH\s0\fR variable.
 If that is not set then the default directory (installation-specific
-but often \fI/usr/local/ssl/certs\fR) is processed.
+but often \fI/etc/ssl/certs\fR) is processed.
 .PP
 In order for a directory to be processed, the user must have write
 permissions on that directory, otherwise an error will be generated.
diff --git a/secure/usr.bin/openssl/man/openssl-req.1 b/secure/usr.bin/openssl/man/openssl-req.1
index 93cd3b5065c4..d7d62039d0fd 100644
--- a/secure/usr.bin/openssl/man/openssl-req.1
+++ b/secure/usr.bin/openssl/man/openssl-req.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-REQ 1"
-.TH OPENSSL-REQ 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-REQ 1ossl"
+.TH OPENSSL-REQ 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-rsa.1 b/secure/usr.bin/openssl/man/openssl-rsa.1
index 2bdf06e7a3b6..4dd01a3495a3 100644
--- a/secure/usr.bin/openssl/man/openssl-rsa.1
+++ b/secure/usr.bin/openssl/man/openssl-rsa.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-RSA 1"
-.TH OPENSSL-RSA 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-RSA 1ossl"
+.TH OPENSSL-RSA 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-rsautl.1 b/secure/usr.bin/openssl/man/openssl-rsautl.1
index 3f5e63d34d89..72c56bd78464 100644
--- a/secure/usr.bin/openssl/man/openssl-rsautl.1
+++ b/secure/usr.bin/openssl/man/openssl-rsautl.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-RSAUTL 1"
-.TH OPENSSL-RSAUTL 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-RSAUTL 1ossl"
+.TH OPENSSL-RSAUTL 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-s_client.1 b/secure/usr.bin/openssl/man/openssl-s_client.1
index c0e1a5efd64a..96d486f6cbd7 100644
--- a/secure/usr.bin/openssl/man/openssl-s_client.1
+++ b/secure/usr.bin/openssl/man/openssl-s_client.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-S_CLIENT 1"
-.TH OPENSSL-S_CLIENT 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-S_CLIENT 1ossl"
+.TH OPENSSL-S_CLIENT 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-s_server.1 b/secure/usr.bin/openssl/man/openssl-s_server.1
index 36f56ae49eea..0f6a4e2086bb 100644
--- a/secure/usr.bin/openssl/man/openssl-s_server.1
+++ b/secure/usr.bin/openssl/man/openssl-s_server.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-S_SERVER 1"
-.TH OPENSSL-S_SERVER 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-S_SERVER 1ossl"
+.TH OPENSSL-S_SERVER 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-s_time.1 b/secure/usr.bin/openssl/man/openssl-s_time.1
index 4133b243b808..2ce1044cde3e 100644
--- a/secure/usr.bin/openssl/man/openssl-s_time.1
+++ b/secure/usr.bin/openssl/man/openssl-s_time.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-S_TIME 1"
-.TH OPENSSL-S_TIME 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-S_TIME 1ossl"
+.TH OPENSSL-S_TIME 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-sess_id.1 b/secure/usr.bin/openssl/man/openssl-sess_id.1
index 4091bc75b55e..15ed8baf88d7 100644
--- a/secure/usr.bin/openssl/man/openssl-sess_id.1
+++ b/secure/usr.bin/openssl/man/openssl-sess_id.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-SESS_ID 1"
-.TH OPENSSL-SESS_ID 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-SESS_ID 1ossl"
+.TH OPENSSL-SESS_ID 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-smime.1 b/secure/usr.bin/openssl/man/openssl-smime.1
index fd1bf96a778a..b40f6e90e1f5 100644
--- a/secure/usr.bin/openssl/man/openssl-smime.1
+++ b/secure/usr.bin/openssl/man/openssl-smime.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-SMIME 1"
-.TH OPENSSL-SMIME 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-SMIME 1ossl"
+.TH OPENSSL-SMIME 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-speed.1 b/secure/usr.bin/openssl/man/openssl-speed.1
index 09b41f4c877f..04e14afcbc17 100644
--- a/secure/usr.bin/openssl/man/openssl-speed.1
+++ b/secure/usr.bin/openssl/man/openssl-speed.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-SPEED 1"
-.TH OPENSSL-SPEED 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-SPEED 1ossl"
+.TH OPENSSL-SPEED 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-spkac.1 b/secure/usr.bin/openssl/man/openssl-spkac.1
index d86e0a21032a..d7db00c67c72 100644
--- a/secure/usr.bin/openssl/man/openssl-spkac.1
+++ b/secure/usr.bin/openssl/man/openssl-spkac.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-SPKAC 1"
-.TH OPENSSL-SPKAC 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-SPKAC 1ossl"
+.TH OPENSSL-SPKAC 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-srp.1 b/secure/usr.bin/openssl/man/openssl-srp.1
index 49f88492ca7a..3d6affa96ae7 100644
--- a/secure/usr.bin/openssl/man/openssl-srp.1
+++ b/secure/usr.bin/openssl/man/openssl-srp.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-SRP 1"
-.TH OPENSSL-SRP 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-SRP 1ossl"
+.TH OPENSSL-SRP 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-storeutl.1 b/secure/usr.bin/openssl/man/openssl-storeutl.1
index c3965a147821..4a23ea740aa4 100644
--- a/secure/usr.bin/openssl/man/openssl-storeutl.1
+++ b/secure/usr.bin/openssl/man/openssl-storeutl.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-STOREUTL 1"
-.TH OPENSSL-STOREUTL 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-STOREUTL 1ossl"
+.TH OPENSSL-STOREUTL 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-ts.1 b/secure/usr.bin/openssl/man/openssl-ts.1
index 1a6f636be993..64ffeff1d969 100644
--- a/secure/usr.bin/openssl/man/openssl-ts.1
+++ b/secure/usr.bin/openssl/man/openssl-ts.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-TS 1"
-.TH OPENSSL-TS 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-TS 1ossl"
+.TH OPENSSL-TS 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -587,7 +587,7 @@ Default is no.  (Optional)
 .IP "\fBess_cert_id_alg\fR" 4
 .IX Item "ess_cert_id_alg"
 This option specifies the hash function to be used to calculate the \s-1TSA\s0's
-public key certificate identifier. Default is sha256. (Optional)
+public key certificate identifier. Default is sha1. (Optional)
 .SH "EXAMPLES"
 .IX Header "EXAMPLES"
 All the examples below presume that \fB\s-1OPENSSL_CONF\s0\fR is set to a proper
@@ -752,7 +752,7 @@ The \fB\-engine\fR option was deprecated in OpenSSL 3.0.
 \&\fBossl_store\-file\fR\|(7)
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright 2006\-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the \*(L"License\*(R").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/secure/usr.bin/openssl/man/openssl-verification-options.1 b/secure/usr.bin/openssl/man/openssl-verification-options.1
index 6ade7a3a2212..20af8384265d 100644
--- a/secure/usr.bin/openssl/man/openssl-verification-options.1
+++ b/secure/usr.bin/openssl/man/openssl-verification-options.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-VERIFICATION-OPTIONS 1"
-.TH OPENSSL-VERIFICATION-OPTIONS 1 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-VERIFICATION-OPTIONS 1ossl"
+.TH OPENSSL-VERIFICATION-OPTIONS 1ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-verify.1 b/secure/usr.bin/openssl/man/openssl-verify.1
index 439bfd60ec62..01be9a95ff17 100644
--- a/secure/usr.bin/openssl/man/openssl-verify.1
+++ b/secure/usr.bin/openssl/man/openssl-verify.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-VERIFY 1"
-.TH OPENSSL-VERIFY 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-VERIFY 1ossl"
+.TH OPENSSL-VERIFY 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-version.1 b/secure/usr.bin/openssl/man/openssl-version.1
index 197f7d0806e0..0a0c282c1a76 100644
--- a/secure/usr.bin/openssl/man/openssl-version.1
+++ b/secure/usr.bin/openssl/man/openssl-version.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-VERSION 1"
-.TH OPENSSL-VERSION 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-VERSION 1ossl"
+.TH OPENSSL-VERSION 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl-x509.1 b/secure/usr.bin/openssl/man/openssl-x509.1
index bfb44a3f88f1..0c85bd25de06 100644
--- a/secure/usr.bin/openssl/man/openssl-x509.1
+++ b/secure/usr.bin/openssl/man/openssl-x509.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL-X509 1"
-.TH OPENSSL-X509 1 "2023-08-02" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL-X509 1ossl"
+.TH OPENSSL-X509 1ossl "2023-09-22" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl.1 b/secure/usr.bin/openssl/man/openssl.1
index 392550205ba6..e49493aa8bc1 100644
--- a/secure/usr.bin/openssl/man/openssl.1
+++ b/secure/usr.bin/openssl/man/openssl.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "OPENSSL 1"
-.TH OPENSSL 1 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "OPENSSL 1ossl"
+.TH OPENSSL 1ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/tsget.1 b/secure/usr.bin/openssl/man/tsget.1
index 077b522b86db..6f8bbb11323a 100644
--- a/secure/usr.bin/openssl/man/tsget.1
+++ b/secure/usr.bin/openssl/man/tsget.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -132,8 +132,8 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "TSGET 1"
-.TH TSGET 1 "2023-08-01" "3.0.10" "OpenSSL"
+.IX Title "TSGET 1ossl"
+.TH TSGET 1ossl "2023-09-19" "3.0.11" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/share/man/man4/axge.4 b/share/man/man4/axge.4
index d42a1a233c59..9ca268d6ff83 100644
--- a/share/man/man4/axge.4
+++ b/share/man/man4/axge.4
@@ -28,12 +28,12 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 24, 2015
+.Dd October 4, 2023
 .Dt AXGE 4
 .Os
 .Sh NAME
 .Nm axge
-.Nd "ASIX Electronics AX88178A/AX88179 USB Gigabit Ethernet driver"
+.Nd "ASIX Electronics AX88178A/179/179A USB Gigabit Ethernet driver"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -59,13 +59,13 @@ if_axge_load="YES"
 The
 .Nm
 driver provides support for USB Gigabit Ethernet adapters based on the ASIX
-Electronics AX88179 USB 3.0 and AX88178A USB 2.0 chipsets.
+Electronics AX88179/AX88179A USB 3.0 and AX88178A USB 2.0 chipsets.
 .Pp
-The AX88179 and AX88178A contain a 10/100/1000 Ethernet MAC with a GMII
-interface for interfacing with the Gigabit Ethernet PHY.
+The AX88179, AX88179A and AX88178A contain a 10/100/1000 Ethernet MAC with a
+GMII interface for interfacing with the Gigabit Ethernet PHY.
 .Pp
 These devices will operate with both USB 1.x and USB 2.0 controllers, and the
-AX88179 will operate with USB 3.0 controllers.
+AX88179/AX88179A will operate with USB 3.0 controllers.
 Packets are received and transmitted over separate USB bulk transfer endpoints.
 .Pp
 The
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index f42a74b3a65c..929baf3a234b 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 7, 2017
+.Dd October 10, 2023
 .Dt FDC 4
 .Os
 .Sh NAME
@@ -311,6 +311,61 @@ Third argument is a pointer to
 This type is the same as being used in the per-drive configuration
 flags, or in the CMOS configuration data or ACPI namespace on IA32 systems.
 .El
+.Sh SYSCTL VARIABLES
+.Bl -tag -width "debug.fdc.debugflags"
+.It Dv debug.fdc.debugflags
+Selectively enable debugging by setting one or more flags.
+.Bl -tag -width "0x40"
+.It Dv 0x01
+Dump device registers on reset.
+.It Dv 0x02
+When an IO operation completes, print the number of retries
+when that number is greater than zero.
+.It Dv 0x04
+Print when the number of retries exceeds
+.Dv debug.fdc.retries
+.Pq Dv EIO .
+Print when the option
+.Dv FDOPT_NOERROR
+is set and an error would have returned from a write operation.
+.It Dv 0x08
+Print detailed IO command information.
+.It Dv 0x10
+Print status registers.
+.It Dv 0x20
+Print detailed status registers when interrupts complete.
+Print the source code line number close to the source of a
+non-zero return from a thread worker operation.
+.It Dv 0x40
+Print when the disk appears to be lost.
+Print cylinder, head, sector, and sector shift information
+after a request to read an ID field.
+Notify whether a disk probe resulted in finding a disk.
+When detecting the density of media present, indicate whether
+the autosensing was successful, and if so, the size of the
+medium in kilobytes.
+Print detailed type information when setting the drive type.
+.It Dv 0x80
+Print when an unknown IOCTL is used.
+.El
+.It Dv debug.fdc.fifo
+For enhanced controllers, allows a non-default FIFO
+threshold setting. The default is 8 bytes.
+.It Dv debug.fdc.retries
+Maximum number of retries to attempt. The default is 10.
+.It Dv debug.fdc.spec1
+Specification byte one (step-rate + head unload).
+The default step rate is 6 ms. The default head unload
+time is 240 ms.
+.It Dv debug.fdc.spec2
+Specification byte two (head load time + no-dma).
+The default head load time is 16 ms, and no-dma is 0
+.Pq disabled .
+.It Dv debug.fdc.settle
+Head settling time in
+.Sy settle
+/ hz seconds. The default value is set during device attach.
+.El
 .Sh FILES
 .Bl -tag -width ".Pa /dev/fd*" -compact
 .It Pa /dev/fd*
diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4
index c7f5f7e5250a..c0f3bb23499d 100644
--- a/share/man/man4/geom.4
+++ b/share/man/man4/geom.4
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd July 26, 2023
+.Dd October 6, 2023
 .Dt GEOM 4
 .Os
 .Sh NAME
@@ -226,6 +226,12 @@ Examine the rank number of the provider's geom.
 .It
 Examine the method name of the provider's geom.
 .El
+.Pp
+Tasting is controlled by the
+.Va kern.geom.notaste
+sysctl.
+To disable tasting, set the sysctl to 1, to
+re-enable tasting, set the sysctl to 0.
 .It Em ORPHANIZATION
 is the process by which a provider is removed while
 it potentially is still being used.
diff --git a/share/man/man4/pcf8591.4 b/share/man/man4/pcf8591.4
index 6133d6cfa0d8..9acaf6502b38 100644
--- a/share/man/man4/pcf8591.4
+++ b/share/man/man4/pcf8591.4
@@ -24,8 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/cp2112.4 364144 2020-08-12 09:42:05Z avg $
-.\"
 .Dd November 6, 2021
 .Dt PCF8591 4
 .Os
diff --git a/share/man/man4/rtw88.4 b/share/man/man4/rtw88.4
index 24baf6a5194f..a1a74db41b42 100644
--- a/share/man/man4/rtw88.4
+++ b/share/man/man4/rtw88.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2022-2023 Bjoern A. Zeeb
+.\" Copyright (c) 2022 Bjoern A. Zeeb
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,15 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd September 5, 2023
+.Dd October 06, 2023
 .Dt RTW88 4
 .Os
 .Sh NAME
 .Nm rtw88
 .Nd Realtek IEEE 802.11n/ac wireless network driver
 .Sh SYNOPSIS
-.Sy The driver is temporary disconnected from the build.
-.Pp
 The driver will auto-load without any user interaction using
 .Xr devmatch 8
 if enabled in
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index d3a5c8fa582d..80015025345e 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -884,6 +884,8 @@ following masks:
 /* any char will restart after stop */
 .It Dv IMAXBEL
 /* ring bell on input queue full */
+.It Dv IUTF8
+/* assume input is UTF-8 encoded */
 .El
 .Pp
 In the context of asynchronous serial data transmission, a break
diff --git a/share/man/man4/vmm.4 b/share/man/man4/vmm.4
index e94f0ccaeac8..cb3276a7d8f1 100644
--- a/share/man/man4/vmm.4
+++ b/share/man/man4/vmm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 19, 2013
+.Dd October 12, 2023
 .Dt VMM 4
 .Os
 .Sh NAME
@@ -79,6 +79,16 @@ The
 and
 .Va pptdevs3
 variables can be used for additional entries.
+.Sh LOADER TUNABLES
+Tunables can be set at the
+.Xr loader 8
+prompt before booting the kernel or stored in
+.Xr loader.conf 5 .
+.Bl -tag -width indent
+.It Va hw.vmm.maxcpu
+Maximum number of virtual CPUs.
+The default is the number of physical CPUs in the system.
+.El
 .Sh EXAMPLES
 Reserve three PCI devices for use by the hypervisor: bus 10 slot 0 function 0,
 bus 6 slot 5 function 0, and bus 6 slot 5 function 1.
diff --git a/share/man/man5/rctl.conf.5 b/share/man/man5/rctl.conf.5
index 4f48b197214a..bf64e54fc567 100644
--- a/share/man/man5/rctl.conf.5
+++ b/share/man/man5/rctl.conf.5
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 14, 2011
+.Dd October 6, 2023
 .Dt RCTL.CONF 5
 .Os
 .Sh NAME
@@ -61,7 +61,7 @@ To limit the number of processes for users in login class "testing",
 use a rule like
 .Bd -literal -offset indent
 # Resource limits for the "testing" class.
-loginclass:testing:nproc:deny=100/user # At most 100 processes per user
+loginclass:testing:maxproc:deny=100/user # At most 100 processes per user
 .Ed
 .Sh SEE ALSO
 .Xr rctl 8
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index e58affe06ea1..53958ea7989f 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,5 +1,5 @@
 .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
-.Dd February 2, 2024
+.Dd February 8, 2024
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -441,19 +441,13 @@ Avoid building or installing standalone debug files for each
 executable binary and shared library.
 .It Va WITH_DETECT_TZ_CHANGES
 Make the time handling code detect changes to the timezone files.
-.It Va WITHOUT_DIALOG
-Do not build
+.It Va WITH_DIALOG
+Do build
 .Xr dialog 1 ,
 .Xr dialog 3 ,
 .Xr dpv 1 ,
 and
 .Xr dpv 3 .
-When set, it enforces these options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_BSDINSTALL
-.El
 .It Va WITHOUT_DICT
 Do not build the Webster dictionary files.
 .It Va WITH_DIRDEPS_BUILD
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index d37f79b776ee..c1b25bc7c403 100644
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -20,6 +20,7 @@ MAN=	arch.7 \
 	hostname.7 \
 	intro.7 \
 	maclabel.7 \
+	mitigations.7 \
 	operator.7 \
 	orders.7 \
 	ports.7 \
diff --git a/share/man/man7/mitigations.7 b/share/man/man7/mitigations.7
new file mode 100644
index 000000000000..fed16d7b325f
--- /dev/null
+++ b/share/man/man7/mitigations.7
@@ -0,0 +1,367 @@
+.\" Copyright © 2023 The FreeBSD Foundation
+.\"
+.\" This documentation was written by Ed Maste <emaste@freebsd.org>, and
+.\" Olivier Certner <olce.freebsd@certner.fr> at Kumacom SAS, under
+.\" sponsorship of the FreeBSD Foundation.
+.\"
+.\" 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.
+.\"
+.Dd October 6, 2023
+.Dt MITIGATIONS 7
+.Os
+.Sh NAME
+.Nm mitigations
+.Nd FreeBSD Security Vulnerability Mitigations
+.Sh SYNOPSIS
+In
+.Fx ,
+various security mitigations are employed to limit the impact of
+vulnerabilities and protect the system from malicious attacks.
+Some of these mitigations have run-time controls to enable them on a global
+or per-process basis, some are optionally enabled or disabled at compile time,
+and some are inherent to the implementation and have no controls.
+.Pp
+The following vulnerability mitigations are covered in this document:
+.Bl -bullet -compact
+.It
+Address Space Layout Randomization (ASLR)
+.It
+Position Independent Executable (PIE)
+.It
+Write XOR Execute page protection policy
+.It
+.Dv PROT_MAX
+.It
+Relocation Read-Only (RELRO)
+.It
+Bind Now
+.\".It
+.\"Stack Smashing Protection (SSP)
+.\".It
+.\"Supervisor Mode Memory Protection
+.It
+Hardware Vulnerability Mitigation Controls
+.It
+Capsicum
+.El
+.Pp
+Please note that the effectiveness and availability of these mitigations may
+vary depending on the
+.Fx
+version and system configuration.
+.Sh DESCRIPTION
+Security vulnerability mitigations are techniques employed in
+.Fx
+to limit the potential impact of security vulnerabilities in software and
+hardware.
+It is essential to understand that mitigations do not directly address the
+underlying security issues.
+They are not a substitute for secure coding practices.
+Mitigations serve as an additional layer of defense, helping to reduce the
+likelihood of a successful exploitation of vulnerabilities by making it
+more difficult for attackers to achieve their objectives.
+.Pp
+This manual page describes the security mitigations implemented in
+.Fx
+to enhance the overall security of the operating system.
+Each mitigation is designed to protect against specific types of attacks
+and vulnerabilities.
+.\"
+.Sh SOFTWARE VULNERABILITY MITIGATIONS
+.Ss Address Space Layout Randomization (ASLR)
+Address Space Layout Randomization (ASLR) is a security mitigation technique
+that works by randomizing the memory addresses where system and application
+code, data, and libraries are loaded, making it more challenging for attackers
+to predict the memory layout and exploit vulnerabilities.
+.Pp
+ASLR introduces randomness into the memory layout during process execution,
+reducing the predictability of memory addresses.
+ASLR is intended to make exploitation more difficult in the event that an
+attacker discovers a software vulnerability, such as a buffer overflow.
+.Pp
+ASLR can be enabled on both a global and per-process basis.
+Global control is provided by a separate set of
+.Xr sysctl 8
+knobs for 32- and 64-bit processes.
+It can be or disabled on a per-process basis via
+.Xr proccontrol 1 .
+Note that an ASLR mode change takes effect upon address space change,
+i.e., upon
+.Xr execve 2 .
+.Pp
+Global controls for 32-bit processes:
+.Bl -tag -width kern.elf32.aslr.pie_enable
+.It Va kern.elf32.aslr.enable
+Enable ASLR for 32-bit ELF binaries, other than Position Independent
+Exectutable (PIE) binaries.
+.It Va kern.elf32.aslr.pie_enable
+Enable ASLR for 32-bit Position Independent Executable (PIE) ELF binaries.
+.It Va kern.elf32.aslr.honor_sbrk
+Reserve the legacy
+.Xr sbrk 2
+region for compatibility with older binaries.
+.It Va kern.elf32.aslr.stack
+If ASLR is enabled for a process, also randomize the stack location.
+.El
+.Pp
+Global controls for 64-bit processes:
+.Bl -tag -width kern.elf64.aslr.pie_enable
+.It Va kern.elf64.aslr.enable
+Enable ASLR for 64-bit ELF binaries, other than Position Independent
+Exectutable (PIE) binaries.
+.It Va kern.elf64.aslr.pie_enable
+Enable ASLR for 64-bit Position Independent Executable (PIE) ELF binaries.
+.It Va kern.elf64.aslr.honor_sbrk
+Reserve the legacy
+.Xr sbrk 2
+region for compatibility with older binaries.
+.It Va kern.elf64.aslr.stack
+If ASLR is enabled for a process, also randomize the stack location.
+.El
+.Pp
+To execute a command with ASLR enabled or disabled:
+.Pp
+proccontrol
+.Fl m Ar aslr
+.Op Fl s Ar enable | disable
+.Ar command
+.\"
+.Ss Position Independent Executable (PIE)
+PIE binaries are executable files that do not have a fixed load address.
+They can be loaded at an arbitrary memory address by the
+.Xr rtld
+run-time linker.
+With ASLR they are loaded at a random address on each execution.
+.\"
+.Ss Write XOR Execute page protection policy
+Write XOR Execute (W^X) is a vulnerability mitigation strategy that strengthens
+the security of the system by controlling memory access permissions.
+.Pp
+Under the W^X mitigation, memory pages may be writable (W) or executable (E),
+but not both at the same time.
+This means that code execution is prevented in areas of memory that are
+designated as writable, and writing or modification of memory is restricted in
+areas marked for execution.
+Applications that perform Just In Time (JIT) compilation need to be adapted
+to be compatible with W^X.
+.Pp
+There are separate
+.Xr sysctl 8
+knobs to control W^X policy enforcement for 32- and 64-bit processes.
+The W^X policy is enabled by setting the appropriate
+.Dv allow_wx
+sysctl to 0.
+.Bl -tag -width kern.elf64.allow_wx
+.It Va kern.elf32.allow_wx
+Allow 32-bit processes to map pages simultaneously writable and executable.
+.It Va kern.elf64.allow_wx
+Allow 64-bit processes to map pages simultaneously writable and executable.
+.El
+.\"
+.Ss PROT_MAX
+.Dv PROT_MAX
+is a FreeBSD-specific extension to
+.Xr mmap 2 .
+.Dv PROT_MAX
+provides the ability to set the maximum protection of a region allocated by
+.Xr mmap
+and later altered by
+.Xr mprotect .
+For example, memory allocated originally with an mmap prot argument of
+PROT_MAX(PROT_READ | PROT_WRITE) | PROT_READ
+may be made writable by a future
+.Xr mprotect
+call, but may not be made executable.
+.\"
+.Ss Relocation Read-Only (RELRO)
+Relocation Read-Only (RELRO) is a mitigation tool that makes certain portions
+of a program's address space that contain ELF metadata read-only, after
+relocation processing by
+.Xr rtld 1 .
+.Pp
+When enabled in isolation the RELRO option provides
+.Em partial RELRO
+support.
+In this case the Procedure Linkage Table (PLT)-related part of the
+Global Offset Table (GOT) (in the section typically named .got.plt) remains
+writable.
+.Pp
+RELRO is enabled by default.
+The
+.Xr src.conf 5
+build-time option
+.Va WITHOUT_RELRO
+may be used to disable it.
+.Ss BIND_NOW
+The
+.Va WITH_BIND_NOW
+.Xr src.conf 5
+build-time option causes binaries to be built with the
+.Dv DF_BIND_NOW
+flag set.
+The run-time loader
+.Xr rtld 1
+will then perform all relocation processing when the process starts, instead of
+on demand (on the first access to each symbol).
+.Pp
+When enabled in combination with
+.Dv RELRO
+(which is enabled by default) this provides
+.Em full RELRO .
+The entire GOT (.got and .got.plt) are made read-only at program startup,
+preventing attacks on the relocation table.
+Note that this results in a nonstandard Application Binary Interface (ABI),
+and it is possible that some applications may not function correctly.
+.\"
+.\".Ss Stack Smashing Protection (SSP)
+.\"
+.\".Ss Supervisor mode memory protection
+.\"
+.Ss Hardware vulnerability controls
+See
+.Xr security 7
+for more information.
+.\"
+.Ss Capsicum
+Capsicum is a lightweight OS capability and sandbox framework.
+See
+.Xr capsicum 4
+for more information.
+.Pp
+.Sh HARDWARE VULNERABILITY MITIGATIONS
+Recent years have seen an unending stream of new hardware vulnerabilities,
+notably CPU ones generally caused by detectable microarchitectural side-effects
+of speculative execution which leak private data from some other thread or
+process or sometimes even internal CPU state that is normally inaccessible.
+Hardware vendors usually address these vulnerabilities as they are discovered by
+releasing microcode updates, which may then be bundled into platform firmware
+updates
+.Pq historically called BIOS updates for PCs .
+.Pp
+The best defense overall against hardware vulnerabilities is to timely apply
+these updates when available and to disable the affected hardware's problematic
+functionalities when possible (e.g., CPU Simultaneous Multi-Threading).
+Software mitigations are only partial substitutes for these, but they can be
+helpful on out-of-support hardware or as complements for just-discovered
+vulnerabilities not yet addressed by vendors.
+Some software mitigations depend on hardware capabilities provided by a
+microcode update.
+.Pp
+FreeBSD's usual policy is to apply by default all OS-level mitigations that do
+not require recompilation, except those the particular hardware it is running on
+is known not to be vulnerable to
+.Pq which sometimes requires firmware updates ,
+or those that are extremely detrimental to performance in proportion to the
+protection they actually provide.
+OS-level mitigations generally can have noticeable performance impacts on
+specific workloads.
+If your threat model allows it, you may want to try disabling some of them in
+order to possibly get better performance.
+Conversely, minimizing the risks may require you to explicitly enable the most
+expensive ones.
+The description of each vulnerability/mitigation indicates whether it is enabled
+or disabled by default and under which conditions.
+It also lists the knobs to tweak to force a particular status.
+.Ss Zenbleed
+The
+.Dq Zenbleed
+vulnerability exclusively affects AMD processors based on the Zen2
+microarchitecture.
+In contrast with, e.g., Meltdown and the different variants of Spectre, which
+leak data by leaving microarchitectural traces, Zenbleed is a genuine hardware
+bug affecting the CPU's architectural state.
+With particular sequences of instructions whose last ones are mispredicted by
+speculative execution, it is possible to make appear in an XMM register data
+previously put in some XMM register by some preceding or concurrent task
+executing on the same physical core
+.Po disabling Simultaneous Muti-Threading
+.Pq SMT
+is thus not a sufficient protection
+.Pc .
+.Pp
+According to the vulnerability's discoverer, all Zen2-based processors are
+affected
+.Po see
+.Lk https://lock.cmpxchg8b.com/zenbleed.html
+.Pc .
+As of August 2023, AMD has not publicly listed any corresponding errata but has
+issued a security bulletin
+.Pq AMD-SB-7008
+entitled
+.Dq Cross-Process Information Leak
+indicating that platform firmware fixing the vulnerability will be distributed
+to manufacturers no sooner than the end of 2023, except for Rome processors for
+which it is already available.
+No standalone CPU microcodes have been announced so far.
+The only readily-applicable fix mentioned by the discoverer is to set a bit of
+an undocumented MSR, which reportedly completely stops XMM register leaks.
+.Pp
+.Fx
+currently sets this bit by default on all Zen2 processors.
+In the future, it might set it by default only on those Zen2 processors whose
+microcode has not been updated to revisions fixing the vulnerability, once such
+microcode updates have been actually released and community-tested.
+To this mitigation are associated the following knobs:
+.Bl -tag -width indent
+.It Va machdep.mitigations.zenbleed.enable
+A read-write integer tunable and sysctl indicating whether the mitigation should
+be forcibly disabled (0), enabled (1) or if it is left to
+.Fx
+to selectively apply it (2).
+Any other integer value is silently converted to and treated as value 2.
+Note that this setting is silently ignored when running on non-Zen2 processors
+to ease applying a common configuration to heterogeneous machines.
+.It Va machdep.mitigations.zenbleed.state
+A read-only string indicating the current mitigation state.
+It can be either
+.Dq Not applicable ,
+if the processor is not Zen2-based,
+.Dq Mitigation enabled
+or
+.Dq Mitigation disabled .
+This state is automatically updated each time the sysctl
+.Va machdep.mitigations.zenbleed.enable
+is written to.
+Note that it can become inaccurate if the chicken bit is set or cleared
+directly via
+.Xr cpuctl 4
+.Po which includes the
+.Xr cpucontrol 8
+utility
+.Pc .
+.El
+.Pp
+The performance impact and threat models related to these mitigations
+should be considered when configuring and deploying them in a
+.Fx
+system.
+.Pp
+.Sh SEE ALSO
+.Xr elfctl 1 ,
+.Xr proccontrol 1 ,
+.Xr rtld 1 ,
+.Xr mmap 2 ,
+.Xr src.conf 5 ,
+.Xr sysctl.conf 5 ,
+.Xr security 7 ,
+.Xr cpucontrol 8 ,
+.Xr sysctl 8
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
index 6d6742fca0bb..a48e3607f0e5 100644
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 18, 2023
+.Dd October 5, 2023
 .Dt SECURITY 7
 .Os
 .Sh NAME
@@ -1101,6 +1101,7 @@ Enables mapping of simultaneously writable and executable pages for
 .Xr xdm 1 Pq Pa ports/x11/xorg-clients ,
 .Xr group 5 ,
 .Xr ttys 5 ,
+.Xr mitigations 7 ,
 .Xr accton 8 ,
 .Xr init 8 ,
 .Xr sshd 8 ,
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 59c37a9ed45d..ffabbf7b7b35 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -270,6 +270,7 @@ MAN=	accept_filter.9 \
 	pmap_copy.9 \
 	pmap_enter.9 \
 	pmap_extract.9 \
+	pmap_kextract.9 \
 	pmap_growkernel.9 \
 	pmap_init.9 \
 	pmap_is_modified.9 \
@@ -1214,8 +1215,7 @@ MLINKS+=ieee80211_node.9 ieee80211_dump_node.9 \
 	ieee80211_node.9 ieee80211_find_rxnode_withkey.9 \
 	ieee80211_node.9 ieee80211_free_node.9 \
 	ieee80211_node.9 ieee80211_iterate_nodes.9 \
-	ieee80211_node.9 ieee80211_ref_node.9 \
-	ieee80211_node.9 ieee80211_unref_node.9
+	ieee80211_node.9 ieee80211_ref_node.9
 MLINKS+=ieee80211_output.9 ieee80211_process_callback.9 \
 	ieee80211_output.9 M_SEQNO_GET.9 \
 	ieee80211_output.9 M_WME_GETAC.9
@@ -1810,6 +1810,7 @@ MLINKS+=PHOLD.9 PRELE.9 \
 	PHOLD.9 PROC_ASSERT_NOT_HELD.9
 MLINKS+=pmap_copy.9 pmap_copy_page.9
 MLINKS+=pmap_extract.9 pmap_extract_and_hold.9
+MLINKS+=pmap_kextract.9 vtophys.9
 MLINKS+=pmap_init.9 pmap_init2.9
 MLINKS+=pmap_is_modified.9 pmap_ts_referenced.9
 MLINKS+=pmap_pinit.9 pmap_pinit0.9 \
diff --git a/share/man/man9/ieee80211_node.9 b/share/man/man9/ieee80211_node.9
index 8340b4762b67..6dd492e3b33d 100644
--- a/share/man/man9/ieee80211_node.9
+++ b/share/man/man9/ieee80211_node.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 28, 2010
+.Dd October 2, 2023
 .Dt IEEE80211_NODE 9
 .Os
 .Sh NAME
@@ -50,9 +50,6 @@
 .Fn ieee80211_ref_node "struct ieee80211_node *"
 .\"
 .Ft void
-.Fn ieee80211_unref_node "struct ieee80211_node *"
-.\"
-.Ft void
 .Fn ieee80211_free_node "struct ieee80211_node *"
 .\"
 .Ft void
@@ -106,14 +103,10 @@ Routines that lookup a table entry return a
 (i.e. a pointer to a table entry with the reference count incremented).
 The
 .Fn ieee80211_ref_node
-and
-.Fn ieee80211_unref_node
-calls explicitly increment/decrement the reference count of a node,
-but are rarely used.
-Instead most callers use
+call explicitly increments the reference count of a node.
 .Fn ieee80211_free_node
-to release a reference and, if the count goes to zero, reclaim the
-table entry.
+decrements the reference count of a node and if the count goes to zero
+reclaims the table entry.
 .Pp
 The station table and its entries are exposed to drivers in several ways.
 Each frame transmitted to a station includes a reference to the
diff --git a/share/man/man9/kasan.9 b/share/man/man9/kasan.9
index 1db6e187da46..209fbb06506c 100644
--- a/share/man/man9/kasan.9
+++ b/share/man/man9/kasan.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 23, 2023
+.Dd October 13, 2023
 .Dt KASAN 9
 .Os
 .Sh NAME
@@ -90,6 +90,12 @@ sysctl/tunable.
 .Pp
 The
 .Nm
+runtime in a KASAN-configured kernel can be disabled by
+setting the loader tunable
+.Sy debug.kasan.disable=1 .
+.Pp
+The
+.Nm
 runtime works by maintaining a shadow map for the kernel map.
 There exists a linear mapping between addresses in the kernel map and addresses
 in the shadow map.
diff --git a/share/man/man9/kmsan.9 b/share/man/man9/kmsan.9
index ae9dbdc7a052..714442e4d9fe 100644
--- a/share/man/man9/kmsan.9
+++ b/share/man/man9/kmsan.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 10, 2021
+.Dd October 13, 2023
 .Dt KMSAN 9
 .Os
 .Sh NAME
@@ -108,6 +108,10 @@ should be used only for kernel testing and development.
 It is not recommended to enable
 .Nm
 in systems with less than 8GB of physical RAM.
+.Pp
+The sanitizer in a KMSAN-configured kernel can be disabled by setting the loader
+tunable
+.Sy debug.kmsan.disable=1 .
 .Sh FUNCTIONS
 The
 .Fn kmsan_mark
diff --git a/share/man/man9/pmap.9 b/share/man/man9/pmap.9
index 3f6a0f63c264..db27fe880afc 100644
--- a/share/man/man9/pmap.9
+++ b/share/man/man9/pmap.9
@@ -97,6 +97,7 @@ operation.
 .Xr pmap_init2 9 ,
 .Xr pmap_is_modified 9 ,
 .Xr pmap_is_prefaultable 9 ,
+.Xr pmap_kextract 9 ,
 .Xr pmap_map 9 ,
 .Xr pmap_mincore 9 ,
 .Xr pmap_object_init_pt 9 ,
diff --git a/share/man/man9/pmap_kextract.9 b/share/man/man9/pmap_kextract.9
new file mode 100644
index 000000000000..dd73446648f2
--- /dev/null
+++ b/share/man/man9/pmap_kextract.9
@@ -0,0 +1,65 @@
+.\"
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
+.\" Copyright (c) 2023 The FreeBSD Foundation
+.\"
+.\" This manual page was written by Mina Galić <FreeBSD@igalic.co> under
+.\" sponsorship from the FreeBSD Foundation.
+.\"
+.Dd August 24, 2023
+.Dt PMAP_KEXTRACT 9
+.Os
+.Sh NAME
+.Nm pmap_kextract ,
+.Nm vtophys
+.Nd extract a physical address from the kernel page table
+.Sh SYNOPSIS
+.In sys/param.h
+.In vm/vm.h
+.In vm/pmap.h
+.Ft vm_paddr_t
+.Fo pmap_kextract
+.Fa "vm_offset_t va"
+.Fc
+.Ft vm_paddr_t
+.Fo vtophys
+.Fa "vm_offset_t va"
+.Fc
+.Sh DESCRIPTION
+The
+.Fn pmap_kextract
+function retrieves the underlying physical memory address corresponding to the given kernel virtual address
+.Fa va .
+The value of
+.Fa va
+must correlate to an active mapping in the kernel address space.
+.Pp
+.Fn vtophys
+is an alias for
+.Fn pmap_kextract
+and behaves identically.
+.Sh RETURN VALUES
+The
+.Fn pmap_kextract
+function will return the physical address
+.Pq Vt vm_paddr_t
+associated with the kernel virtual address
+.Fa va .
+.Pp
+.Fn pmap_kextract
+generally does not fail.
+However, if supplied with an illegitimate value for
+.Fa va ,
+the function may return zero, an invalid non-zero value, or call
+.Xr panic 9 .
+.Sh SEE ALSO
+.Xr pmap 9 ,
+.Xr pmap_extract 9
+.Sh AUTHORS
+.An -nosplit
+This manual page was written by
+.An Mina Galić Aq Mt FreeBSD@igalic.co ,
+based on the
+.Xr pmap_extract 9
+page written by
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9
index 5ab045118f51..d4ffa050a893 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 26, 2020
+.Dd October 3, 2023
 .Dt SBUF 9
 .Os
 .Sh NAME
@@ -60,6 +60,8 @@
 .Nm sbuf_printf_drain ,
 .Nm sbuf_putbuf
 .Nd safe string composition
+.Sh LIBRARY
+.Lb libsbuf
 .Sh SYNOPSIS
 .In sys/types.h
 .In sys/sbuf.h
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index da3d8dc3b9b8..54f3298e8fdc 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -287,7 +287,7 @@ _DP_9p+=	casper cap_pwd cap_grp
 _DP_archive=	z bz2 lzma bsdxml zstd
 .endif
 _DP_avl=	spl
-_DP_bsddialog=	formw ncursesw tinfow
+_DP_bsddialog=	ncursesw tinfow
 _DP_zstd=	pthread
 .if ${MK_BLACKLIST} != "no"
 _DP_blacklist+=	pthread
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 501487d0eb1c..cc93911fbdf7 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -86,7 +86,6 @@ __DEFAULT_YES_OPTIONS = \
     CRYPT \
     CUSE \
     CXGBETOOL \
-    DIALOG \
     DICT \
     DMAGENT \
     DTRACE \
@@ -197,6 +196,7 @@ __DEFAULT_NO_OPTIONS = \
     BHYVE_SNAPSHOT \
     CLANG_EXTRAS \
     CLANG_FORMAT \
+    DIALOG \
     DETECT_TZ_CHANGES \
     DISK_IMAGE_TOOLS_BOOTSTRAP \
     DTRACE_ASAN \
@@ -473,10 +473,6 @@ MK_KERBEROS:=	no
 MK_KERBEROS_SUPPORT:=	no
 .endif
 
-.if ${MK_DIALOG} == "no"
-MK_BSDINSTALL:=	no
-.endif
-
 .if ${MK_DTRACE} == "no"
 MK_CTF:=	no
 .endif
diff --git a/share/vt/keymaps/colemak-dh.acc.kbd b/share/vt/keymaps/colemak-dh.acc.kbd
index 82c5faa2c6a6..b3f1b7d5ba83 100644
--- a/share/vt/keymaps/colemak-dh.acc.kbd
+++ b/share/vt/keymaps/colemak-dh.acc.kbd
@@ -1,5 +1,3 @@
-# $FreeBSD $
-#
 # Colemak Mod-DH (rev. 2) layout for FreeBSD console
 # 2006-01-01 Shai Coleman (http://colemak.com/),
 # 2014-10-27 Steve P (http://colemakmods.github.io/mod-dh/).
diff --git a/stand/kboot/arch/powerpc64/ldscript.powerpc b/stand/kboot/arch/powerpc64/ldscript.powerpc
index 662871eb7c09..f9fcc37f02d8 100644
--- a/stand/kboot/arch/powerpc64/ldscript.powerpc
+++ b/stand/kboot/arch/powerpc64/ldscript.powerpc
@@ -1,5 +1,3 @@
-/* $FreeBSD: user/nwhitehorn/kboot/powerpc/kboot/ldscript.powerpc 272888 2014-10-10 06:24:09Z bapt $ */
-
 OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd",
 	      "elf32-powerpc-freebsd")
 OUTPUT_ARCH(powerpc:common)
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c
index 3b21935255cb..0f9f987b6590 100644
--- a/sys/amd64/acpica/acpi_wakeup.c
+++ b/sys/amd64/acpica/acpi_wakeup.c
@@ -306,6 +306,7 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result,
 		amd64_syscall_ret_flush_l1d_recalc();
 		hw_ssb_recalculate(true);
 		x86_rngds_mitg_recalculate(true);
+		zenbleed_check_and_apply(true);
 
 		AcpiSetFirmwareWakingVector(0, 0);
 	} else {
diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c
index 11500a65e02b..a4978560c173 100644
--- a/sys/amd64/amd64/elf_machdep.c
+++ b/sys/amd64/amd64/elf_machdep.c
@@ -79,7 +79,8 @@ struct sysentvec elf64_freebsd_sysvec_la48 = {
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
 	.sv_flags	= SV_ABI_FREEBSD | SV_ASLR | SV_LP64 | SV_SHP |
-			    SV_TIMEKEEP | SV_RNG_SEED_VER | SV_DSO_SIG,
+			    SV_TIMEKEEP | SV_RNG_SEED_VER | SV_DSO_SIG |
+			    SV_SIGSYS,
 	.sv_set_syscall_retval = cpu_set_syscall_retval,
 	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
 	.sv_syscallnames = syscallnames,
@@ -120,7 +121,8 @@ struct sysentvec elf64_freebsd_sysvec_la57 = {
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
 	.sv_flags	= SV_ABI_FREEBSD | SV_ASLR | SV_LP64 | SV_SHP |
-			    SV_TIMEKEEP | SV_RNG_SEED_VER | SV_DSO_SIG,
+			    SV_TIMEKEEP | SV_RNG_SEED_VER | SV_DSO_SIG |
+			    SV_SIGSYS,
 	.sv_set_syscall_retval = cpu_set_syscall_retval,
 	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
 	.sv_syscallnames = syscallnames,
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index c5b84d035d91..3432e62bf7f8 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -142,9 +142,6 @@ xsaveopt64(char *addr, uint64_t mask)
 	    "memory");
 }
 
-#define	start_emulating()	load_cr0(rcr0() | CR0_TS)
-#define	stop_emulating()	clts()
-
 CTASSERT(sizeof(struct savefpu) == 512);
 CTASSERT(sizeof(struct xstate_hdr) == 64);
 CTASSERT(sizeof(struct savefpu_ymm) == 832);
@@ -263,7 +260,7 @@ fpususpend(void *addr)
 	u_long cr0;
 
 	cr0 = rcr0();
-	stop_emulating();
+	fpu_enable();
 	fpusave(addr);
 	load_cr0(cr0);
 }
@@ -274,7 +271,7 @@ fpuresume(void *addr)
 	u_long cr0;
 
 	cr0 = rcr0();
-	stop_emulating();
+	fpu_enable();
 	fninit();
 	if (use_xsave)
 		load_xcr(XCR0, xsave_mask);
@@ -393,13 +390,13 @@ fpuinit(void)
 	 * It is too early for critical_enter() to work on AP.
 	 */
 	saveintr = intr_disable();
-	stop_emulating();
+	fpu_enable();
 	fninit();
 	control = __INITIAL_FPUCW__;
 	fldcw(control);
 	mxcsr = __INITIAL_MXCSR__;
 	ldmxcsr(mxcsr);
-	start_emulating();
+	fpu_disable();
 	intr_restore(saveintr);
 	TSEXIT();
 }
@@ -430,7 +427,7 @@ fpuinitstate(void *arg __unused)
 	cpu_thread_alloc(&thread0);
 
 	saveintr = intr_disable();
-	stop_emulating();
+	fpu_enable();
 
 	fpusave_fxsave(fpu_initialstate);
 	if (fpu_initialstate->sv_env.en_mxcsr_mask)
@@ -473,7 +470,7 @@ fpuinitstate(void *arg __unused)
 		}
 	}
 
-	start_emulating();
+	fpu_disable();
 	intr_restore(saveintr);
 }
 /* EFIRT needs this to be initialized before we can enter our EFI environment */
@@ -488,9 +485,9 @@ fpuexit(struct thread *td)
 
 	critical_enter();
 	if (curthread == PCPU_GET(fpcurthread)) {
-		stop_emulating();
+		fpu_enable();
 		fpusave(curpcb->pcb_save);
-		start_emulating();
+		fpu_disable();
 		PCPU_SET(fpcurthread, NULL);
 	}
 	critical_exit();
@@ -741,7 +738,7 @@ restore_fpu_curthread(struct thread *td)
 	 */
 	PCPU_SET(fpcurthread, td);
 
-	stop_emulating();
+	fpu_enable();
 	fpu_clean_state();
 	pcb = td->td_pcb;
 
@@ -803,7 +800,7 @@ fpudna(void)
 		 * regardless of the eager/lazy FPU context switch
 		 * mode.
 		 */
-		stop_emulating();
+		fpu_enable();
 	} else {
 		if (__predict_false(PCPU_GET(fpcurthread) != NULL)) {
 			panic(
@@ -823,7 +820,7 @@ fpu_activate_sw(struct thread *td)
 
 	if ((td->td_pflags & TDP_KTHREAD) != 0 || !PCB_USER_FPU(td->td_pcb)) {
 		PCPU_SET(fpcurthread, NULL);
-		start_emulating();
+		fpu_disable();
 	} else if (PCPU_GET(fpcurthread) != td) {
 		restore_fpu_curthread(td);
 	}
@@ -839,7 +836,7 @@ fpudrop(void)
 	CRITICAL_ASSERT(td);
 	PCPU_SET(fpcurthread, NULL);
 	clear_pcb_flags(td->td_pcb, PCB_FPUINITDONE);
-	start_emulating();
+	fpu_disable();
 }
 
 /*
@@ -1139,7 +1136,7 @@ fpu_kern_enter(struct thread *td, struct fpu_kern_ctx *ctx, u_int flags)
 
 	if ((flags & FPU_KERN_NOCTX) != 0) {
 		critical_enter();
-		stop_emulating();
+		fpu_enable();
 		if (curthread == PCPU_GET(fpcurthread)) {
 			fpusave(curpcb->pcb_save);
 			PCPU_SET(fpcurthread, NULL);
@@ -1190,7 +1187,7 @@ fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx)
 		CRITICAL_ASSERT(td);
 
 		clear_pcb_flags(pcb,  PCB_FPUNOSAVE | PCB_FPUINITDONE);
-		start_emulating();
+		fpu_disable();
 	} else {
 		KASSERT((ctx->flags & FPU_KERN_CTX_INUSE) != 0,
 		    ("leaving not inuse ctx"));
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c
index a048c08fc9ae..c5266ffcc235 100644
--- a/sys/amd64/amd64/initcpu.c
+++ b/sys/amd64/amd64/initcpu.c
@@ -193,6 +193,9 @@ init_amd(void)
 			hw_lower_amd64_sharedpage = 1;
 		}
 	}
+
+	/* Zenbleed.  See the comments in 'cpu_machdep.c'. */
+	zenbleed_check_and_apply(false);
 }
 
 /*
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index f39678d1f4e5..440c21c918be 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -326,10 +326,6 @@ cpu_setregs(void)
 
 	TSENTER();
 	cr0 = rcr0();
-	/*
-	 * CR0_MP, CR0_NE and CR0_TS are also set by npx_probe() for the
-	 * BSP.  See the comments there about why we set them.
-	 */
 	cr0 |= CR0_MP | CR0_NE | CR0_TS | CR0_WP | CR0_AM;
 	TSENTER2("load_cr0");
 	load_cr0(cr0);
@@ -1495,6 +1491,10 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
 	TUNABLE_INT_FETCH("machdep.mitigations.rndgs.enable",
 	    &x86_rngds_mitg_enable);
 
+	TUNABLE_INT_FETCH("machdep.mitigations.zenbleed.enable",
+	    &zenbleed_enable);
+	zenbleed_sanitize_enable();
+
 	finishidentcpu();	/* Final stage of CPU initialization */
 
 	/*
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index ee0289c66e2a..3d3167c27356 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -3846,7 +3846,7 @@ pmap_flush_cache_phys_range(vm_paddr_t spa, vm_paddr_t epa, vm_memattr_t mattr)
  *		Extract the physical page address associated
  *		with the given map/virtual_address pair.
  */
-vm_paddr_t 
+vm_paddr_t
 pmap_extract(pmap_t pmap, vm_offset_t va)
 {
 	pdp_entry_t *pdpe;
@@ -3933,6 +3933,12 @@ pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot)
 	return (m);
 }
 
+/*
+ *	Routine:	pmap_kextract
+ *	Function:
+ *		Extract the physical page address associated with the given kernel
+ *		virtual address.
+ */
 vm_paddr_t
 pmap_kextract(vm_offset_t va)
 {
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 4d5887369207..8114105655f8 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -1032,10 +1032,10 @@ cpu_fetch_syscall_args_fallback(struct thread *td, struct syscall_args *sa)
 		regcnt--;
 	}
 
- 	if (sa->code >= p->p_sysent->sv_size)
- 		sa->callp = &p->p_sysent->sv_table[0];
-  	else
- 		sa->callp = &p->p_sysent->sv_table[sa->code];
+	if (sa->code >= p->p_sysent->sv_size)
+		sa->callp = &nosys_sysent;
+	else
+		sa->callp = &p->p_sysent->sv_table[sa->code];
 
 	KASSERT(sa->callp->sy_narg <= nitems(sa->args),
 	    ("Too many syscall arguments!"));
@@ -1045,7 +1045,7 @@ cpu_fetch_syscall_args_fallback(struct thread *td, struct syscall_args *sa)
 	if (sa->callp->sy_narg > regcnt) {
 		params = (caddr_t)frame->tf_rsp + sizeof(register_t);
 		error = copyin(params, &sa->args[regcnt],
-	    	    (sa->callp->sy_narg - regcnt) * sizeof(sa->args[0]));
+		    (sa->callp->sy_narg - regcnt) * sizeof(sa->args[0]));
 		if (__predict_false(error != 0))
 			return (error);
 	}
diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER
index b9cf11543245..590a3059beac 100644
--- a/sys/amd64/conf/FIRECRACKER
+++ b/sys/amd64/conf/FIRECRACKER
@@ -66,6 +66,7 @@ options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 8d513fdc5f4c..1c1fde99ba8e 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -67,6 +67,7 @@ options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index c3eca5221890..11f0d5d10c78 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -57,6 +57,7 @@ options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c
index 3fb905ab9e0a..c61587a93d1f 100644
--- a/sys/amd64/ia32/ia32_syscall.c
+++ b/sys/amd64/ia32/ia32_syscall.c
@@ -183,7 +183,7 @@ ia32_fetch_syscall_args(struct thread *td)
 		params += sizeof(quad_t);
 	}
  	if (sa->code >= p->p_sysent->sv_size)
- 		sa->callp = &p->p_sysent->sv_table[0];
+		sa->callp = &nosys_sysent;
   	else
  		sa->callp = &p->p_sysent->sv_table[sa->code];
 
diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h
index 4603835e15e6..918b9129f47b 100644
--- a/sys/amd64/linux/linux.h
+++ b/sys/amd64/linux/linux.h
@@ -188,34 +188,6 @@ typedef struct {
 #define	LINUX_MS_NOEXEC		0x0008
 #define	LINUX_MS_REMOUNT	0x0020
 
-/*
- * SystemV IPC defines
- */
-#define	LINUX_IPC_RMID		0
-#define	LINUX_IPC_SET		1
-#define	LINUX_IPC_STAT		2
-#define	LINUX_IPC_INFO		3
-
-#define	LINUX_SHM_LOCK		11
-#define	LINUX_SHM_UNLOCK	12
-#define	LINUX_SHM_STAT		13
-#define	LINUX_SHM_INFO		14
-
-#define	LINUX_SHM_RDONLY	0x1000
-#define	LINUX_SHM_RND		0x2000
-#define	LINUX_SHM_REMAP		0x4000
-
-/* semctl commands */
-#define	LINUX_GETPID		11
-#define	LINUX_GETVAL		12
-#define	LINUX_GETALL		13
-#define	LINUX_GETNCNT		14
-#define	LINUX_GETZCNT		15
-#define	LINUX_SETVAL		16
-#define	LINUX_SETALL		17
-#define	LINUX_SEM_STAT		18
-#define	LINUX_SEM_INFO		19
-
 union l_semun {
 	l_int		val;
 	l_uintptr_t	buf;
diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h
index 0759ce282499..e02e1e9e64eb 100644
--- a/sys/amd64/linux/linux_proto.h
+++ b/sys/amd64/linux/linux_proto.h
@@ -33,7 +33,6 @@ struct thread;
 #define	PADR_(t)	0
 #endif
 
-#define	nosys	linux_nosys
 struct linux_write_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
@@ -1438,7 +1437,6 @@ struct linux_fchmodat2_args {
 struct linux_map_shadow_stack_args {
 	syscallarg_t dummy;
 };
-#define	nosys	linux_nosys
 int	linux_write(struct thread *, struct linux_write_args *);
 int	linux_open(struct thread *, struct linux_open_args *);
 int	linux_newstat(struct thread *, struct linux_newstat_args *);
diff --git a/sys/amd64/linux/linux_syscall.h b/sys/amd64/linux/linux_syscall.h
index efd3413f91ce..3f1198399416 100644
--- a/sys/amd64/linux/linux_syscall.h
+++ b/sys/amd64/linux/linux_syscall.h
@@ -354,4 +354,4 @@
 #define	LINUX_SYS_linux_cachestat	451
 #define	LINUX_SYS_linux_fchmodat2	452
 #define	LINUX_SYS_linux_map_shadow_stack	453
-#define	LINUX_SYS_MAXSYSCALL	455
+#define	LINUX_SYS_MAXSYSCALL	454
diff --git a/sys/amd64/linux/linux_syscalls.c b/sys/amd64/linux/linux_syscalls.c
index 6851612ec749..eeec76f3f3b9 100644
--- a/sys/amd64/linux/linux_syscalls.c
+++ b/sys/amd64/linux/linux_syscalls.c
@@ -5,7 +5,6 @@
  */
 
 const char *linux_syscallnames[] = {
-#define	nosys	linux_nosys
 	"read",			/* 0 = read */
 	"linux_write",			/* 1 = linux_write */
 	"linux_open",			/* 2 = linux_open */
@@ -460,5 +459,4 @@ const char *linux_syscallnames[] = {
 	"linux_cachestat",			/* 451 = linux_cachestat */
 	"linux_fchmodat2",			/* 452 = linux_fchmodat2 */
 	"linux_map_shadow_stack",			/* 453 = linux_map_shadow_stack */
-	"#454",			/* 454 = nosys */
 };
diff --git a/sys/amd64/linux/linux_sysent.c b/sys/amd64/linux/linux_sysent.c
index ecb4ebb85b3a..e5a0ff377de5 100644
--- a/sys/amd64/linux/linux_sysent.c
+++ b/sys/amd64/linux/linux_sysent.c
@@ -7,7 +7,6 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <amd64/linux/linux.h>
 #include <amd64/linux/linux_proto.h>
 
@@ -15,7 +14,6 @@
 
 /* The casts are bogus but will do for now. */
 struct sysent linux_sysent[] = {
-#define	nosys	linux_nosys
 	{ .sy_narg = AS(read_args), .sy_call = (sy_call_t *)sys_read, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 0 = read */
 	{ .sy_narg = AS(linux_write_args), .sy_call = (sy_call_t *)linux_write, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 1 = linux_write */
 	{ .sy_narg = AS(linux_open_args), .sy_call = (sy_call_t *)linux_open, .sy_auevent = AUE_OPEN_RWTC, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 2 = linux_open */
@@ -470,5 +468,4 @@ struct sysent linux_sysent[] = {
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_cachestat, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 451 = linux_cachestat */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_fchmodat2, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 452 = linux_fchmodat2 */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_map_shadow_stack, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 453 = linux_map_shadow_stack */
-	{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT },			/* 454 = nosys */
 };
diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c
index 2b0cf1df7e40..8a350eeda6c0 100644
--- a/sys/amd64/linux/linux_systrace_args.c
+++ b/sys/amd64/linux/linux_systrace_args.c
@@ -11,7 +11,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	int64_t *iarg = (int64_t *)uarg;
 	int a = 0;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* read */
 	case 0: {
 		struct read_args *p = params;
@@ -2816,7 +2815,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 {
 	const char *p = NULL;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* read */
 	case 0:
 		switch (ndx) {
@@ -7280,7 +7278,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 {
 	const char *p = NULL;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* read */
 	case 0:
 		if (ndx == 0 || ndx == 1)
diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c
index 81bdd2cb1da8..f7b638fa82d0 100644
--- a/sys/amd64/linux/linux_sysvec.c
+++ b/sys/amd64/linux/linux_sysvec.c
@@ -65,7 +65,6 @@
 #include <compat/linux/linux_mib.h>
 #include <compat/linux/linux_misc.h>
 #include <compat/linux/linux_signal.h>
-#include <compat/linux/linux_sysproto.h>
 #include <compat/linux/linux_util.h>
 #include <compat/linux/linux_vdso.h>
 
@@ -157,7 +156,7 @@ linux_fetch_syscall_args(struct thread *td)
 
 	if (sa->code >= p->p_sysent->sv_size)
 		/* nosys */
-		sa->callp = &p->p_sysent->sv_table[p->p_sysent->sv_size - 1];
+		sa->callp = &nosys_sysent;
 	else
 		sa->callp = &p->p_sysent->sv_table[sa->code];
 
diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master
index 437066d1655b..8e12a539b87f 100644
--- a/sys/amd64/linux/syscalls.master
+++ b/sys/amd64/linux/syscalls.master
@@ -32,13 +32,9 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <amd64/linux/linux.h>
 #include <amd64/linux/linux_proto.h>
 
-; Isn't pretty, but there seems to be no other way to trap nosys
-#define	nosys	linux_nosys
-
 0	AUE_NULL	NOPROTO {
 		int read(
 		    int fd,
@@ -2191,6 +2187,5 @@
 453	AUE_NULL		STD {
 		int linux_map_shadow_stack(void);
 	}
-; please, keep this line at the end.
-454	AUE_NULL        UNIMPL  nosys
+
 ; vim: syntax=off
diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index ae52fb81c560..8da298847a43 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -33,7 +33,6 @@ struct thread;
 #define	PADR_(t)	0
 #endif
 
-#define	nosys	linux_nosys
 struct linux_exit_args {
 	char rval_l_[PADL_(int)]; int rval; char rval_r_[PADR_(int)];
 };
@@ -1736,7 +1735,6 @@ struct linux_cachestat_args {
 struct linux_fchmodat2_args {
 	syscallarg_t dummy;
 };
-#define	nosys	linux_nosys
 int	linux_exit(struct thread *, struct linux_exit_args *);
 int	linux_fork(struct thread *, struct linux_fork_args *);
 int	linux_write(struct thread *, struct linux_write_args *);
diff --git a/sys/amd64/linux32/linux32_syscall.h b/sys/amd64/linux32/linux32_syscall.h
index b6d74578cdfd..c7a2e79842af 100644
--- a/sys/amd64/linux32/linux32_syscall.h
+++ b/sys/amd64/linux32/linux32_syscall.h
@@ -413,4 +413,4 @@
 #define	LINUX32_SYS_linux_set_mempolicy_home_node	450
 #define	LINUX32_SYS_linux_cachestat	451
 #define	LINUX32_SYS_linux_fchmodat2	452
-#define	LINUX32_SYS_MAXSYSCALL	454
+#define	LINUX32_SYS_MAXSYSCALL	453
diff --git a/sys/amd64/linux32/linux32_syscalls.c b/sys/amd64/linux32/linux32_syscalls.c
index 3f1e0425e224..3308ffeb7712 100644
--- a/sys/amd64/linux32/linux32_syscalls.c
+++ b/sys/amd64/linux32/linux32_syscalls.c
@@ -5,7 +5,6 @@
  */
 
 const char *linux32_syscallnames[] = {
-#define	nosys	linux_nosys
 	"#0",			/* 0 = setup */
 	"linux_exit",			/* 1 = linux_exit */
 	"linux_fork",			/* 2 = linux_fork */
@@ -459,5 +458,4 @@ const char *linux32_syscallnames[] = {
 	"linux_set_mempolicy_home_node",			/* 450 = linux_set_mempolicy_home_node */
 	"linux_cachestat",			/* 451 = linux_cachestat */
 	"linux_fchmodat2",			/* 452 = linux_fchmodat2 */
-	"#453",			/* 453 = nosys */
 };
diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c
index c1656a124026..024bca613c11 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -7,7 +7,6 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <compat/freebsd32/freebsd32_util.h>
 #include <amd64/linux32/linux.h>
 #include <amd64/linux32/linux32_proto.h>
@@ -16,7 +15,6 @@
 
 /* The casts are bogus but will do for now. */
 struct sysent linux32_sysent[] = {
-#define	nosys	linux_nosys
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT },			/* 0 = setup */
 	{ .sy_narg = AS(linux_exit_args), .sy_call = (sy_call_t *)linux_exit, .sy_auevent = AUE_EXIT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 1 = linux_exit */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_fork, .sy_auevent = AUE_FORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 2 = linux_fork */
@@ -470,5 +468,4 @@ struct sysent linux32_sysent[] = {
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_set_mempolicy_home_node, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 450 = linux_set_mempolicy_home_node */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_cachestat, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 451 = linux_cachestat */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_fchmodat2, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 452 = linux_fchmodat2 */
-	{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT },			/* 453 = nosys */
 };
diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c
index 29940f4ed8a3..994f80b92d81 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -11,7 +11,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	int64_t *iarg = (int64_t *)uarg;
 	int a = 0;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* linux_exit */
 	case 1: {
 		struct linux_exit_args *p = params;
@@ -3325,7 +3324,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 {
 	const char *p = NULL;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* linux_exit */
 	case 1:
 		switch (ndx) {
@@ -8651,7 +8649,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 {
 	const char *p = NULL;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* linux_exit */
 	case 1:
 		if (ndx == 0 || ndx == 1)
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index a78bfe86f432..6cc28610cf3c 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -523,13 +523,13 @@ linux32_fetch_syscall_args(struct thread *td)
 	sa->args[2] = frame->tf_rdx;
 	sa->args[3] = frame->tf_rsi;
 	sa->args[4] = frame->tf_rdi;
-	sa->args[5] = frame->tf_rbp;	/* Unconfirmed */
+	sa->args[5] = frame->tf_rbp;
 	sa->code = frame->tf_rax;
 	sa->original_code = sa->code;
 
 	if (sa->code >= p->p_sysent->sv_size)
 		/* nosys */
-		sa->callp = &p->p_sysent->sv_table[p->p_sysent->sv_size - 1];
+		sa->callp = &nosys_sysent;
 	else
 		sa->callp = &p->p_sysent->sv_table[sa->code];
 
diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master
index 32ed678fe0c6..7d796df1aed3 100644
--- a/sys/amd64/linux32/syscalls.master
+++ b/sys/amd64/linux32/syscalls.master
@@ -32,14 +32,10 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <compat/freebsd32/freebsd32_util.h>
 #include <amd64/linux32/linux.h>
 #include <amd64/linux32/linux32_proto.h>
 
-; Isn't pretty, but there seems to be no other way to trap nosys
-#define	nosys	linux_nosys
-
 0	AUE_NULL	UNIMPL	setup
 1	AUE_EXIT	STD {
 		void linux_exit(
@@ -2616,6 +2612,5 @@
 452	AUE_NULL		STD {
 		int linux_fchmodat2(void);
 	}
- ; please, keep this line at the end.
-453	AUE_NULL        UNIMPL  nosys
+
  ; vim: syntax=off
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index aacc70079241..c1d41cb27103 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -256,9 +256,6 @@ DEFINE_VMMOPS_IFUNC(int, vcpu_snapshot, (void *vcpui,
 DEFINE_VMMOPS_IFUNC(int, restore_tsc, (void *vcpui, uint64_t now))
 #endif
 
-#define	fpu_start_emulating()	load_cr0(rcr0() | CR0_TS)
-#define	fpu_stop_emulating()	clts()
-
 SDT_PROVIDER_DEFINE(vmm);
 
 static MALLOC_DEFINE(M_VM, "vm", "vm");
@@ -1291,7 +1288,7 @@ restore_guest_fpustate(struct vcpu *vcpu)
 	fpuexit(curthread);
 
 	/* restore guest FPU state */
-	fpu_stop_emulating();
+	fpu_enable();
 	fpurestore(vcpu->guestfpu);
 
 	/* restore guest XCR0 if XSAVE is enabled in the host */
@@ -1299,10 +1296,10 @@ restore_guest_fpustate(struct vcpu *vcpu)
 		load_xcr(0, vcpu->guest_xcr0);
 
 	/*
-	 * The FPU is now "dirty" with the guest's state so turn on emulation
-	 * to trap any access to the FPU by the host.
+	 * The FPU is now "dirty" with the guest's state so disable
+	 * the FPU to trap any access by the host.
 	 */
-	fpu_start_emulating();
+	fpu_disable();
 }
 
 static void
@@ -1319,9 +1316,9 @@ save_guest_fpustate(struct vcpu *vcpu)
 	}
 
 	/* save guest FPU state */
-	fpu_stop_emulating();
+	fpu_enable();
 	fpusave(vcpu->guestfpu);
-	fpu_start_emulating();
+	fpu_disable();
 }
 
 static VMM_STAT(VCPU_IDLE_TICKS, "number of ticks vcpu was idle");
diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner
index b5197809380d..a136b2e050ac 100644
--- a/sys/arm/allwinner/files.allwinner
+++ b/sys/arm/allwinner/files.allwinner
@@ -5,7 +5,6 @@ arm/allwinner/a10_dmac.c		optional	a10_dmac
 arm/allwinner/a31_dmac.c		optional	a31_dmac
 arm/allwinner/a10_sramc.c		optional	SOC_ALLWINNER_A10
 arm/allwinner/aw_gpio.c			optional	gpio
-arm/allwinner/aw_if_dwc.c		optional	dwc
 arm/allwinner/aw_machdep.c		standard
 arm/allwinner/aw_mmc.c			optional	mmc | mmccam
 arm/allwinner/aw_mp.c			optional	smp
@@ -22,7 +21,8 @@ arm/allwinner/axp81x.c			optional	axp81x
 arm/allwinner/if_awg.c			optional	awg syscon
 arm/allwinner/if_emac.c			optional	emac
 arm/allwinner/sunxi_dma_if.m		optional	a10_dmac | a31_dmac
-dev/iicbus/twsi/a10_twsi.c		optional	twsi
+dev/dwc/if_dwc_aw.c			optional	dwc
+dev/iicbus/controller/twsi/a10_twsi.c	optional	twsi
 dev/usb/controller/generic_ohci.c	optional	ohci
 dev/usb/controller/generic_usb_if.m	optional	ohci
 dev/usb/controller/generic_ehci.c	optional	ehci
diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c
index 3d54fe932109..5bfc32b45b48 100644
--- a/sys/arm/arm/elf_machdep.c
+++ b/sys/arm/arm/elf_machdep.c
@@ -86,7 +86,7 @@ struct sysentvec elf32_freebsd_sysvec = {
 	.sv_maxssiz	= NULL,
 	.sv_flags	=
 			  SV_ASLR | SV_SHP | SV_TIMEKEEP | SV_RNG_SEED_VER |
-			  SV_ABI_FREEBSD | SV_ILP32,
+			  SV_ABI_FREEBSD | SV_ILP32 | SV_SIGSYS,
 	.sv_set_syscall_retval = cpu_set_syscall_retval,
 	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
 	.sv_syscallnames = syscallnames,
diff --git a/sys/arm/arm/syscall.c b/sys/arm/arm/syscall.c
index 57644c023646..c440f501e834 100644
--- a/sys/arm/arm/syscall.c
+++ b/sys/arm/arm/syscall.c
@@ -118,7 +118,7 @@ cpu_fetch_syscall_args(struct thread *td)
 	}
 	p = td->td_proc;
 	if (sa->code >= p->p_sysent->sv_size)
-		sa->callp = &p->p_sysent->sv_table[0];
+		sa->callp = &nosys_sysent;
 	else
 		sa->callp = &p->p_sysent->sv_table[sa->code];
 	error = 0;
diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6
index f60520d7dd2a..b4b83d66809a 100644
--- a/sys/arm/conf/std.armv6
+++ b/sys/arm/conf/std.armv6
@@ -51,6 +51,7 @@ options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 
 # DTrace support
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7
index 5c1e63af1bad..80b4e898bfdc 100644
--- a/sys/arm/conf/std.armv7
+++ b/sys/arm/conf/std.armv7
@@ -51,6 +51,7 @@ options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 
 # DTrace support
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
diff --git a/sys/arm/mv/files.arm7 b/sys/arm/mv/files.arm7
index 3eb18739532a..791046161151 100644
--- a/sys/arm/mv/files.arm7
+++ b/sys/arm/mv/files.arm7
@@ -22,7 +22,7 @@ arm/mv/rtc.c			standard
 arm/mv/armadaxp/armadaxp_mp.c	optional	smp
 arm/mv/armadaxp/mptramp.S	optional	smp
 dev/cesa/cesa.c			optional	cesa
-dev/iicbus/twsi/mv_twsi.c	optional	twsi
+dev/iicbus/controller/twsi/mv_twsi.c	optional	twsi
 dev/mge/if_mge.c		optional	mge
 dev/neta/if_mvneta_fdt.c	optional	neta fdt
 dev/neta/if_mvneta.c		optional	neta mdio mii
diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx
index 4dc9a4df908c..0f2774fd76cc 100644
--- a/sys/arm/rockchip/files.rk32xx
+++ b/sys/arm/rockchip/files.rk32xx
@@ -2,7 +2,6 @@ kern/kern_clocksource.c			standard
 
 arm/rockchip/rk32xx_machdep.c		standard
 arm/rockchip/rk32xx_mp.c		optional	smp
-arm64/rockchip/if_dwc_rk.c		standard
 arm64/rockchip/rk_i2c.c			standard
 arm64/rockchip/rk_iodomain.c		standard
 arm64/rockchip/rk_gpio.c		standard
@@ -22,6 +21,7 @@ arm64/rockchip/clk/rk_clk_pll.c		standard
 arm64/rockchip/clk/rk_cru.c		standard
 arm64/rockchip/clk/rk3288_cru.c		standard
 
+dev/dwc/if_dwc_rk.c			standard
 dev/iicbus/pmic/act8846.c		standard
 dev/iicbus/pmic/act8846_regulator.c	standard
 dev/iicbus/pmic/fan53555.c		standard
diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c
index 9089cd4734a6..5e5135a1d8cd 100644
--- a/sys/arm64/arm64/elf32_machdep.c
+++ b/sys/arm64/arm64/elf32_machdep.c
@@ -104,7 +104,7 @@ static struct sysentvec elf32_freebsd_sysvec = {
 	.sv_fixlimit	= NULL, // XXX
 	.sv_maxssiz	= NULL,
 	.sv_flags	= SV_ABI_FREEBSD | SV_ILP32 | SV_SHP | SV_TIMEKEEP |
-	    SV_RNG_SEED_VER,
+	    SV_RNG_SEED_VER | SV_SIGSYS,
 	.sv_set_syscall_retval = freebsd32_set_syscall_retval,
 	.sv_fetch_syscall_args = freebsd32_fetch_syscall_args,
 	.sv_syscallnames = freebsd32_syscallnames,
@@ -190,7 +190,7 @@ freebsd32_fetch_syscall_args(struct thread *td)
 	}
 
 	if (sa->code >= p->p_sysent->sv_size)
-		sa->callp = &p->p_sysent->sv_table[0];
+		sa->callp = &nosys_sysent;
 	else
 		sa->callp = &p->p_sysent->sv_table[sa->code];
 
diff --git a/sys/arm64/arm64/elf_machdep.c b/sys/arm64/arm64/elf_machdep.c
index 12fb26d29ae7..d1905a6d5948 100644
--- a/sys/arm64/arm64/elf_machdep.c
+++ b/sys/arm64/arm64/elf_machdep.c
@@ -105,7 +105,7 @@ static struct sysentvec elf64_freebsd_sysvec = {
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
 	.sv_flags	= SV_SHP | SV_TIMEKEEP | SV_ABI_FREEBSD | SV_LP64 |
-	    SV_RNG_SEED_VER |
+	    SV_RNG_SEED_VER | SV_SIGSYS |
 #if __has_feature(capabilities)
 	    SV_CHERI,
 #else
diff --git a/sys/arm64/arm64/freebsd64_machdep.c b/sys/arm64/arm64/freebsd64_machdep.c
index c0601ce090d5..a546226712b4 100644
--- a/sys/arm64/arm64/freebsd64_machdep.c
+++ b/sys/arm64/arm64/freebsd64_machdep.c
@@ -106,7 +106,7 @@ struct sysentvec elf_freebsd_freebsd64_sysvec = {
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
 	.sv_flags	= SV_SHP | SV_TIMEKEEP | SV_ABI_FREEBSD | SV_LP64 |
-	    SV_ASLR | SV_RNG_SEED_VER,
+	    SV_ASLR | SV_RNG_SEED_VER | SV_SIGSYS,
 	.sv_set_syscall_retval = cpu_set_syscall_retval,
 	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
 	.sv_syscallnames = freebsd64_syscallnames,
diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c
index b813606b68cf..fc8f8947dd15 100644
--- a/sys/arm64/arm64/gicv3_its.c
+++ b/sys/arm64/arm64/gicv3_its.c
@@ -1269,7 +1269,7 @@ static bool
 its_device_alloc(struct gicv3_its_softc *sc, int devid)
 {
 	struct its_ptable *ptable;
-	vm_offset_t l2_table;
+	vm_pointer_t l2_table;
 	uint64_t *table;
 	uint32_t index;
 	bool shareable;
@@ -1324,17 +1324,17 @@ its_device_alloc(struct gicv3_its_softc *sc, int devid)
 	if ((ptable->ptab_share & GITS_BASER_SHARE_MASK) == GITS_BASER_SHARE_NS)
 		shareable = false;
 
-	l2_table = (vm_offset_t)contigmalloc_domainset(ptable->ptab_l2_size,
+	l2_table = (vm_pointer_t)contigmalloc_domainset(ptable->ptab_l2_size,
 	    M_GICV3_ITS, sc->sc_ds, M_WAITOK | M_ZERO, 0, (1ul << 48) - 1,
 	    ptable->ptab_page_size, 0);
 
 	if (!shareable)
-		cpu_dcache_wb_range((vm_offset_t)l2_table,
+		cpu_dcache_wb_range(l2_table,
 		    ptable->ptab_l2_size);
 
 	table[index] = vtophys(l2_table) | GITS_BASER_VALID;
 	if (!shareable)
-		cpu_dcache_wb_range((vm_offset_t)&table[index],
+		cpu_dcache_wb_range((vm_pointer_t)&table[index],
 		    sizeof(table[index]));
 
 	dsb(sy);
diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index 38438478f7fe..9fc47727b264 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -194,11 +194,11 @@
 #endif
 .endmacro
 
-ENTRY(_start)
 #ifdef __CHERI_PURE_CAPABILITY__
 	.arch_extension noc64
 	.arch_extension a64c
 #endif
+ENTRY(_start)
 
 	/*
 	 * Drop to EL1
@@ -254,6 +254,8 @@ ENTRY(_start)
 	enter_kern_vaddr 15, 7, 8, virtdone
 
 virtdone:
+	BTI_J
+
 	/* Set up the stack */
 	mov	x7, #(PAGE_SIZE * KSTACK_PAGES)
 	buildptr 25, initstack, x7
@@ -374,11 +376,11 @@ END(_start)
  * Called by a core when it is being brought online.
  * The data in x0 is passed straight to init_secondary.
  */
-ENTRY(mpentry)
 #ifdef __CHERI_PURE_CAPABILITY__
 	.arch_extension noc64
 	.arch_extension a64c
 #endif
+ENTRY(mpentry)
 	/* Disable interrupts */
 	msr	daifset, #DAIF_INTR
 
@@ -409,6 +411,8 @@ ENTRY(mpentry)
 	enter_kern_vaddr 15, 7, 8, mp_virtdone
 
 mp_virtdone:
+	BTI_J
+
 	/* Start using the AP boot stack */
 	LDR_LABEL(PTR(4), PTR(4), bootstack)
 	mov	PTRN(sp), PTR(4)
@@ -439,11 +443,11 @@ END(mpentry)
  * If we are started in EL2, configure the required hypervisor
  * registers and drop to EL1.
  */
-LENTRY(drop_to_el1)
 #ifdef __CHERI_PURE_CAPABILITY__
 	.arch_extension noc64
 	.arch_extension a64c
 #endif
+LENTRY(drop_to_el1)
 	mrs	x23, CurrentEL
 	lsr	x23, x23, #2
 	cmp	x23, #0x2
@@ -561,14 +565,14 @@ LENTRY(drop_to_el1)
 	isb
 
 	eret
-#ifdef __CHERI_PURE_CAPABILITY__
-	.arch_extension c64
-#endif
 
 	.align 3
 .Lsctlr_res1:
 	.quad SCTLR_RES1
 LEND(drop_to_el1)
+#ifdef __CHERI_PURE_CAPABILITY__
+	.arch_extension c64
+#endif
 
 /*
  * Get the delta between the physical address we were loaded to and the
diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
index 0941a9acc31f..0ff44bb8e78d 100644
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -26,6 +26,7 @@
  */
 
 #include "opt_acpi.h"
+#include "opt_kstack_pages.h"
 #include "opt_platform.h"
 #include "opt_ddb.h"
 
@@ -404,7 +405,7 @@ init_proc0(vm_pointer_t kstack)
 	/* XXX-AM: We need to set bounds on pcb and kstack here as in MIPS */
 	proc_linkup0(&proc0, &thread0);
 	thread0.td_kstack = cheri_kern_andperm(kstack, CHERI_PERMS_KERNEL_DATA);
-	thread0.td_kstack_pages = kstack_pages;
+	thread0.td_kstack_pages = KSTACK_PAGES;
 #if defined(PERTHREAD_SSP)
 	thread0.td_md.md_canary = boot_canary;
 #endif
@@ -1079,6 +1080,10 @@ initarm(struct arm64_bootparams *abp)
 
 	early_boot = 0;
 
+	if (bootverbose && kstack_pages != KSTACK_PAGES)
+		printf("kern.kstack_pages = %d ignored for thread0\n",
+		    kstack_pages);
+
 	TSEXIT();
 }
 
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index 26e622289f64..dc99ae4abdcf 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -2110,6 +2110,12 @@ pmap_klookup(vm_offset_t va, vm_paddr_t *pa)
 	return (true);
 }
 
+/*
+ *	Routine:	pmap_kextract
+ *	Function:
+ *		Extract the physical page address associated with the given kernel
+ *		virtual address.
+ */
 vm_paddr_t
 pmap_kextract(vm_offset_t va)
 {
@@ -4997,6 +5003,7 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags,
 	struct spglist free;
 	pd_entry_t *l2, old_l2;
 	vm_page_t l2pg, mt;
+	vm_page_t uwptpg;
 
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 	KASSERT(ADDR_IS_CANONICAL(va),
@@ -5064,6 +5071,24 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags,
 		}
 	}
 
+	/*
+	 * Allocate leaf ptpage for wired userspace pages.
+	 */
+	uwptpg = NULL;
+	if ((new_l2 & ATTR_SW_WIRED) != 0 && pmap != kernel_pmap) {
+		uwptpg = vm_page_alloc_noobj(VM_ALLOC_WIRED);
+		if (uwptpg == NULL) {
+			return (KERN_RESOURCE_SHORTAGE);
+		}
+		uwptpg->pindex = pmap_l2_pindex(va);
+		if (pmap_insert_pt_page(pmap, uwptpg, true, false)) {
+			vm_page_unwire_noq(uwptpg);
+			vm_page_free(uwptpg);
+			return (KERN_RESOURCE_SHORTAGE);
+		}
+		pmap_resident_count_inc(pmap, 1);
+		uwptpg->ref_count = NL3PG;
+	}
 	if ((new_l2 & ATTR_SW_MANAGED) != 0) {
 		/*
 		 * Abort this mapping if its PV entry could not be created.
@@ -5071,6 +5096,16 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags,
 		if (!pmap_pv_insert_l2(pmap, va, new_l2, flags, lockp)) {
 			if (l2pg != NULL)
 				pmap_abort_ptp(pmap, va, l2pg);
+			if (uwptpg != NULL) {
+				mt = pmap_remove_pt_page(pmap, va);
+				KASSERT(mt == uwptpg,
+				    ("removed pt page %p, expected %p", mt,
+				    uwptpg));
+				pmap_resident_count_dec(pmap, 1);
+				uwptpg->ref_count = 1;
+				vm_page_unwire_noq(uwptpg);
+				vm_page_free(uwptpg);
+			}
 			CTR2(KTR_PMAP,
 			    "pmap_enter_l2: failure for va %#lx in pmap %p",
 			    va, pmap);
diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c
index 688b998aca34..6c5afd031bd4 100644
--- a/sys/arm64/arm64/trap.c
+++ b/sys/arm64/arm64/trap.c
@@ -191,7 +191,7 @@ cpu_fetch_syscall_args(struct thread *td)
 	}
 
 	if (__predict_false(sa->code >= p->p_sysent->sv_size))
-		sa->callp = &p->p_sysent->sv_table[0];
+		sa->callp = &nosys_sysent;
 	else
 		sa->callp = &p->p_sysent->sv_table[sa->code];
 
diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64
index 1e64e287e1b0..f12ccb3383b0 100644
--- a/sys/arm64/conf/std.arm64
+++ b/sys/arm64/conf/std.arm64
@@ -43,6 +43,7 @@ options 	COMPAT_FREEBSD32	# Compatible with FreeBSD/arm
 options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
diff --git a/sys/arm64/conf/std.xilinx b/sys/arm64/conf/std.xilinx
index cc89e8575336..50ebf5ade53b 100644
--- a/sys/arm64/conf/std.xilinx
+++ b/sys/arm64/conf/std.xilinx
@@ -16,4 +16,7 @@ device		cgem			# Cadence GEM Gigabit Ethernet device
 # MMC/SD/SDIO Card slot support
 device		sdhci
 
+# IICBUS
+device		cdnc_i2c
+
 options 	FDT
diff --git a/sys/arm64/include/asm.h b/sys/arm64/include/asm.h
index 9dc98505037e..c882f69b3ac7 100644
--- a/sys/arm64/include/asm.h
+++ b/sys/arm64/include/asm.h
@@ -48,7 +48,7 @@
 
 #define	LENTRY(sym)						\
 	.text; .align 2; .type sym,#function; sym:		\
-	.cfi_startproc; DTRACE_NOP
+	.cfi_startproc; BTI_C; DTRACE_NOP
 #define	ENTRY(sym)						\
 	.globl sym; LENTRY(sym)
 #define	EENTRY(sym)						\
@@ -182,6 +182,34 @@
 	dsb	sy;							\
 	isb
 
+/*
+ * When a CPU that implements FEAT_BTI uses a BR/BLR instruction (or the
+ * pointer authentication variants, e.g. BLRAA) and the target location
+ * has the GP attribute in its page table, then the target of the BR/BLR
+ * needs to be a valid BTI landing pad.
+ *
+ * BTI_C should be used at the start of a function and is used in the
+ * ENTRY macro. It can be replaced by PACIASP or PACIBSP, however these
+ * also need an appropriate authenticate instruction before returning.
+ *
+ * BTI_J should be used as the target instruction when branching with a
+ * BR instruction within a function.
+ *
+ * When using a BR to branch to a new function, e.g. a tail call, then
+ * the target register should be x16 or x17 so it is compatible with
+ * the BRI_C instruction.
+ *
+ * As these instructions are in the hint space they are a NOP when
+ * the CPU doesn't implement FEAT_BTI so are safe to use.
+ */
+#ifdef __ARM_FEATURE_BTI_DEFAULT
+#define	BTI_C	hint	#34
+#define	BTI_J	hint	#36
+#else
+#define	BTI_C
+#define	BTI_J
+#endif
+
 #endif /* _MACHINE_ASM_H_ */
 
 #endif /* !__arm__ */
diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h
index d002ad5a824f..c42de57d77c5 100644
--- a/sys/arm64/linux/linux_proto.h
+++ b/sys/arm64/linux/linux_proto.h
@@ -33,7 +33,6 @@ struct thread;
 #define	PADR_(t)	0
 #endif
 
-#define	nosys	linux_nosys
 struct linux_setxattr_args {
 	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
 	char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
@@ -1245,7 +1244,6 @@ struct linux_cachestat_args {
 struct linux_fchmodat2_args {
 	syscallarg_t dummy;
 };
-#define	nosys	linux_nosys
 int	linux_setxattr(struct thread *, struct linux_setxattr_args *);
 int	linux_lsetxattr(struct thread *, struct linux_lsetxattr_args *);
 int	linux_fsetxattr(struct thread *, struct linux_fsetxattr_args *);
diff --git a/sys/arm64/linux/linux_syscall.h b/sys/arm64/linux/linux_syscall.h
index c45f3ded47a2..5ddc0608aff8 100644
--- a/sys/arm64/linux/linux_syscall.h
+++ b/sys/arm64/linux/linux_syscall.h
@@ -301,4 +301,4 @@
 #define	LINUX_SYS_linux_set_mempolicy_home_node	450
 #define	LINUX_SYS_linux_cachestat	451
 #define	LINUX_SYS_linux_fchmodat2	452
-#define	LINUX_SYS_MAXSYSCALL	454
+#define	LINUX_SYS_MAXSYSCALL	453
diff --git a/sys/arm64/linux/linux_syscalls.c b/sys/arm64/linux/linux_syscalls.c
index 81fed4cc0227..c26519dc0a52 100644
--- a/sys/arm64/linux/linux_syscalls.c
+++ b/sys/arm64/linux/linux_syscalls.c
@@ -5,7 +5,6 @@
  */
 
 const char *linux_syscallnames[] = {
-#define	nosys	linux_nosys
 	"#0",			/* 0 = linux_io_setup */
 	"#1",			/* 1 = linux_io_destroy */
 	"#2",			/* 2 = linux_io_submit */
@@ -459,5 +458,4 @@ const char *linux_syscallnames[] = {
 	"linux_set_mempolicy_home_node",			/* 450 = linux_set_mempolicy_home_node */
 	"linux_cachestat",			/* 451 = linux_cachestat */
 	"linux_fchmodat2",			/* 452 = linux_fchmodat2 */
-	"#453",			/* 453 = nosys */
 };
diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c
index c0b495482040..ac93f9bb3a54 100644
--- a/sys/arm64/linux/linux_sysent.c
+++ b/sys/arm64/linux/linux_sysent.c
@@ -7,7 +7,6 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <arm64/linux/linux.h>
 #include <arm64/linux/linux_proto.h>
 
@@ -15,7 +14,6 @@
 
 /* The casts are bogus but will do for now. */
 struct sysent linux_sysent[] = {
-#define	nosys	linux_nosys
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT },			/* 0 = linux_io_setup */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT },			/* 1 = linux_io_destroy */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT },			/* 2 = linux_io_submit */
@@ -469,5 +467,4 @@ struct sysent linux_sysent[] = {
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_set_mempolicy_home_node, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 450 = linux_set_mempolicy_home_node */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_cachestat, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 451 = linux_cachestat */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_fchmodat2, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 452 = linux_fchmodat2 */
-	{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT },			/* 453 = nosys */
 };
diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c
index ff58a287ee88..151d46238d1c 100644
--- a/sys/arm64/linux/linux_systrace_args.c
+++ b/sys/arm64/linux/linux_systrace_args.c
@@ -11,7 +11,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	int64_t *iarg = (int64_t *)uarg;
 	int a = 0;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* linux_setxattr */
 	case 5: {
 		struct linux_setxattr_args *p = params;
@@ -2433,7 +2432,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 {
 	const char *p = NULL;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* linux_setxattr */
 	case 5:
 		switch (ndx) {
@@ -6347,7 +6345,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 {
 	const char *p = NULL;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* linux_setxattr */
 	case 5:
 		if (ndx == 0 || ndx == 1)
diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c
index 42fb477ffa49..ca50c4eb1dff 100644
--- a/sys/arm64/linux/linux_sysvec.c
+++ b/sys/arm64/linux/linux_sysvec.c
@@ -119,9 +119,9 @@ linux_fetch_syscall_args(struct thread *td)
 
 	sa->code = td->td_frame->tf_x[8];
 	sa->original_code = sa->code;
-	/* LINUXTODO: generic syscall? */
+
 	if (sa->code >= p->p_sysent->sv_size)
-		sa->callp = &p->p_sysent->sv_table[0];
+		sa->callp = &nosys_sysent;
 	else
 		sa->callp = &p->p_sysent->sv_table[sa->code];
 
diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master
index 9ba548359c46..61c7499d57b3 100644
--- a/sys/arm64/linux/syscalls.master
+++ b/sys/arm64/linux/syscalls.master
@@ -9,13 +9,9 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <arm64/linux/linux.h>
 #include <arm64/linux/linux_proto.h>
 
-; Isn't pretty, but there seems to be no other way to trap nosys
-#define	nosys	linux_nosys
-
 0	AUE_NULL	UNIMPL	linux_io_setup
 1	AUE_NULL	UNIMPL	linux_io_destroy
 2	AUE_NULL	UNIMPL	linux_io_submit
@@ -1865,6 +1861,5 @@
 452	AUE_NULL		STD {
 		int linux_fchmodat2(void);
 	}
- ; please, keep this line at the end.
-453	AUE_NULL        UNIMPL  nosys
+
  ; vim: syntax=off
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 985547b7ce20..0e42403d74a6 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -9406,7 +9406,8 @@ sysctl_scsi_delay(SYSCTL_HANDLER_ARGS)
 	return (set_scsi_delay(delay));
 }
 SYSCTL_PROC(_kern_cam, OID_AUTO, scsi_delay,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0, sysctl_scsi_delay, "I",
+    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE,
+    0, 0, sysctl_scsi_delay, "I",
     "Delay to allow devices to settle after a SCSI bus reset (ms)");
 
 static int
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c b/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c
index e1cc8f802762..b2a08a55bba4 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c
@@ -68,7 +68,7 @@ uiocopy(void *p, size_t n, enum uio_rw rw, struct uio *uio, size_t *cbytes)
 	error = vn_io_fault_uiomove(p, n, uio_clone);
 	*cbytes = uio->uio_resid - uio_clone->uio_resid;
 	if (uio_clone != &small_uio_clone)
-		free(uio_clone, M_IOV);
+		freeuio(uio_clone);
 	return (error);
 }
 
diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
index ee57432bd2fb..09b820241e50 100644
--- a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
@@ -283,7 +283,6 @@ dtrace_gethrtime_init_cpu(void *arg)
 		hst_cpu_tsc = rdtsc();
 }
 
-#ifdef EARLY_AP_STARTUP
 static void
 dtrace_gethrtime_init(void *arg)
 {
@@ -291,16 +290,6 @@ dtrace_gethrtime_init(void *arg)
 	uint64_t tsc_f;
 	cpuset_t map;
 	int i;
-#else
-/*
- * Get the frequency and scale factor as early as possible so that they can be
- * used for boot-time tracing.
- */
-static void
-dtrace_gethrtime_init_early(void *arg)
-{
-	uint64_t tsc_f;
-#endif
 
 	/*
 	 * Get TSC frequency known at this moment.
@@ -329,18 +318,6 @@ dtrace_gethrtime_init_early(void *arg)
 	 *   (terahertz) values;
 	 */
 	nsec_scale = ((uint64_t)NANOSEC << SCALE_SHIFT) / tsc_f;
-#ifndef EARLY_AP_STARTUP
-}
-SYSINIT(dtrace_gethrtime_init_early, SI_SUB_CPU, SI_ORDER_ANY,
-    dtrace_gethrtime_init_early, NULL);
-
-static void
-dtrace_gethrtime_init(void *arg)
-{
-	struct pcpu *pc;
-	cpuset_t map;
-	int i;
-#endif
 
 	if (vm_guest != VM_GUEST_NO)
 		return;
@@ -364,13 +341,8 @@ dtrace_gethrtime_init(void *arg)
 	}
 	sched_unpin();
 }
-#ifdef EARLY_AP_STARTUP
 SYSINIT(dtrace_gethrtime_init, SI_SUB_DTRACE, SI_ORDER_ANY,
     dtrace_gethrtime_init, NULL);
-#else
-SYSINIT(dtrace_gethrtime_init, SI_SUB_SMP, SI_ORDER_ANY, dtrace_gethrtime_init,
-    NULL);
-#endif
 
 /*
  * DTrace needs a high resolution time function which can
diff --git a/sys/cddl/dev/dtrace/i386/dtrace_subr.c b/sys/cddl/dev/dtrace/i386/dtrace_subr.c
index 9c9143eb9dff..026581f5a899 100644
--- a/sys/cddl/dev/dtrace/i386/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/i386/dtrace_subr.c
@@ -283,7 +283,6 @@ dtrace_gethrtime_init_cpu(void *arg)
 		hst_cpu_tsc = rdtsc();
 }
 
-#ifdef EARLY_AP_STARTUP
 static void
 dtrace_gethrtime_init(void *arg)
 {
@@ -291,16 +290,6 @@ dtrace_gethrtime_init(void *arg)
 	uint64_t tsc_f;
 	cpuset_t map;
 	int i;
-#else
-/*
- * Get the frequency and scale factor as early as possible so that they can be
- * used for boot-time tracing.
- */
-static void
-dtrace_gethrtime_init_early(void *arg)
-{
-	uint64_t tsc_f;
-#endif
 
 	/*
 	 * Get TSC frequency known at this moment.
@@ -329,18 +318,6 @@ dtrace_gethrtime_init_early(void *arg)
 	 *   (terahertz) values;
 	 */
 	nsec_scale = ((uint64_t)NANOSEC << SCALE_SHIFT) / tsc_f;
-#ifndef EARLY_AP_STARTUP
-}
-SYSINIT(dtrace_gethrtime_init_early, SI_SUB_CPU, SI_ORDER_ANY,
-    dtrace_gethrtime_init_early, NULL);
-
-static void
-dtrace_gethrtime_init(void *arg)
-{
-	cpuset_t map;
-	struct pcpu *pc;
-	int i;
-#endif
 
 	if (vm_guest != VM_GUEST_NO)
 		return;
@@ -364,13 +341,8 @@ dtrace_gethrtime_init(void *arg)
 	}
 	sched_unpin();
 }
-#ifdef EARLY_AP_STARTUP
 SYSINIT(dtrace_gethrtime_init, SI_SUB_DTRACE, SI_ORDER_ANY,
     dtrace_gethrtime_init, NULL);
-#else
-SYSINIT(dtrace_gethrtime_init, SI_SUB_SMP, SI_ORDER_ANY, dtrace_gethrtime_init,
-    NULL);
-#endif
 
 /*
  * DTrace needs a high resolution time function which can
diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
index 8f8e8fe20e4d..346ef9041820 100644
--- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c
+++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
@@ -90,7 +90,6 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
 	uint32_t *instr, *limit;
 	const char *name;
 	char *modname;
-	bool found;
 	int offs;
 
 	modname = opaque;
@@ -119,16 +118,16 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
 	if ((*instr & BTI_MASK) == BTI_INSTR)
 		instr++;
 
-	/* Look for stp (pre-indexed) operation */
-	found = false;
 	/*
 	 * If the first instruction is a nop it's a specially marked
 	 * asm function. We only support a nop first as it's not a normal
 	 * part of the function prologue.
 	 */
 	if (*instr == NOP_INSTR)
-		found = true;
-	for (; !found && instr < limit; instr++) {
+		goto found;
+
+	/* Look for stp (pre-indexed) or sub operation */
+	for (; instr < limit; instr++) {
 		/*
 		 * Functions start with "stp xt1, xt2, [xn, <const>]!" or
 		 * "sub sp, sp, <const>".
@@ -142,14 +141,14 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
 			 * past the function prologue.
 			 */
 			if (((*instr >> ADDR_SHIFT) & ADDR_MASK) == 31)
-				found = true;
+				break;
 		} else if ((*instr & SUB_MASK) == SUB_INSTR &&
 		    ((*instr >> SUB_RD_SHIFT) & SUB_R_MASK) == 31 &&
 		    ((*instr >> SUB_RN_SHIFT) & SUB_R_MASK) == 31)
-			found = true;
+			break;
 	}
-
-	if (!found)
+found:
+	if (instr >= limit)
 		return (0);
 
 	fbt = malloc(sizeof (fbt_probe_t), M_FBT, M_WAITOK | M_ZERO);
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index 2db4b6e302d9..ac617f7277bb 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -1115,7 +1115,6 @@ freebsd32_copyinuio(const struct iovec * __capability cb_arg, u_int iovcnt,
 	struct iovec32 iov32;
 	struct iovec *iov;
 	struct uio *uio;
-	u_int iovlen;
 	int error, i;
 	/*
 	 * The first argument is not actually a struct iovec *, but C's type
@@ -1127,25 +1126,23 @@ freebsd32_copyinuio(const struct iovec * __capability cb_arg, u_int iovcnt,
 	*uiop = NULL;
 	if (iovcnt > UIO_MAXIOV)
 		return (EINVAL);
-	iovlen = iovcnt * sizeof(struct iovec);
-	uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK);
-	iov = (struct iovec *)(uio + 1);
+	uio = allocuio(iovcnt);
+	iov = uio->uio_iov;
 	for (i = 0; i < iovcnt; i++) {
 		error = copyin(&iovp[i], &iov32, sizeof(struct iovec32));
 		if (error) {
-			free(uio, M_IOV);
+			freeuio(uio);
 			return (error);
 		}
 		IOVEC_INIT(&iov[i], PTRIN(iov32.iov_base), iov32.iov_len);
 	}
-	uio->uio_iov = iov;
 	uio->uio_iovcnt = iovcnt;
 	uio->uio_segflg = UIO_USERSPACE;
 	uio->uio_offset = -1;
 	uio->uio_resid = 0;
 	for (i = 0; i < iovcnt; i++) {
 		if (iov->iov_len > INT_MAX - uio->uio_resid) {
-			free(uio, M_IOV);
+			freeuio(uio);
 			return (EINVAL);
 		}
 		uio->uio_resid += iov->iov_len;
diff --git a/sys/compat/freebsd64/freebsd64_misc.c b/sys/compat/freebsd64/freebsd64_misc.c
index e75d70db498e..594a74c708b3 100644
--- a/sys/compat/freebsd64/freebsd64_misc.c
+++ b/sys/compat/freebsd64/freebsd64_misc.c
@@ -388,7 +388,6 @@ freebsd64_copyinuio(const struct iovec * __capability cb_arg, u_int iovcnt,
 	struct iovec64 iov64;
 	struct iovec *iov;
 	struct uio *uio;
-	size_t iovlen;
 	int error, i;
 	/*
 	 * The first argument is not actually a struct iovec *, but C's type
@@ -400,26 +399,24 @@ freebsd64_copyinuio(const struct iovec * __capability cb_arg, u_int iovcnt,
 	*uiop = NULL;
 	if (iovcnt > UIO_MAXIOV)
 		return (EINVAL);
-	iovlen = iovcnt * sizeof(struct iovec);
-	uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK);
-	iov = (struct iovec *)(uio + 1);
+	uio = allocuio(iovcnt);
+	iov = uio->uio_iov;
 	for (i = 0; i < iovcnt; i++) {
 		error = copyin(&iovp[i], &iov64, sizeof(iov64));
 		if (error) {
-			free(uio, M_IOV);
+			freeuio(uio);
 			return (error);
 		}
 		IOVEC_INIT_C(&iov[i], __USER_CAP(iov64.iov_base, iov64.iov_len),
 		    iov64.iov_len);
 	}
-	uio->uio_iov = iov;
 	uio->uio_iovcnt = iovcnt;
 	uio->uio_segflg = UIO_USERSPACE;
 	uio->uio_offset = -1;
 	uio->uio_resid = 0;
 	for (i = 0; i < iovcnt; i++) {
 		if (iov[i].iov_len > SIZE_MAX - uio->uio_resid) {
-			free(uio, M_IOV);
+			freeuio(uio);
 			return (EINVAL);
 		}
 		uio->uio_resid += iov[i].iov_len;
diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c
index 32ca25e7a981..7b01a6888c0b 100644
--- a/sys/compat/ia32/ia32_sysvec.c
+++ b/sys/compat/ia32/ia32_sysvec.c
@@ -126,7 +126,8 @@ struct sysentvec ia32_freebsd_sysvec = {
 	.sv_fixlimit	= ia32_fixlimit,
 	.sv_maxssiz	= &ia32_maxssiz,
 	.sv_flags	= SV_ABI_FREEBSD | SV_ASLR | SV_IA32 | SV_ILP32 |
-			    SV_SHP | SV_TIMEKEEP | SV_RNG_SEED_VER | SV_DSO_SIG,
+			    SV_SHP | SV_TIMEKEEP | SV_RNG_SEED_VER |
+			    SV_DSO_SIG | SV_SIGSYS,
 	.sv_set_syscall_retval = ia32_set_syscall_retval,
 	.sv_fetch_syscall_args = ia32_fetch_syscall_args,
 	.sv_syscallnames = freebsd32_syscallnames,
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index d56d7ee741ea..211c7825323c 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -1040,7 +1040,7 @@ linux_preadv(struct thread *td, struct linux_preadv_args *uap)
 	if (error != 0)
 		return (error);
 	error = kern_preadv(td, uap->fd, auio, offset);
-	free(auio, M_IOV);
+	freeuio(auio);
 	return (error);
 }
 
@@ -1067,7 +1067,7 @@ linux_pwritev(struct thread *td, struct linux_pwritev_args *uap)
 	if (error != 0)
 		return (error);
 	error = kern_pwritev(td, uap->fd, auio, offset);
-	free(auio, M_IOV);
+	freeuio(auio);
 	return (linux_enobufs2eagain(td, uap->fd, error));
 }
 
@@ -1874,7 +1874,7 @@ linux_writev(struct thread *td, struct linux_writev_args *args)
 	if (error != 0)
 		return (error);
 	error = kern_writev(td, args->fd, auio);
-	free(auio, M_IOV);
+	freeuio(auio);
 	return (linux_enobufs2eagain(td, args->fd, error));
 }
 // CHERI CHANGES START
diff --git a/sys/compat/linux/linux_ipc64.h b/sys/compat/linux/linux_ipc64.h
index 75563c55971c..e3834b909bfc 100644
--- a/sys/compat/linux/linux_ipc64.h
+++ b/sys/compat/linux/linux_ipc64.h
@@ -101,9 +101,13 @@ struct l_msqid64_ds {
 struct l_semid64_ds {
 	struct l_ipc64_perm sem_perm;	/* permissions */
 	l_time_t	sem_otime;	/* last semop time */
+#if defined(__amd64__) || defined(__i386__)
 	l_ulong		__unused1;
+#endif
 	l_time_t	sem_ctime;	/* last change time */
+#if defined(__amd64__) || defined(__i386__)
 	l_ulong		__unused2;
+#endif
 	l_ulong		sem_nsems;	/* no. of semaphores in array */
 	l_ulong		__unused3;
 	l_ulong		__unused4;
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index cd370ab62b29..d54c2b0037b6 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -79,7 +79,6 @@
 #include <compat/linux/linux_signal.h>
 #include <compat/linux/linux_time.h>
 #include <compat/linux/linux_util.h>
-#include <compat/linux/linux_sysproto.h>
 #include <compat/linux/linux_emul.h>
 #include <compat/linux/linux_misc.h>
 
@@ -1507,13 +1506,6 @@ linux_getsid(struct thread *td, struct linux_getsid_args *args)
 	return (kern_getsid(td, args->pid));
 }
 
-int
-linux_nosys(struct thread *td, struct nosys_args *ignore)
-{
-
-	return (ENOSYS);
-}
-
 int
 linux_getpriority(struct thread *td, struct linux_getpriority_args *args)
 {
diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c
index a6846035c22e..807cdc7a14bc 100644
--- a/sys/compat/linux/linux_netlink.c
+++ b/sys/compat/linux/linux_netlink.c
@@ -27,7 +27,6 @@
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_netlink.h"
 
 #include <sys/types.h>
 #include <sys/ck.h>
diff --git a/sys/compat/linux/linux_sysproto.h b/sys/compat/linux/linux_sysproto.h
deleted file mode 100644
index 7ad9e2068d7f..000000000000
--- a/sys/compat/linux/linux_sysproto.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright (c) 2005 Travis Poppe
- * 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
- *    in this position and unchanged.
- * 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#ifndef LINUX_SYSPROTO
-#define LINUX_SYSPROTO
-
-int linux_nosys(struct thread *, struct nosys_args *);
-
-#endif
diff --git a/sys/compat/linuxkpi/common/include/asm/set_memory.h b/sys/compat/linuxkpi/common/include/asm/set_memory.h
index ae50148f0314..69f659001c60 100644
--- a/sys/compat/linuxkpi/common/include/asm/set_memory.h
+++ b/sys/compat/linuxkpi/common/include/asm/set_memory.h
@@ -34,14 +34,26 @@
 static inline int
 set_memory_uc(unsigned long addr, int numpages)
 {
-	return (pmap_change_attr(addr, numpages, VM_MEMATTR_UNCACHEABLE));
+	vm_offset_t va;
+	vm_size_t len;
+
+	va = PHYS_TO_DMAP(addr);
+	len = numpages << PAGE_SHIFT;
+
+	return (-pmap_change_attr(va, len, VM_MEMATTR_UNCACHEABLE));
 }
 
 static inline int
 set_memory_wc(unsigned long addr, int numpages)
 {
 #ifdef VM_MEMATTR_WRITE_COMBINING
-	return (pmap_change_attr(addr, numpages, VM_MEMATTR_WRITE_COMBINING));
+	vm_offset_t va;
+	vm_size_t len;
+
+	va = PHYS_TO_DMAP(addr);
+	len = numpages << PAGE_SHIFT;
+
+	return (-pmap_change_attr(va, len, VM_MEMATTR_WRITE_COMBINING));
 #else
 	return (set_memory_uc(addr, numpages));
 #endif
@@ -50,7 +62,13 @@ set_memory_wc(unsigned long addr, int numpages)
 static inline int
 set_memory_wb(unsigned long addr, int numpages)
 {
-	return (pmap_change_attr(addr, numpages, VM_MEMATTR_WRITE_BACK));
+	vm_offset_t va;
+	vm_size_t len;
+
+	va = PHYS_TO_DMAP(addr);
+	len = numpages << PAGE_SHIFT;
+
+	return (-pmap_change_attr(va, len, VM_MEMATTR_WRITE_BACK));
 }
 
 static inline int
diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h
index ee46d354a5ae..2345967898e6 100644
--- a/sys/compat/linuxkpi/common/include/linux/io.h
+++ b/sys/compat/linuxkpi/common/include/linux/io.h
@@ -532,14 +532,25 @@ void lkpi_arch_phys_wc_del(int);
 static inline int
 arch_io_reserve_memtype_wc(resource_size_t start, resource_size_t size)
 {
+	vm_offset_t va;
 
-	return (set_memory_wc(start, size >> PAGE_SHIFT));
+	va = PHYS_TO_DMAP(start);
+
+#ifdef VM_MEMATTR_WRITE_COMBINING
+	return (-pmap_change_attr(va, size, VM_MEMATTR_WRITE_COMBINING));
+#else
+	return (-pmap_change_attr(va, size, VM_MEMATTR_UNCACHEABLE));
+#endif
 }
 
 static inline void
 arch_io_free_memtype_wc(resource_size_t start, resource_size_t size)
 {
-	set_memory_wb(start, size >> PAGE_SHIFT);
+	vm_offset_t va;
+
+	va = PHYS_TO_DMAP(start);
+
+	pmap_change_attr(va, size, VM_MEMATTR_WRITE_BACK);
 }
 #endif
 
diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c
index 8cae7380baba..8ae5074276d6 100644
--- a/sys/compat/linuxkpi/common/src/linux_80211.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211.c
@@ -1012,6 +1012,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 			vif->bss_conf.chandef.center_freq2 =
 			    conf->def.center_freq2;
 		} else {
+			ic_printf(vap->iv_ic, "%s:%d: mo_add_chanctx "
+			    "failed: %d\n", __func__, __LINE__, error);
 			goto out;
 		}
 
@@ -1024,6 +1026,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 		if (error == EOPNOTSUPP)
 			error = 0;
 		if (error != 0) {
+			ic_printf(vap->iv_ic, "%s:%d: mo_assign_vif_chanctx "
+			    "failed: %d\n", __func__, __LINE__, error);
 			lkpi_80211_mo_remove_chanctx(hw, conf);
 			lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf);
 			free(lchanctx, M_LKPI80211);
@@ -1049,6 +1053,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 		lsta = lkpi_lsta_alloc(vap, ni->ni_macaddr, hw, ni);
 		if (lsta == NULL) {
 			error = ENOMEM;
+			ic_printf(vap->iv_ic, "%s:%d: lkpi_lsta_alloc "
+			    "failed: %d\n", __func__, __LINE__, error);
 			goto out;
 		}
 		lsta->ni = ieee80211_ref_node(ni);
@@ -1068,6 +1074,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE);
 	if (error != 0) {
 		IMPROVE("do we need to undo the chan ctx?");
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
 	}
 #if 0
@@ -1169,6 +1177,8 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NOTEXIST);
 	if (error != 0) {
 		IMPROVE("do we need to undo the chan ctx?");
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NOTEXIST) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
 	}
 #if 0
@@ -1247,8 +1257,11 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in
 	KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not "
 	    "NONE: %#x\n", __func__, lsta, lsta->state));
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTH);
-	if (error != 0)
+	if (error != 0) {
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTH) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
+	}
 
 	/* End mgd_complete_tx. */
 	if (lsta->in_mgd) {
@@ -1386,8 +1399,11 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i
 
 	/* Call iv_newstate first so we get potential DISASSOC packet out. */
 	error = lvif->iv_newstate(vap, nstate, arg);
-	if (error != 0)
+	if (error != 0) {
+		ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) "
+		    "failed: %d\n", __func__, __LINE__, vap, nstate, arg, error);
 		goto outni;
+	}
 
 	IEEE80211_UNLOCK(vap->iv_ic);
 	LKPI_80211_LHW_LOCK(lhw);
@@ -1421,11 +1437,23 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i
 	KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not "
 	    "AUTH: %#x\n", __func__, lsta, lsta->state));
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE);
-	if (error != 0)
+	if (error != 0) {
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
+	}
 
 	lkpi_lsta_dump(lsta, ni, __func__, __LINE__);
 
+	/* Update bss info (bss_info_changed) (assoc, aid, ..). */
+	/*
+	 * We need to do this now, before sta changes to IEEE80211_STA_NOTEXIST
+	 * as otherwise drivers (iwlwifi at least) will silently not remove
+	 * the sta from the firmware and when we will add a new one trigger
+	 * a fw assert.
+	 */
+	lkpi_disassoc(sta, vif, lhw);
+
 	/* Adjust sta and change state (from NONE) to NOTEXIST. */
 	KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni));
 	KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not "
@@ -1433,17 +1461,12 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NOTEXIST);
 	if (error != 0) {
 		IMPROVE("do we need to undo the chan ctx?");
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NOTEXIST) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
 	}
-#if 0
-	lsta->added_to_drv = false;	/* mo manages. */
-#endif
-
-	lkpi_lsta_dump(lsta, ni, __func__, __LINE__);
 
-	/* Update bss info (bss_info_changed) (assoc, aid, ..). */
-	/* We need to do this now, can only do after sta is IEEE80211_STA_NOTEXIST. */
-	lkpi_disassoc(sta, vif, lhw);
+	lkpi_lsta_dump(lsta, ni, __func__, __LINE__);	/* sta no longer save to use. */
 
 	IMPROVE("Any bss_info changes to announce?");
 	bss_changed = 0;
@@ -1557,8 +1580,11 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 		sta->wme = true;
 #endif
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC);
-	if (error != 0)
+	if (error != 0) {
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
+	}
 
 	IMPROVE("wme / conf_tx [all]");
 
@@ -1632,6 +1658,8 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTHORIZED);
 	if (error != 0) {
 		IMPROVE("undo some changes?");
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTHORIZED) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
 	}
 
@@ -1714,8 +1742,11 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 
 	/* Call iv_newstate first so we get potential DISASSOC packet out. */
 	error = lvif->iv_newstate(vap, nstate, arg);
-	if (error != 0)
+	if (error != 0) {
+		ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) "
+		    "failed: %d\n", __func__, __LINE__, vap, nstate, arg, error);
 		goto outni;
+	}
 
 	IEEE80211_UNLOCK(vap->iv_ic);
 	LKPI_80211_LHW_LOCK(lhw);
@@ -1751,8 +1782,11 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 	KASSERT(lsta->state == IEEE80211_STA_AUTHORIZED, ("%s: lsta %p state not "
 	    "AUTHORIZED: %#x\n", __func__, lsta, lsta->state));
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC);
-	if (error != 0)
+	if (error != 0) {
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
+	}
 
 	lkpi_lsta_dump(lsta, ni, __func__, __LINE__);
 
@@ -1761,8 +1795,11 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 	KASSERT(lsta->state == IEEE80211_STA_ASSOC, ("%s: lsta %p state not "
 	    "ASSOC: %#x\n", __func__, lsta, lsta->state));
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTH);
-	if (error != 0)
+	if (error != 0) {
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTH) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
+	}
 
 	lkpi_lsta_dump(lsta, ni, __func__, __LINE__);
 
@@ -1827,8 +1864,11 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 
 	/* Call iv_newstate first so we get potential DISASSOC packet out. */
 	error = lvif->iv_newstate(vap, nstate, arg);
-	if (error != 0)
+	if (error != 0) {
+		ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) "
+		    "failed: %d\n", __func__, __LINE__, vap, nstate, arg, error);
 		goto outni;
+	}
 
 	IEEE80211_UNLOCK(vap->iv_ic);
 	LKPI_80211_LHW_LOCK(lhw);
@@ -1862,8 +1902,11 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 	KASSERT(lsta->state == IEEE80211_STA_AUTHORIZED, ("%s: lsta %p state not "
 	    "AUTHORIZED: %#x\n", __func__, lsta, lsta->state));
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC);
-	if (error != 0)
+	if (error != 0) {
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
+	}
 
 	lkpi_lsta_dump(lsta, ni, __func__, __LINE__);
 
@@ -1872,8 +1915,11 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 	KASSERT(lsta->state == IEEE80211_STA_ASSOC, ("%s: lsta %p state not "
 	    "ASSOC: %#x\n", __func__, lsta, lsta->state));
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTH);
-	if (error != 0)
+	if (error != 0) {
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTH) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
+	}
 
 	lkpi_lsta_dump(lsta, ni, __func__, __LINE__);
 
@@ -1882,11 +1928,21 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 	KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not "
 	    "AUTH: %#x\n", __func__, lsta, lsta->state));
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE);
-	if (error != 0)
+	if (error != 0) {
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
+	}
 
 	lkpi_lsta_dump(lsta, ni, __func__, __LINE__);
 
+	/* Update bss info (bss_info_changed) (assoc, aid, ..). */
+	/*
+	 * One would expect this to happen when going off AUTHORIZED.
+	 * See comment there; removes the sta from fw.
+	 */
+	lkpi_disassoc(sta, vif, lhw);
+
 	/* Adjust sta and change state (from NONE) to NOTEXIST. */
 	KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni));
 	KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not "
@@ -1894,20 +1950,12 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int
 	error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NOTEXIST);
 	if (error != 0) {
 		IMPROVE("do we need to undo the chan ctx?");
+		ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NOTEXIST) "
+		    "failed: %d\n", __func__, __LINE__, error);
 		goto out;
 	}
-#if 0
-	lsta->added_to_drv = false;	/* mo manages. */
-#endif
 
-	lkpi_lsta_dump(lsta, ni, __func__, __LINE__);
-
-	/* Update bss info (bss_info_changed) (assoc, aid, ..). */
-	/*
-	 * One would expect this to happen when going off AUTHORIZED.
-	 * See comment there; removes the sta from fw.
-	 */
-	lkpi_disassoc(sta, vif, lhw);
+	lkpi_lsta_dump(lsta, ni, __func__, __LINE__);	/* sta no longer save to use. */
 
 	IMPROVE("Any bss_info changes to announce?");
 	bss_changed = 0;
@@ -2474,10 +2522,17 @@ lkpi_ic_vap_delete(struct ieee80211vap *vap)
 	LKPI_80211_LHW_LVIF_LOCK(lhw);
 	TAILQ_REMOVE(&lhw->lvif_head, lvif, lvif_entry);
 	LKPI_80211_LHW_LVIF_UNLOCK(lhw);
-	lkpi_80211_mo_remove_interface(hw, vif);
 
 	ieee80211_ratectl_deinit(vap);
 	ieee80211_vap_detach(vap);
+
+	IMPROVE("clear up other bits in this state");
+
+	lkpi_80211_mo_remove_interface(hw, vif);
+
+	/* Single VAP, so we can do this here. */
+	lkpi_80211_mo_stop(hw);
+
 	mtx_destroy(&lvif->mtx);
 	free(lvif, M_80211_VAP);
 }
@@ -4853,10 +4908,8 @@ linuxkpi_ieee80211_connection_loss(struct ieee80211_vif *vif)
 	nstate = IEEE80211_S_INIT;
 	arg = 0;	/* Not a valid reason. */
 
-#ifdef LINUXKPI_DEBUG_80211
-	if (linuxkpi_debug_80211 & D80211_TRACE)
-		ic_printf(vap->iv_ic, "%s: vif %p\n", __func__, vif);
-#endif
+	ic_printf(vap->iv_ic, "%s: vif %p vap %p state %s\n", __func__,
+	    vif, vap, ieee80211_state_name[vap->iv_state]);
 	ieee80211_new_state(vap, nstate, arg);
 }
 
@@ -4869,11 +4922,8 @@ linuxkpi_ieee80211_beacon_loss(struct ieee80211_vif *vif)
 	lvif = VIF_TO_LVIF(vif);
 	vap = LVIF_TO_VAP(lvif);
 
-#ifdef LINUXKPI_DEBUG_80211
-	if (linuxkpi_debug_80211 & D80211_TRACE || vap->iv_state != IEEE80211_S_RUN)
-		ic_printf(vap->iv_ic, "%s: vif %p vap %p state %s\n", __func__,
-		    vif, vap, ieee80211_state_name[vap->iv_state]);
-#endif
+	ic_printf(vap->iv_ic, "%s: vif %p vap %p state %s\n", __func__,
+	    vif, vap, ieee80211_state_name[vap->iv_state]);
 	ieee80211_beacon_miss(vap->iv_ic);
 }
 
@@ -4905,15 +4955,18 @@ linuxkpi_ieee80211_stop_queue(struct ieee80211_hw *hw, int qnum)
 		for (ac = 0; ac < ac_count; ac++) {
 			IMPROVE_TXQ("LOCKING");
 			if (qnum == vif->hw_queue[ac]) {
+#ifdef LINUXKPI_DEBUG_80211
 				/*
 				 * For now log this to better understand
 				 * how this is supposed to work.
 				 */
-				if (lvif->hw_queue_stopped[ac])
+				if (lvif->hw_queue_stopped[ac] &&
+				    (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) != 0)
 					ic_printf(lhw->ic, "%s:%d: lhw %p hw %p "
 					    "lvif %p vif %p ac %d qnum %d already "
 					    "stopped\n", __func__, __LINE__,
 					    lhw, hw, lvif, vif, ac, qnum);
+#endif
 				lvif->hw_queue_stopped[ac] = true;
 			}
 		}
@@ -4960,15 +5013,18 @@ lkpi_ieee80211_wake_queues(struct ieee80211_hw *hw, int hwq)
 
 				/* XXX-BZ what about software scan? */
 
+#ifdef LINUXKPI_DEBUG_80211
 				/*
 				 * For now log this to better understand
 				 * how this is supposed to work.
 				 */
-				if (!lvif->hw_queue_stopped[ac])
+				if (!lvif->hw_queue_stopped[ac] &&
+				    (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) != 0)
 					ic_printf(lhw->ic, "%s:%d: lhw %p hw %p "
 					    "lvif %p vif %p ac %d hw_q not stopped\n",
 					    __func__, __LINE__,
 					    lhw, hw, lvif, vif, ac);
+#endif
 				lvif->hw_queue_stopped[ac] = false;
 
 				LKPI_80211_LVIF_LOCK(lvif);
diff --git a/sys/compat/linuxkpi/dummy/include/linux/agp_backend.h b/sys/compat/linuxkpi/dummy/include/linux/agp_backend.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/sys/compat/linuxkpi/dummy/include/linux/utsname.h b/sys/compat/linuxkpi/dummy/include/linux/utsname.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 088bd7426a77..a5ed60792a1f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -365,6 +365,9 @@ options 	COMPAT_FREEBSD12
 # Enable FreeBSD13 compatibility syscalls
 options 	COMPAT_FREEBSD13
 
+# Enable FreeBSD14 compatibility syscalls
+options 	COMPAT_FREEBSD14
+
 # Enable Linux Kernel Programming Interface
 options 	COMPAT_LINUXKPI
 
diff --git a/sys/conf/files b/sys/conf/files
index f910a1b92719..b04af811eb8d 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1911,13 +1911,6 @@ dev/ida/ida.c			optional ida
 dev/ida/ida_disk.c		optional ida
 dev/ida/ida_pci.c		optional ida pci
 dev/iicbus/acpi_iicbus.c	optional acpi iicbus | acpi compat_linuxkpi
-dev/iicbus/ad7418.c		optional ad7418
-dev/iicbus/ads111x.c		optional ads111x
-dev/iicbus/ds1307.c		optional ds1307
-dev/iicbus/ds13rtc.c		optional ds13rtc | ds133x | ds1374
-dev/iicbus/ds1672.c		optional ds1672
-dev/iicbus/ds3231.c		optional ds3231
-dev/iicbus/htu21.c		optional htu21
 dev/iicbus/icee.c		optional icee
 dev/iicbus/if_ic.c		optional ic
 dev/iicbus/iic.c		optional iic
@@ -1930,30 +1923,38 @@ dev/iicbus/iichid.c		optional iichid acpi hid iicbus
 dev/iicbus/iiconf.c		optional iicbus | compat_linuxkpi
 dev/iicbus/iicsmb.c		optional iicsmb				\
 	dependency	"iicbus_if.h"
-dev/iicbus/iicoc.c		optional iicoc
-dev/iicbus/iicoc_fdt.c		optional iicoc fdt
-dev/iicbus/iicoc_pci.c		optional iicoc pci
-dev/iicbus/isl12xx.c		optional isl12xx
-dev/iicbus/lm75.c		optional lm75
-dev/iicbus/max44009.c		optional max44009
+dev/iicbus/adc/ad7418.c		optional ad7418
+dev/iicbus/adc/ads111x.c	optional ads111x
+dev/iicbus/adc/pcf8591.c	optional pcf8591
+dev/iicbus/controller/opencores/iicoc.c	optional iicoc
+dev/iicbus/controller/opencores/iicoc_fdt.c	optional iicoc fdt
+dev/iicbus/controller/opencores/iicoc_pci.c	optional iicoc pci
 dev/iicbus/mux/iicmux.c		optional iicmux
 dev/iicbus/mux/iicmux_if.m	optional iicmux
 dev/iicbus/mux/iic_gpiomux.c	optional iic_gpiomux fdt
 dev/iicbus/mux/ltc430x.c	optional ltc430x
 dev/iicbus/mux/pca954x.c	optional pca954x iicbus iicmux
-dev/iicbus/nxprtc.c		optional nxprtc | pcf8563
 dev/iicbus/ofw_iicbus.c		optional fdt iicbus
 dev/iicbus/ofw_iicbus_if.m	optional fdt iicbus
-dev/iicbus/pcf8574.c		optional pcf8574
-dev/iicbus/pcf8591.c		optional pcf8591
-dev/iicbus/rtc8583.c		optional rtc8583
+dev/iicbus/rtc/ds1307.c		optional ds1307
+dev/iicbus/rtc/ds13rtc.c	optional ds13rtc | ds133x | ds1374
+dev/iicbus/rtc/ds1672.c		optional ds1672
+dev/iicbus/rtc/ds3231.c		optional ds3231
+dev/iicbus/rtc/isl12xx.c	optional isl12xx
+dev/iicbus/rtc/nxprtc.c		optional nxprtc | pcf8563
 dev/iicbus/rtc/pcf85063.c	optional pcf85063 iicbus fdt
+dev/iicbus/rtc/rtc8583.c	optional rtc8583
+dev/iicbus/rtc/rv3032.c		optional rv3032 iicbus fdt
 dev/iicbus/rtc/rx8803.c		optional rx8803 iicbus fdt
-dev/iicbus/s35390a.c		optional s35390a
-dev/iicbus/sy8106a.c		optional sy8106a fdt
-dev/iicbus/syr827.c		optional syr827 fdt
+dev/iicbus/rtc/s35390a.c	optional s35390a
+dev/iicbus/sensor/htu21.c	optional htu21
+dev/iicbus/sensor/lm75.c	optional lm75
+dev/iicbus/sensor/max44009.c	optional max44009
+dev/iicbus/gpio/pcf8574.c	optional pcf8574
 dev/iicbus/gpio/tca64xx.c	optional tca64xx fdt gpio
 dev/iicbus/pmic/fan53555.c	optional fan53555 fdt | tcs4525 fdt
+dev/iicbus/pmic/silergy/sy8106a.c	optional sy8106a fdt
+dev/iicbus/pmic/silergy/syr827.c	optional syr827 fdt
 dev/igc/if_igc.c		optional igc iflib pci
 dev/igc/igc_api.c		optional igc iflib pci
 dev/igc/igc_base.c		optional igc iflib pci
@@ -4620,6 +4621,7 @@ netpfil/pf/pf_if.c		optional pf inet
 netpfil/pf/pf_ioctl.c		optional pf inet
 netpfil/pf/pf_lb.c		optional pf inet
 netpfil/pf/pf_norm.c		optional pf inet
+netpfil/pf/pf_nl.c		optional pf inet
 netpfil/pf/pf_nv.c		optional pf inet
 netpfil/pf/pf_osfp.c		optional pf inet
 netpfil/pf/pf_ruleset.c		optional pf inet
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 3dc48e20b168..772bbb8b0e3b 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -88,12 +88,14 @@ crypto/des/des_enc.c		optional	netsmb
 dev/cpufreq/cpufreq_dt.c	optional	cpufreq fdt
 dev/dwc/if_dwc.c		optional	dwc
 dev/dwc/if_dwc_if.m		optional	dwc
+dev/dwc/dwc1000_core.c		optional	dwc
+dev/dwc/dwc1000_dma.c		optional	dwc
 dev/fb/fb.c			optional	sc
 dev/fdt/fdt_arm_platform.c	optional	platform fdt
 dev/video/crtc_if.m		optional	vt
 dev/hwpmc/hwpmc_arm.c		optional	hwpmc
 dev/hwpmc/hwpmc_armv7.c		optional	hwpmc
-dev/iicbus/twsi/twsi.c		optional	twsi
+dev/iicbus/controller/twsi/twsi.c	optional	twsi
 dev/ofw/ofw_pcib.c		optional	fdt pci
 dev/pci/pci_host_generic.c	optional	pci_host_generic pci
 dev/pci/pci_host_generic_fdt.c	optional	pci_host_generic pci fdt
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 1feac7e0c25b..6d071d0e7bb4 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -312,8 +312,13 @@ dev/dpaa2/memac_mdio_common.c			optional soc_nxp_ls dpaa2 acpi | soc_nxp_ls dpaa
 dev/dpaa2/memac_mdio_fdt.c			optional soc_nxp_ls dpaa2 fdt
 dev/dpaa2/memac_mdio_if.m			optional soc_nxp_ls dpaa2 acpi | soc_nxp_ls dpaa2 fdt
 
+# Synopsys DesignWare Ethernet Controller
 dev/dwc/if_dwc.c				optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10
 dev/dwc/if_dwc_if.m				optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10
+dev/dwc/dwc1000_core.c				optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10
+dev/dwc/dwc1000_dma.c				optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10
+dev/dwc/if_dwc_rk.c				optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399
+dev/dwc/if_dwc_socfpga.c			optional fdt dwc_socfpga
 
 dev/enetc/enetc_mdio.c				optional enetc soc_nxp_ls
 dev/enetc/if_enetc.c				optional enetc iflib pci fdt soc_nxp_ls
@@ -424,10 +429,9 @@ ice_ddp.fw					optional ice_ddp	\
 	no-obj no-implicit-rule				\
 	clean		"ice_ddp.fw"
 
-dev/iicbus/sy8106a.c				optional sy8106a fdt
-dev/iicbus/twsi/mv_twsi.c			optional twsi fdt
-dev/iicbus/twsi/a10_twsi.c			optional twsi fdt
-dev/iicbus/twsi/twsi.c				optional twsi fdt
+dev/iicbus/controller/twsi/mv_twsi.c		optional twsi fdt
+dev/iicbus/controller/twsi/a10_twsi.c		optional twsi fdt
+dev/iicbus/controller/twsi/twsi.c		optional twsi fdt
 
 dev/ipmi/ipmi.c					optional ipmi
 dev/ipmi/ipmi_acpi.c				optional ipmi acpi
@@ -558,7 +562,6 @@ arm/allwinner/h6/h6_padconf.c			optional soc_allwinner_h6 fdt
 arm/allwinner/h6/h6_r_padconf.c			optional soc_allwinner_h6 fdt
 
 # Altera/Intel
-dev/altera/dwc/if_dwc_socfpga.c			optional fdt dwc_socfpga
 arm64/intel/stratix10-soc-fpga-mgr.c		optional soc_intel_stratix10 fdt
 arm64/intel/stratix10-svc.c			optional soc_intel_stratix10 fdt
 
@@ -770,7 +773,6 @@ arm64/rockchip/rk_iodomain.c			optional fdt rk_iodomain
 arm64/rockchip/rk_spi.c				optional fdt rk_spi
 arm64/rockchip/rk_usb2phy.c			optional fdt rk_usb2phy soc_rockchip_rk3328 | fdt rk_usb2phy soc_rockchip_rk3399 | fdt rk_usb2phy soc_rockchip_rk3568
 arm64/rockchip/rk_typec_phy.c			optional fdt rk_typec_phy soc_rockchip_rk3399
-arm64/rockchip/if_dwc_rk.c			optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399
 arm64/rockchip/rk_tsadc_if.m			optional fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
 arm64/rockchip/rk_tsadc.c			optional fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
 arm64/rockchip/rk_pwm.c				optional fdt rk_pwm
@@ -794,6 +796,7 @@ arm64/rockchip/clk/rk3568_pmucru.c		optional fdt soc_rockchip_rk3568
 # Xilinx
 arm/xilinx/uart_dev_cdnc.c			optional uart soc_xilinx_zynq fdt
 arm/xilinx/zy7_gpio.c				optional gpio soc_xilinx_zynq fdt
+dev/iicbus/controller/cadence/cdnc_i2c.c	optional cdnc_i2c iicbus soc_xilinx_zynq fdt
 dev/usb/controller/xlnx_dwc3.c			optional xhci soc_xilinx_zynq fdt
 dev/firmware/xilinx/zynqmp_firmware.c		optional fdt soc_xilinx_zynq
 dev/firmware/xilinx/zynqmp_firmware_if.m	optional fdt soc_xilinx_zynq
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 48251ab07d9e..0293efd28fbe 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -40,14 +40,14 @@ dev/hwpmc/hwpmc_mpc7xxx.c	optional	hwpmc
 dev/hwpmc/hwpmc_power8.c	optional	hwpmc
 dev/hwpmc/hwpmc_powerpc.c	optional	hwpmc
 dev/hwpmc/hwpmc_ppc970.c	optional	hwpmc
-dev/iicbus/ad7417.c		optional	ad7417 powermac
-dev/iicbus/adm1030.c		optional	powermac windtunnel | adm1030 powermac
-dev/iicbus/adt746x.c		optional        adt746x powermac
-dev/iicbus/ds1631.c		optional	ds1631 powermac
-dev/iicbus/ds1775.c		optional	ds1775 powermac
-dev/iicbus/max6690.c		optional	max6690 powermac
+dev/iicbus/adc/ad7417.c		optional	ad7417 powermac
 dev/iicbus/ofw_iicbus.c		optional	iicbus aim
 dev/iicbus/ofw_iicbus_if.m	optional	iicbus aim
+dev/iicbus/pwm/adm1030.c	optional	powermac windtunnel | adm1030 powermac
+dev/iicbus/pwm/adt746x.c	optional        adt746x powermac
+dev/iicbus/sensor/ds1631.c	optional	ds1631 powermac
+dev/iicbus/sensor/ds1775.c	optional	ds1775 powermac
+dev/iicbus/sensor/max6690.c	optional	max6690 powermac
 dev/ipmi/ipmi.c			optional	ipmi
 dev/ipmi/ipmi_opal.c		optional	powernv ipmi
 dev/ice/if_ice_iflib.c		optional	ice pci powerpc64 | ice pci powerpc64le \
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index f4069152a192..44a0ebea362e 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -140,6 +140,8 @@ INLINE_LIMIT?=	8000
 CFLAGS += -mgeneral-regs-only
 # Reserve x18 for pcpu data
 CFLAGS += -ffixed-x18
+# Build with BTI+PAC
+CFLAGS += -mbranch-protection=standard
 INLINE_LIMIT?=	8000
 
 .if ${MACHINE_CPU:Mcheri}
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 897d1c853f82..0245d60e7b1d 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -217,14 +217,6 @@ for dir in /usr/bin /usr/local/bin; do
 	fi
 done
 
-if [ -z "${svnversion}" ] && [ -x /usr/bin/svnliteversion ] ; then
-	if /usr/bin/svnliteversion "$(realpath "${0}")" >/dev/null 2>&1; then
-		svnversion=/usr/bin/svnliteversion
-	else
-		svnversion=
-	fi
-fi
-
 if findvcs .git; then
 	for dir in /usr/bin /usr/local/bin /usr/local64/bin; do
 		if [ -x "${dir}/git" ] ; then
diff --git a/sys/conf/options b/sys/conf/options
index a29de819ad0e..9305c4e50262 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -100,6 +100,7 @@ COMPAT_FREEBSD10	opt_global.h
 COMPAT_FREEBSD11	opt_global.h
 COMPAT_FREEBSD12	opt_global.h
 COMPAT_FREEBSD13	opt_global.h
+COMPAT_FREEBSD14	opt_global.h
 COMPAT_LINUXKPI	opt_dontuse.h
 COMPILING_LINT	opt_global.h
 CY_PCI_FASTINTR
@@ -475,7 +476,7 @@ MBUF_PROFILING
 MBUF_STRESS_TEST
 MROUTING		opt_mrouting.h
 NFSLOCKD
-NETLINK			opt_netlink.h
+NETLINK			opt_global.h
 PF_DEFAULT_TO_DROP	opt_pf.h
 ROUTE_MPATH		opt_route.h
 ROUTETABLES		opt_route.h
@@ -1002,7 +1003,6 @@ EKCD		opt_ekcd.h
 
 # NVME options
 NVME_USE_NVD	opt_nvme.h
-NVME_2X_RESET	opt_nvme.h
 
 # amdsbwd options
 AMDSBWD_DEBUG	opt_amdsbwd.h
diff --git a/sys/contrib/dev/iwlwifi/mvm/tx.c b/sys/contrib/dev/iwlwifi/mvm/tx.c
index 2407d0ee832e..da33c1a5cc46 100644
--- a/sys/contrib/dev/iwlwifi/mvm/tx.c
+++ b/sys/contrib/dev/iwlwifi/mvm/tx.c
@@ -1199,9 +1199,10 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
 
 	if (WARN_ONCE(txq_id == IWL_MVM_INVALID_QUEUE, "Invalid TXQ id")) {
 #if defined(__FreeBSD__)
-		IWL_DEBUG_TX(mvm, "fc %#06x tid %u txq_id %u mvm %p "
-		    "skb %p { len %u } info %p sta %p\n", fc,
-		    tid, txq_id, mvm, skb, skb->len, info, sta);
+		printf("%s:%d: fc %#06x tid %u txq_id %u mvm %p "
+		    "skb %p { len %u } info %p sta %p (if you see this please "
+		    "report to PR 274382)\n", __func__, __LINE__,
+		    fc, tid, txq_id, mvm, skb, skb->len, info, sta);
 #endif
 		iwl_trans_free_tx_cmd(mvm->trans, dev_cmd);
 		spin_unlock(&mvmsta->lock);
diff --git a/sys/contrib/dev/rtw88/rtw8822c.c b/sys/contrib/dev/rtw88/rtw8822c.c
index da58b9ca8e57..a2fda1b36e6c 100644
--- a/sys/contrib/dev/rtw88/rtw8822c.c
+++ b/sys/contrib/dev/rtw88/rtw8822c.c
@@ -2204,7 +2204,11 @@ static void rtw8822c_set_channel_rf(struct rtw_dev *rtwdev, u8 channel, u8 bw)
 	u32 rf_reg18 = 0;
 	u32 rf_rxbb = 0;
 
+#if defined(__linux__)
 	rf_reg18 = rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK);
+#elif defined(__FreeBSD__)
+	rf_reg18 = rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK);
+#endif
 
 	rf_reg18 &= ~(RF18_BAND_MASK | RF18_CHANNEL_MASK | RF18_RFSI_MASK |
 		      RF18_BW_MASK);
@@ -3277,7 +3281,11 @@ static void rtw8822c_dpk_information(struct rtw_dev *rtwdev)
 	u32  reg;
 	u8 band_shift;
 
+#if defined(__linux__)
 	reg = rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK);
+#elif defined(__FreeBSD__)
+	reg = rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK);
+#endif
 
 	band_shift = FIELD_GET(BIT(16), reg);
 	dpk_info->dpk_band = 1 << band_shift;
@@ -4158,7 +4166,11 @@ static bool rtw8822c_dpk_reload(struct rtw_dev *rtwdev)
 
 	dpk_info->is_reload = false;
 
+#if defined(__linux__)
 	channel = (u8)(rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK) & 0xff);
+#elif defined(__FreeBSD__)
+	channel = (u8)(rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK) & 0xff);
+#endif
 
 	if (channel == dpk_info->dpk_ch) {
 		rtw_dbg(rtwdev, RTW_DBG_RFK,
diff --git a/sys/contrib/openzfs/.cirrus.yml b/sys/contrib/openzfs/.cirrus.yml
new file mode 100644
index 000000000000..18b292289e20
--- /dev/null
+++ b/sys/contrib/openzfs/.cirrus.yml
@@ -0,0 +1,21 @@
+env:
+  CIRRUS_CLONE_DEPTH: 1
+  ARCH: amd64
+
+build_task:
+  matrix:
+    freebsd_instance:
+      image_family: freebsd-12-4
+    freebsd_instance:
+      image_family: freebsd-13-2
+    freebsd_instance:
+      image_family: freebsd-14-0-snap
+  prepare_script:
+    - pkg install -y autoconf automake libtool gettext-runtime gmake ksh93 py39-packaging py39-cffi py39-sysctl
+  configure_script:
+    - env MAKE=gmake ./autogen.sh
+    - env MAKE=gmake ./configure --with-config="user" --with-python=3.9
+  build_script:
+    - gmake -j `sysctl -n kern.smp.cpus`
+  install_script:
+    - gmake install
diff --git a/sys/contrib/openzfs/.gitignore b/sys/contrib/openzfs/.gitignore
index 8d91dd9466c5..47d17ae16d34 100644
--- a/sys/contrib/openzfs/.gitignore
+++ b/sys/contrib/openzfs/.gitignore
@@ -42,8 +42,10 @@
 !udev/**
 
 !.editorconfig
+!.cirrus.yml
 !.gitignore
 !.gitmodules
+!.mailmap
 !AUTHORS
 !autogen.sh
 !CODE_OF_CONDUCT.md
@@ -60,7 +62,6 @@
 !TEST
 !zfs.release.in
 
-
 #
 # Normal rules
 #
diff --git a/sys/contrib/openzfs/.mailmap b/sys/contrib/openzfs/.mailmap
new file mode 100644
index 000000000000..46ef016b93f8
--- /dev/null
+++ b/sys/contrib/openzfs/.mailmap
@@ -0,0 +1,189 @@
+# This file maps the name+email seen in a commit back to a canonical
+# name+email. Git will replace the commit name/email with the canonical version
+# wherever it sees it.
+#
+# If there is a commit in the history with a "wrong" name or email, list it
+# here. If you regularly commit with an alternate name or email address and
+# would like to ensure that you are always listed consistently in the repo, add
+# mapping here.
+#
+# On the other hand, if you use multiple names or email addresses legitimately
+# (eg you use a company email address for your paid OpenZFS work, and a
+# personal address for your evening side projects), then don't map one to the
+# other here.
+#
+# The most common formats are:
+#
+# Canonical Name <canonical-email>
+# Canonical Name <canonical-email> <commit-email>
+# Canonical Name <canonical-email> Commit Name <commit-email>
+#
+# See https://git-scm.com/docs/gitmailmap for more info.
+
+# These maps are making names consistent where they have varied but the email
+# address has never changed. In most cases, the full name is in the
+# Signed-off-by of a commit with a matching author.
+Ahelenia Ziemiańska <nabijaczleweli@gmail.com>
+Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
+Alex John <alex@stty.io>
+Andreas Dilger <adilger@dilger.ca>
+Andrew Walker <awalker@ixsystems.com>
+Benedikt Neuffer <github@itfriend.de>
+Chengfei Zhu <chengfeix.zhu@intel.com>
+Chris Lindee <chris.lindee+github@gmail.com>
+Colm Buckley <colm@tuatha.org>
+Crag Wang <crag0715@gmail.com>
+Damian Szuberski <szuberskidamian@gmail.com>
+Daniel Kolesa <daniel@octaforge.org>
+Debabrata Banerjee <dbavatar@gmail.com>
+Finix Yan <yanchongwen@hotmail.com>
+Gaurav Kumar <gauravk.18@gmail.com>
+Gionatan Danti <g.danti@assyoma.it>
+Glenn Washburn <development@efficientek.com>
+Gordan Bobic <gordan.bobic@gmail.com>
+Gregory Bartholomew <gregory.lee.bartholomew@gmail.com>
+hedong zhang <h_d_zhang@163.com>
+InsanePrawn <Insane.Prawny@gmail.com>
+Jason Cohen <jwittlincohen@gmail.com>
+Jason Harmening <jason.harmening@gmail.com>
+Jeremy Faulkner <gldisater@gmail.com>
+Jinshan Xiong <jinshan.xiong@gmail.com>
+John Poduska <jpoduska@datto.com>
+Justin Scholz <git@justinscholz.de>
+Ka Ho Ng <khng300@gmail.com>
+Kash Pande <github@tripleback.net>
+Kay Pedersen <christianpe96@gmail.com>
+KernelOfTruth <kerneloftruth@gmail.com>
+Liu Hua <liu.hua130@zte.com.cn>
+Liu Qing <winglq@gmail.com>
+loli10K <ezomori.nozomu@gmail.com>
+Matthias Blankertz <matthias@blankertz.org>
+Michael Gmelin <grembo@FreeBSD.org>
+Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
+Piotr Kubaj <pkubaj@anongoth.pl>
+Quentin Zdanis <zdanisq@gmail.com>
+Roberto Ricci <ricci@disroot.org>
+Rob Norris <robn@despairlabs.com>
+Rob Norris <rob.norris@klarasystems.com>
+Sam Lunt <samuel.j.lunt@gmail.com>
+Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com>
+Stoiko Ivanov <github@nomore.at>
+Tamas TEVESZ <ice@extreme.hu>
+WHR <msl0000023508@gmail.com>
+Yanping Gao <yanping.gao@xtaotech.com>
+Youzhong Yang <youzhong@gmail.com>
+
+# Commits from strange places, long ago
+Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
+Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@fedora-17-amd64.(none)>
+Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@myhost.(none)>
+Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-16-145.us-west-1.compute.internal>
+Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-20-6.us-west-1.compute.internal>
+Herb Wartens <wartens2@llnl.gov> <wartens2@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
+Ned Bass <bass6@llnl.gov> <bass6@zeno1.(none)>
+Tulsi Jain <tulsi.jain@delphix.com> <tulsi.jain@Tulsi-Jains-MacBook-Pro.local>
+
+# Mappings from Github no-reply addresses
+ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com>
+Alek Pinchuk <apinchuk@axcient.com> <alek-p@users.noreply.github.com>
+Alexander Lobakin <alobakin@pm.me> <solbjorn@users.noreply.github.com>
+Alexey Smirnoff <fling@member.fsf.org> <fling-@users.noreply.github.com>
+Allen Holl <allen.m.holl@gmail.com> <65494904+allen-4@users.noreply.github.com>
+Ameer Hamza <ahamza@ixsystems.com> <106930537+ixhamza@users.noreply.github.com>
+Andrew J. Hesford <ajh@sideband.org> <48421688+ahesford@users.noreply.github.com>>
+Andrew Sun <me@andrewsun.com> <as-com@users.noreply.github.com>
+Aron Xu <happyaron.xu@gmail.com> <happyaron@users.noreply.github.com>
+Arun KV <arun.kv@datacore.com> <65647132+arun-kv@users.noreply.github.com>
+Ben Wolsieffer <benwolsieffer@gmail.com> <lopsided98@users.noreply.github.com>
+bernie1995 <bernie.pikes@gmail.com> <42413912+bernie1995@users.noreply.github.com>
+Boris Protopopov <boris.protopopov@actifio.com> <bprotopopov@users.noreply.github.com>
+Brad Forschinger <github@bnjf.id.au> <bnjf@users.noreply.github.com>
+Brandon Thetford <brandon@dodecatec.com> <dodexahedron@users.noreply.github.com>
+buzzingwires <buzzingwires@outlook.com> <131118055+buzzingwires@users.noreply.github.com>
+Cedric Maunoury <cedric.maunoury@gmail.com> <38213715+cedricmaunoury@users.noreply.github.com>
+Charles Suh <charles.suh@gmail.com> <charlessuh@users.noreply.github.com>
+Dacian Reece-Stremtan <dacianstremtan@gmail.com> <35844628+dacianstremtan@users.noreply.github.com>
+Damian Szuberski <szuberskidamian@gmail.com> <30863496+szubersk@users.noreply.github.com>
+Daniel Hiepler <d-git@coderdu.de> <32984777+heeplr@users.noreply.github.com>
+Daniel Kobras <d.kobras@science-computing.de> <sckobras@users.noreply.github.com>
+Daniel Reichelt <hacking@nachtgeist.net> <nachtgeist@users.noreply.github.com>
+David Quigley <david.quigley@intel.com> <dpquigl@users.noreply.github.com>
+DHE <git@dehacked.net> <DeHackEd@users.noreply.github.com>
+Dmitri John Ledkov <dimitri.ledkov@canonical.com> <19779+xnox@users.noreply.github.com>
+Dries Michiels <driesm.michiels@gmail.com> <32487486+driesmp@users.noreply.github.com>
+Edmund Nadolski <edmund.nadolski@ixsystems.com> <137826107+ednadolski-ix@users.noreply.github.com>
+Érico Nogueira <erico.erc@gmail.com> <34201958+ericonr@users.noreply.github.com>
+Fedor Uporov <fuporov.vstack@gmail.com> <60701163+fuporovvStack@users.noreply.github.com>
+Felix Dörre <felix@dogcraft.de> <felixdoerre@users.noreply.github.com>
+Felix Neumärker <xdch47@posteo.de> <34678034+xdch47@users.noreply.github.com>
+Finix Yan <yancw@info2soft.com> <Finix1979@users.noreply.github.com>
+Gaurav Kumar <gauravk.18@gmail.com> <gaurkuma@users.noreply.github.com>
+George Gaydarov <git@gg7.io> <gg7@users.noreply.github.com>
+Georgy Yakovlev <gyakovlev@gentoo.org> <168902+gyakovlev@users.noreply.github.com>
+Gerardwx <gerardw@alum.mit.edu> <Gerardwx@users.noreply.github.com>
+Gian-Carlo DeFazio <defazio1@llnl.gov> <defaziogiancarlo@users.noreply.github.com>
+Giuseppe Di Natale <dinatale2@llnl.gov> <dinatale2@users.noreply.github.com>
+Hajo Möller <dasjoe@gmail.com> <dasjoe@users.noreply.github.com>
+Harry Mallon <hjmallon@gmail.com> <1816667+hjmallon@users.noreply.github.com>
+Hiếu Lê <leorize+oss@disroot.org> <alaviss@users.noreply.github.com>
+Jake Howard <git@theorangeone.net> <RealOrangeOne@users.noreply.github.com>
+James Cowgill <james.cowgill@mips.com> <jcowgill@users.noreply.github.com>
+Jason King <jason.king@joyent.com> <jasonbking@users.noreply.github.com>
+Jeff Dike <jdike@akamai.com> <52420226+jdike@users.noreply.github.com>
+Jitendra Patidar <jitendra.patidar@nutanix.com> <53164267+jsai20@users.noreply.github.com>
+João Carlos Mendes Luís <jonny@jonny.eng.br> <dioni21@users.noreply.github.com>
+John Eismeier <john.eismeier@gmail.com> <32205350+jeis2497052@users.noreply.github.com>
+John L. Hammond <john.hammond@intel.com> <35266395+jhammond-intel@users.noreply.github.com>
+John-Mark Gurney <jmg@funkthat.com> <jmgurney@users.noreply.github.com>
+John Ramsden <johnramsden@riseup.net> <johnramsden@users.noreply.github.com>
+Jonathon Fernyhough <jonathon@m2x.dev> <559369+jonathonf@users.noreply.github.com>
+Justin Hibbits <chmeeedalf@gmail.com> <chmeeedalf@users.noreply.github.com>
+Kevin Jin <lostking2008@hotmail.com> <33590050+jxdking@users.noreply.github.com>
+Kevin P. Fleming <kevin@km6g.us> <kpfleming@users.noreply.github.com>
+Krzysztof Piecuch <piecuch@kpiecuch.pl> <3964215+pikrzysztof@users.noreply.github.com>
+Kyle Evans <kevans@FreeBSD.org> <kevans91@users.noreply.github.com>
+Laurențiu Nicola <lnicola@dend.ro> <lnicola@users.noreply.github.com>
+loli10K <ezomori.nozomu@gmail.com> <loli10K@users.noreply.github.com>
+Lorenz Hüdepohl <dev@stellardeath.org> <lhuedepohl@users.noreply.github.com>
+Luís Henriques <henrix@camandro.org> <73643340+lumigch@users.noreply.github.com>
+Marcin Skarbek <git@skarbek.name> <mskarbek@users.noreply.github.com>
+Matt Fiddaman <github@m.fiddaman.uk> <81489167+matt-fidd@users.noreply.github.com>
+Max Zettlmeißl <max@zettlmeissl.de> <6818198+maxz@users.noreply.github.com>
+Michael Niewöhner <foss@mniewoehner.de> <c0d3z3r0@users.noreply.github.com>
+Michael Zhivich <mzhivich@akamai.com> <33133421+mzhivich@users.noreply.github.com>
+Mo Zhou <cdluminate@gmail.com> <5723047+cdluminate@users.noreply.github.com>
+Nick Mattis <nickm970@gmail.com> <nmattis@users.noreply.github.com>
+omni <omni+vagant@hack.org> <79493359+omnivagant@users.noreply.github.com>
+Pablo Correa Gómez <ablocorrea@hotmail.com> <32678034+pablofsf@users.noreply.github.com>
+Paul Zuchowski <pzuchowski@datto.com> <31706010+PaulZ-98@users.noreply.github.com>
+Peter Ashford <ashford@accs.com> <pashford@users.noreply.github.com>
+Peter Dave Hello <hsu@peterdavehello.org> <PeterDaveHello@users.noreply.github.com>
+Peter Wirdemo <peter.wirdemo@gmail.com> <4224155+pewo@users.noreply.github.com>
+Petros Koutoupis <petros@petroskoutoupis.com> <pkoutoupis@users.noreply.github.com>
+Ping Huang <huangping@smartx.com> <101400146+hpingfs@users.noreply.github.com>
+Piotr P. Stefaniak <pstef@freebsd.org> <pstef@users.noreply.github.com>
+Richard Allen <belperite@gmail.com> <33836503+belperite@users.noreply.github.com>
+Rich Ercolani <rincebrain@gmail.com> <214141+rincebrain@users.noreply.github.com>
+Rob Wing <rob.wing@klarasystems.com> <98866084+rob-wing@users.noreply.github.com>
+Roman Strashkin <roman.strashkin@nexenta.com> <Ramzec@users.noreply.github.com>
+Ryan Hirasaki <ryanhirasaki@gmail.com> <4690732+RyanHir@users.noreply.github.com>
+Samuel Wycliffe J <samwyc@hpe.com> <115969550+samwyc@users.noreply.github.com>
+Samuel Wycliffe <samuelwycliffe@gmail.com> <50765275+npc203@users.noreply.github.com>
+Savyasachee Jha <hi@savyasacheejha.com> <savyajha@users.noreply.github.com>
+Scott Colby <scott@scolby.com> <scolby33@users.noreply.github.com>
+Sean Eric Fagan <kithrup@mac.com> <kithrup@users.noreply.github.com>
+Spencer Kinny <spencerkinny1995@gmail.com> <30333052+Spencer-Kinny@users.noreply.github.com>
+Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com> <75025422+nssrikanth@users.noreply.github.com>
+Thomas Geppert <geppi@digitx.de> <geppi@users.noreply.github.com>
+Tim Crawford <tcrawford@datto.com> <crawfxrd@users.noreply.github.com>
+Tom Matthews <tom@axiom-partners.com> <tomtastic@users.noreply.github.com>
+Tony Perkins <tperkins@datto.com> <62951051+tony-zfs@users.noreply.github.com>
+Torsten Wörtwein <twoertwein@gmail.com> <twoertwein@users.noreply.github.com>
+Tulsi Jain <tulsi.jain@delphix.com> <TulsiJain@users.noreply.github.com>
+Václav Skála <skala@vshosting.cz> <33496485+vaclavskala@users.noreply.github.com>
+Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com>
+Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com>
+Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com>
+xtouqh <xtouqh@hotmail.com> <72357159+xtouqh@users.noreply.github.com>
+Yuri Pankov <yuripv@FreeBSD.org> <113725409+yuripv@users.noreply.github.com>
+Yuri Pankov <yuripv@FreeBSD.org> <82001006+yuripv@users.noreply.github.com>
diff --git a/sys/contrib/openzfs/AUTHORS b/sys/contrib/openzfs/AUTHORS
index c2af58d75085..be1efb87b34c 100644
--- a/sys/contrib/openzfs/AUTHORS
+++ b/sys/contrib/openzfs/AUTHORS
@@ -10,228 +10,450 @@ PAST MAINTAINERS:
 CONTRIBUTORS:
 
     Aaron Fineman <abyxcos@gmail.com>
+    Adam D. Moss <c@yotes.com>
     Adam Leventhal <ahl@delphix.com>
     Adam Stevko <adam.stevko@gmail.com>
+    adisbladis <adis@blad.is>
+    Adrian Chadd <adrian@freebsd.org>
+    Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
     Ahmed G <ahmedg@delphix.com>
+    Aidan Harris <me@aidanharr.is>
+    AJ Jordan <alex@strugee.net>
+    ajs124 <git@ajs124.de>
     Akash Ayare <aayare@delphix.com>
+    Akash B <akash-b@hpe.com>
     Alan Somers <asomers@gmail.com>
     Alar Aun <spamtoaun@gmail.com>
     Albert Lee <trisk@nexenta.com>
     Alec Salazar <alec.j.salazar@gmail.com>
+    Alejandro Colomar <Colomar.6.4.3@GMail.com>
     Alejandro R. Sedeño <asedeno@mit.edu>
     Alek Pinchuk <alek@nexenta.com>
     Aleksa Sarai <cyphar@cyphar.com>
-    Alex Braunegg <alex.braunegg@gmail.com>
-    Alex McWhirter <alexmcwhirter@triadic.us>
-    Alex Reece <alex@delphix.com>
-    Alex Wilson <alex.wilson@joyent.com>
-    Alex Zhuravlev <alexey.zhuravlev@intel.com>
     Alexander Eremin <a.eremin@nexenta.com>
+    Alexander Lobakin <alobakin@pm.me>
     Alexander Motin <mav@freebsd.org>
     Alexander Pyhalov <apyhalov@gmail.com>
+    Alexander Richardson <Alexander.Richardson@cl.cam.ac.uk>
     Alexander Stetsenko <ams@nexenta.com>
+    Alex Braunegg <alex.braunegg@gmail.com>
     Alexey Shvetsov <alexxy@gentoo.org>
     Alexey Smirnoff <fling@member.fsf.org>
+    Alex John <alex@stty.io>
+    Alex McWhirter <alexmcwhirter@triadic.us>
+    Alex Reece <alex@delphix.com>
+    Alex Wilson <alex.wilson@joyent.com>
+    Alex Zhuravlev <alexey.zhuravlev@intel.com>
     Allan Jude <allanjude@freebsd.org>
+    Allen Holl <allen.m.holl@gmail.com>
+    alteriks <alteriks@gmail.com>
+    Alyssa Ross <hi@alyssa.is>
+    Ameer Hamza <ahamza@ixsystems.com>
+    Anatoly Borodin <anatoly.borodin@gmail.com>
     AndCycle <andcycle@andcycle.idv.tw>
+    Andrea Gelmini <andrea.gelmini@gelma.net>
+    Andrea Righi <andrea.righi@canonical.com>
     Andreas Buschmann <andreas.buschmann@tech.net.de>
     Andreas Dilger <adilger@intel.com>
+    Andreas Vögele <andreas@andreasvoegele.com>
     Andrew Barnes <barnes333@gmail.com>
     Andrew Hamilton <ahamilto@tjhsst.edu>
+    Andrew Innes <andrew.c12@gmail.com>
+    Andrew J. Hesford <ajh@sideband.org>
     Andrew Reid <ColdCanuck@nailedtotheperch.com>
     Andrew Stormont <andrew.stormont@nexenta.com>
+    Andrew Sun <me@andrewsun.com>
     Andrew Tselischev <andrewtselischev@gmail.com>
+    Andrew Turner <andrew@fubar.geek.nz>
+    Andrew Walker <awalker@ixsystems.com>
+    Andrey Prokopenko <job@terem.fr>
     Andrey Vesnovaty <andrey.vesnovaty@gmail.com>
     Andriy Gapon <avg@freebsd.org>
     Andy Bakun <github@thwartedefforts.org>
+    Andy Fiddaman <omnios@citrus-it.co.uk>
     Aniruddha Shankar <k@191a.net>
+    Anton Gubarkov <anton.gubarkov@gmail.com>
     Antonio Russo <antonio.e.russo@gmail.com>
     Arkadiusz Bubała <arkadiusz.bubala@open-e.com>
+    Armin Wehrfritz <dkxls23@gmail.com>
     Arne Jansen <arne@die-jansens.de>
     Aron Xu <happyaron.xu@gmail.com>
+    Arshad Hussain <arshad.hussain@aeoncomputing.com>
+    Arun KV <arun.kv@datacore.com>
+    Arvind Sankar <nivedita@alum.mit.edu>
+    Attila Fülöp <attila@fueloep.org>
+    Avatat <kontakt@avatat.pl>
     Bart Coddens <bart.coddens@gmail.com>
     Basil Crow <basil.crow@delphix.com>
-    Huang Liu <liu.huang@zte.com.cn>
+    Bassu <bassu@phi9.com>
     Ben Allen <bsallen@alcf.anl.gov>
-    Ben Rubson <ben.rubson@gmail.com>
+    Ben Cordero <bencord0@condi.me>
+    Benedikt Neuffer <github@itfriend.de>
     Benjamin Albrecht <git@albrecht.io>
+    Benjamin Gentil <benjgentil.pro@gmail.com>
+    Ben McGough <bmcgough@fredhutch.org>
+    Ben Rubson <ben.rubson@gmail.com>
+    Ben Wolsieffer <benwolsieffer@gmail.com>
+    bernie1995 <bernie.pikes@gmail.com>
     Bill McGonigle <bill-github.com-public1@bfccomputing.com>
     Bill Pijewski <wdp@joyent.com>
     Boris Protopopov <boris.protopopov@nexenta.com>
+    Brad Forschinger <github@bnjf.id.au>
     Brad Lewis <brad.lewis@delphix.com>
+    Brandon Thetford <brandon@dodecatec.com>
+    Brian Atkinson <bwa@g.clemson.edu>
     Brian Behlendorf <behlendorf1@llnl.gov>
     Brian J. Murrell <brian@sun.com>
+    Brooks Davis <brooks@one-eyed-alien.net>
+    BtbN <btbn@btbn.de>
+    bunder2015 <omfgbunder@gmail.com>
+    buzzingwires <buzzingwires@outlook.com>
+    bzzz77 <bzzz.tomas@gmail.com>
+    cable2999 <cable2999@users.noreply.github.com>
     Caleb James DeLisle <calebdelisle@lavabit.com>
     Cao Xuewen <cao.xuewen@zte.com.cn>
     Carlo Landmeter <clandmeter@gmail.com>
     Carlos Alberto Lopez Perez <clopez@igalia.com>
+    Cedric Maunoury <cedric.maunoury@gmail.com>
     Chaoyu Zhang <zhang.chaoyu@zte.com.cn>
+    Charles Suh <charles.suh@gmail.com>
     Chen Can <chen.can2@zte.com.cn>
+    Chengfei Zhu <chengfeix.zhu@intel.com>
     Chen Haiquan <oc@yunify.com>
     Chip Parker <aparker@enthought.com>
     Chris Burroughs <chris.burroughs@gmail.com>
     Chris Dunlap <cdunlap@llnl.gov>
     Chris Dunlop <chris@onthe.net.au>
+    Chris Lindee <chris.lindee+github@gmail.com>
+    Chris McDonough <chrism@plope.com>
     Chris Siden <chris.siden@delphix.com>
-    Chris Wedgwood <cw@f00f.org>
-    Chris Williamson <chris.williamson@delphix.com>
-    Chris Zubrzycki <github@mid-earth.net>
-    Christ Schlacta <aarcane@aarcane.info>
+    Chris Siebenmann <cks.github@cs.toronto.edu>
     Christer Ekholm <che@chrekh.se>
     Christian Kohlschütter <christian@kohlschutter.com>
     Christian Neukirchen <chneukirchen@gmail.com>
     Christian Schwarz <me@cschwarz.com>
     Christopher Voltz <cjunk@voltz.ws>
+    Christ Schlacta <aarcane@aarcane.info>
+    Chris Wedgwood <cw@f00f.org>
+    Chris Williamson <chris.williamson@delphix.com>
+    Chris Zubrzycki <github@mid-earth.net>
+    Chuck Tuffli <ctuffli@gmail.com>
     Chunwei Chen <david.chen@nutanix.com>
     Clemens Fruhwirth <clemens@endorphin.org>
+    Clemens Lang <cl@clang.name>
+    Clint Armstrong <clint@clintarmstrong.net>
     Coleman Kane <ckane@colemankane.org>
     Colin Ian King <colin.king@canonical.com>
+    Colm Buckley <colm@tuatha.org>
+    Crag Wang <crag0715@gmail.com>
     Craig Loomis <cloomis@astro.princeton.edu>
     Craig Sanders <github@taz.net.au>
     Cyril Plisko <cyril.plisko@infinidat.com>
-    DHE <git@dehacked.net>
+    Cy Schubert <cy@FreeBSD.org>
+    Cédric Berger <cedric@precidata.com>
+    Dacian Reece-Stremtan <dacianstremtan@gmail.com>
+    Dag-Erling Smørgrav <des@FreeBSD.org>
+    Damiano Albani <damiano.albani@gmail.com>
+    Damian Szuberski <szuberskidamian@gmail.com>
     Damian Wojsław <damian@wojslaw.pl>
+    Daniel Hiepler <d-git@coderdu.de>
+    Daniel Hoffman <dj.hoffman@delphix.com>
+    Daniel Kobras <d.kobras@science-computing.de>
+    Daniel Kolesa <daniel@octaforge.org>
+    Daniel Reichelt <hacking@nachtgeist.net>
+    Daniel Stevenson <bot@dstev.net>
+    Daniel Verite <daniel@verite.pro>
+    Daniil Lunev <d.lunev.mail@gmail.com>
     Dan Kimmel <dan.kimmel@delphix.com>
     Dan McDonald <danmcd@nexenta.com>
     Dan Swartzendruber <dswartz@druber.com>
     Dan Vatca <dan.vatca@gmail.com>
-    Daniel Hoffman <dj.hoffman@delphix.com>
-    Daniel Verite <daniel@verite.pro>
-    Daniil Lunev <d.lunev.mail@gmail.com>
     Darik Horn <dajhorn@vanadac.com>
     Dave Eddy <dave@daveeddy.com>
+    David Hedberg <david@qzx.se>
     David Lamparter <equinox@diac24.net>
     David Qian <david.qian@intel.com>
     David Quigley <david.quigley@intel.com>
     Debabrata Banerjee <dbanerje@akamai.com>
+    D. Ebdrup <debdrup@freebsd.org>
     Denys Rtveliashvili <denys@rtveliashvili.name>
     Derek Dai <daiderek@gmail.com>
+    DHE <git@dehacked.net>
+    Didier Roche <didrocks@ubuntu.com>
     Dimitri John Ledkov <xnox@ubuntu.com>
+    Dimitry Andric <dimitry@andric.com>
+    Dirkjan Bussink <d.bussink@gmail.com>
     Dmitry Khasanov <pik4ez@gmail.com>
+    Dominic Pearson <dsp@technoanimal.net>
     Dominik Hassler <hadfl@omniosce.org>
     Dominik Honnef <dominikh@fork-bomb.org>
     Don Brady <don.brady@delphix.com>
+    Doug Rabson <dfr@rabson.org>
     Dr. András Korn <korn-github.com@elan.rulez.org>
+    Dries Michiels <driesm.michiels@gmail.com>
+    Edmund Nadolski <edmund.nadolski@ixsystems.com>
+    Eitan Adler <lists@eitanadler.com>
     Eli Rosenthal <eli.rosenthal@delphix.com>
+    Eli Schwartz <eschwartz93@gmail.com>
     Eric Desrochers <eric.desrochers@canonical.com>
     Eric Dillmann <eric@jave.fr>
     Eric Schrock <Eric.Schrock@delphix.com>
+    Ethan Coe-Renner <coerenner1@llnl.gov>
     Etienne Dechamps <etienne@edechamps.fr>
+    Evan Allrich <eallrich@gmail.com>
+    Evan Harris <eharris@puremagic.com>
     Evan Susarret <evansus@gmail.com>
     Fabian Grünbichler <f.gruenbichler@proxmox.com>
+    Fabio Buso <dev.siroibaf@gmail.com>
+    Fabio Scaccabarozzi <fsvm88@gmail.com>
     Fajar A. Nugraha <github@fajar.net>
     Fan Yong <fan.yong@intel.com>
+    fbynite <fbynite@users.noreply.github.com>
+    Fedor Uporov <fuporov.vstack@gmail.com>
+    Felix Dörre <felix@dogcraft.de>
+    Felix Neumärker <xdch47@posteo.de>
     Feng Sun <loyou85@gmail.com>
+    Finix Yan <yancw@info2soft.com>
+    Francesco Mazzoli <f@mazzo.li>
     Frederik Wessels <wessels147@gmail.com>
     Frédéric Vanniere <f.vanniere@planet-work.com>
+    Gabriel A. Devenyi <gdevenyi@gmail.com>
     Garrett D'Amore <garrett@nexenta.com>
+    Garrett Fields <ghfields@gmail.com>
     Garrison Jensen <garrison.jensen@gmail.com>
     Gary Mills <gary_mills@fastmail.fm>
     Gaurav Kumar  <gauravk.18@gmail.com>
     GeLiXin <ge.lixin@zte.com.cn>
     George Amanakis <g_amanakis@yahoo.com>
+    George Diamantopoulos <georgediam@gmail.com>
+    George Gaydarov <git@gg7.io>
     George Melikov <mail@gmelikov.ru>
     George Wilson <gwilson@delphix.com>
     Georgy Yakovlev <ya@sysdump.net>
+    Gerardwx <gerardw@alum.mit.edu>
+    Gian-Carlo DeFazio <defazio1@llnl.gov>
+    Gionatan Danti <g.danti@assyoma.it>
     Giuseppe Di Natale <guss80@gmail.com>
+    Glenn Washburn <development@efficientek.com>
     Gordan Bobic <gordan@redsleeve.org>
+    Gordon Bergling <gbergling@googlemail.com>
     Gordon Ross <gwr@nexenta.com>
+    Graham Christensen <graham@grahamc.com>
+    Graham Perrin <grahamperrin@gmail.com>
     Gregor Kopka <gregor@kopka.net>
+    Gregory Bartholomew <gregory.lee.bartholomew@gmail.com>
+    grembo <freebsd@grem.de>
     Grischa Zengel <github.zfsonlinux@zengel.info>
+    grodik <pat@litke.dev>
     Gunnar Beutner <gunnar@beutner.name>
     Gvozden Neskovic <neskovic@gmail.com>
     Hajo Möller <dasjoe@gmail.com>
+    Han Gao <rabenda.cn@gmail.com>
     Hans Rosenfeld <hans.rosenfeld@nexenta.com>
+    Harald van Dijk <harald@gigawatt.nl>
+    Harry Mallon <hjmallon@gmail.com>
+    Harry Sintonen <github-piru@kyber.fi>
+    HC <mmttdebbcc@yahoo.com>
+    hedong zhang <h_d_zhang@163.com>
+    Heitor Alves de Siqueira <halves@canonical.com>
+    Henrik Riomar <henrik.riomar@gmail.com>
+    Herb Wartens <wartens2@llnl.gov>
+    Hiếu Lê <leorize+oss@disroot.org>
+    Huang Liu <liu.huang@zte.com.cn>
     Håkan Johansson <f96hajo@chalmers.se>
+    Igor K <igor@dilos.org>
     Igor Kozhukhov <ikozhukhov@gmail.com>
     Igor Lvovsky <ilvovsky@gmail.com>
+    ilbsmart <wgqimut@gmail.com>
+    illiliti <illiliti@protonmail.com>
+    ilovezfs <ilovezfs@icloud.com>
+    InsanePrawn <Insane.Prawny@gmail.com>
     Isaac Huang <he.huang@intel.com>
-    JK Dingwall <james@dingwall.me.uk>
     Jacek Fefliński <feflik@gmail.com>
+    Jacob Adams <tookmund@gmail.com>
+    Jake Howard <git@theorangeone.net>
     James Cowgill <james.cowgill@mips.com>
+    James H <james@kagisoft.co.uk>
     James Lee <jlee@thestaticvoid.com>
     James Pan <jiaming.pan@yahoo.com>
+    James Wah <james@laird-wah.net>
     Jan Engelhardt <jengelh@inai.de>
     Jan Kryl <jan.kryl@nexenta.com>
     Jan Sanislo <oystr@cs.washington.edu>
+    Jason Cohen <jwittlincohen@gmail.com>
+    Jason Harmening <jason.harmening@gmail.com>
     Jason King <jason.brian.king@gmail.com>
     Jason Zaman <jasonzaman@gmail.com>
     Javen Wu <wu.javen@gmail.com>
+    Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
+    Jeff Dike <jdike@akamai.com>
+    Jeremy Faulkner <gldisater@gmail.com>
     Jeremy Gill <jgill@parallax-innovations.com>
     Jeremy Jones <jeremy@delphix.com>
+    Jeremy Visser <jeremy.visser@gmail.com>
     Jerry Jelinek <jerry.jelinek@joyent.com>
+    Jessica Clarke <jrtc27@jrtc27.com>
     Jinshan Xiong <jinshan.xiong@intel.com>
+    Jitendra Patidar <jitendra.patidar@nutanix.com>
+    JK Dingwall <james@dingwall.me.uk>
     Joe Stein <joe.stein@delphix.com>
+    John-Mark Gurney <jmg@funkthat.com>
     John Albietz <inthecloud247@gmail.com>
     John Eismeier <john.eismeier@gmail.com>
-    John L. Hammond <john.hammond@intel.com>
+    John Gallagher <john.gallagher@delphix.com>
     John Layman <jlayman@sagecloud.com>
+    John L. Hammond <john.hammond@intel.com>
+    John M. Layman <jml@frijid.net>
+    Johnny Stenback <github@jstenback.com>
     John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+    John Poduska <jpoduska@datto.com>
+    John Ramsden <johnramsden@riseup.net>
     John Wren Kennedy <john.kennedy@delphix.com>
-    Johnny Stenback <github@jstenback.com>
+    jokersus <lolivampireslave@gmail.com>
+    Jonathon Fernyhough <jonathon@m2x.dev>
     Jorgen Lundman <lundman@lundman.net>
     Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
+    Josh Soref <jsoref@users.noreply.github.com>
     Joshua M. Clulow <josh@sysmgr.org>
+    José Luis Salvador Rufo <salvador.joseluis@gmail.com>
+    João Carlos Mendes Luís <jonny@jonny.eng.br>
+    Julian Brunner <julian.brunner@gmail.com>
+    Julian Heuking <JulianH@beckhoff.com>
+    jumbi77 <jumbi77@users.noreply.github.com>
     Justin Bedő <cu@cua0.org>
+    Justin Gottula <justin@jgottula.com>
+    Justin Hibbits <chmeeedalf@gmail.com>
+    Justin Keogh <github.com@v6y.net>
     Justin Lecher <jlec@gentoo.org>
+    Justin Scholz <git@justinscholz.de>
     Justin T. Gibbs <gibbs@FreeBSD.org>
+    jyxent <jordanp@gmail.com>
     Jörg Thalheim <joerg@higgsboson.tk>
-    KORN Andras <korn@elan.rulez.org>
+    ka7 <ka7@la-evento.com>
+    Ka Ho Ng <khng@FreeBSD.org>
     Kamil Domański <kamil@domanski.co>
     Karsten Kretschmer <kkretschmer@gmail.com>
     Kash Pande <kash@tripleback.net>
+    Kay Pedersen <christianpe96@gmail.com>
     Keith M Wesolowski <wesolows@foobazco.org>
+    KernelOfTruth <kerneloftruth@gmail.com>
+    Kevin Bowling <kevin.bowling@kev009.com>
+    Kevin Jin <lostking2008@hotmail.com>
+    Kevin P. Fleming <kevin@km6g.us>
     Kevin Tanguy <kevin.tanguy@ovh.net>
     KireinaHoro <i@jsteward.moe>
     Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
+    Kleber Tarcísio <klebertarcisio@yahoo.com.br>
+    Kody A Kantor <kody.kantor@gmail.com>
     Kohsuke Kawaguchi <kk@kohsuke.org>
+    Konstantin Khorenko <khorenko@virtuozzo.com>
+    KORN Andras <korn@elan.rulez.org>
+    Kristof Provost <github@sigsegv.be>
+    Krzysztof Piecuch <piecuch@kpiecuch.pl>
     Kyle Blatter <kyleblatter@llnl.gov>
+    Kyle Evans <kevans@FreeBSD.org>
     Kyle Fuller <inbox@kylefuller.co.uk>
-    Loli <ezomori.nozomu@gmail.com>
+    Laevos <Laevos@users.noreply.github.com>
+    Lalufu <Lalufu@users.noreply.github.com>
     Lars Johannsen <laj@it.dk>
+    Laura Hild <lsh@jlab.org>
+    Laurențiu Nicola <lnicola@dend.ro>
+    Lauri Tirkkonen <lauri@hacktheplanet.fi>
+    liaoyuxiangqin <guo.yong33@zte.com.cn>
     Li Dongyang <dongyang.li@anu.edu.au>
+    Liu Hua <liu.hua130@zte.com.cn>
+    Liu Qing <winglq@gmail.com>
     Li Wei <W.Li@Sun.COM>
+    Loli <ezomori.nozomu@gmail.com>
+    lorddoskias <lorddoskias@gmail.com>
+    Lorenz Brun <lorenz@dolansoft.org>
+    Lorenz Hüdepohl <dev@stellardeath.org>
+    louwrentius <louwrentius@gmail.com>
     Lukas Wunner <lukas@wunner.de>
+    luozhengzheng <luo.zhengzheng@zte.com.cn>
+    Luís Henriques <henrix@camandro.org>
     Madhav Suresh <madhav.suresh@delphix.com>
+    manfromafar <jonsonb10@gmail.com>
     Manoj Joseph <manoj.joseph@delphix.com>
     Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
     Marcel Huber <marcelhuberfoo@gmail.com>
+    Marcel Menzel <mail@mcl.gg>
+    Marcel Schilling <marcel.schilling@uni-luebeck.de>
     Marcel Telka <marcel.telka@nexenta.com>
     Marcel Wysocki <maci.stgn@gmail.com>
+    Marcin Skarbek <git@skarbek.name>
+    Mariusz Zaborski <mariusz.zaborski@klarasystems.com>
+    Mark Johnston <markj@FreeBSD.org>
+    Mark Maybee <mark.maybee@delphix.com>
+    Mark Roper <markroper@gmail.com>
     Mark Shellenbaum <Mark.Shellenbaum@Oracle.COM>
+    marku89 <mar42@kola.li>
     Mark Wright <markwright@internode.on.net>
     Martin Matuska <mm@FreeBSD.org>
+    Martin Rüegg <martin.rueegg@metaworx.ch>
     Massimo Maggi <me@massimo-maggi.eu>
-    Matt Johnston <matt@fugro-fsi.com.au>
-    Matt Kemp <matt@mattikus.com>
+    Mateusz Guzik <mjguzik@gmail.com>
+    Mateusz Piotrowski <0mp@FreeBSD.org>
+    Mathieu Velten <matmaul@gmail.com>
+    Matt Fiddaman <github@m.fiddaman.uk>
     Matthew Ahrens <matt@delphix.com>
     Matthew Thode <mthode@mthode.org>
+    Matthias Blankertz <matthias@blankertz.org>
+    Matt Johnston <matt@fugro-fsi.com.au>
+    Matt Kemp <matt@mattikus.com>
+    Matt Macy <mmacy@freebsd.org>
     Matus Kral <matuskral@me.com>
+    Mauricio Faria de Oliveira <mfo@canonical.com>
     Max Grossman <max.grossman@delphix.com>
     Maximilian Mehnert <maximilian.mehnert@gmx.de>
+    Max Zettlmeißl <max@zettlmeissl.de>
+    Md Islam <mdnahian@outlook.com>
+    megari <megari@iki.fi>
+    Michael D Labriola <michael.d.labriola@gmail.com>
+    Michael Franzl <michael@franzl.name>
     Michael Gebetsroither <michael@mgeb.org>
     Michael Kjorling <michael@kjorling.se>
     Michael Martin <mgmartin.mgm@gmail.com>
     Michael Niewöhner <foss@mniewoehner.de>
+    Michael Zhivich <mzhivich@akamai.com>
+    Michal Vasilek <michal@vasilek.cz>
     Mike Gerdts <mike.gerdts@joyent.com>
     Mike Harsch <mike@harschsystems.com>
     Mike Leddy <mike.leddy@gmail.com>
     Mike Swanson <mikeonthecomputer@gmail.com>
     Milan Jurik <milan.jurik@xylab.cz>
+    Minsoo Choo <minsoochoo0122@proton.me>
+    Mohamed Tawfik <m_tawfik@aucegypt.edu>
     Morgan Jones <mjones@rice.edu>
     Moritz Maxeiner <moritz@ucworks.org>
+    Mo Zhou <cdluminate@gmail.com>
+    naivekun <naivekun@outlook.com>
+    nathancheek <myself@nathancheek.com>
     Nathaniel Clark <Nathaniel.Clark@misrule.us>
     Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
+    Nathan Lewis <linux.robotdude@gmail.com>
     Nav Ravindranath <nav@delphix.com>
     Neal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
     Ned Bass <bass6@llnl.gov>
     Neependra Khare <neependra@kqinfotech.com>
     Neil Stockbridge <neil@dist.ro>
+    Nick Black <dank@qemfd.net>
     Nick Garvey <garvey.nick@gmail.com>
+    Nick Mattis <nickm970@gmail.com>
+    Nick Terrell <terrelln@fb.com>
+    Niklas Haas <github-c6e1c8@haasn.xyz>
     Nikolay Borisov <n.borisov.lkml@gmail.com>
+    nordaux <nordaux@gmail.com>
+    ofthesun9 <olivier@ofthesun.net>
     Olaf Faaland <faaland1@llnl.gov>
     Oleg Drokin <green@linuxhacker.ru>
     Oleg Stepura <oleg@stepura.com>
+    Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
+    omni <omni+vagant@hack.org>
+    Orivej Desh <orivej@gmx.fr>
+    Pablo Correa Gómez <ablocorrea@hotmail.com>
+    Palash Gandhi <pbg4930@rit.edu>
+    Patrick Mooney <pmooney@pfmooney.com>
     Patrik Greco <sikevux@sikevux.se>
     Paul B. Henson <henson@acm.org>
     Paul Dagnelie <pcd@delphix.com>
@@ -243,69 +465,160 @@ CONTRIBUTORS:
     Pedro Giffuni <pfg@freebsd.org>
     Peng <peng.hse@xtaotech.com>
     Peter Ashford <ashford@accs.com>
+    Peter Dave Hello <hsu@peterdavehello.org>
+    Peter Levine <plevine457@gmail.com>
+    Peter Wirdemo <peter.wirdemo@gmail.com>
+    Petros Koutoupis <petros@petroskoutoupis.com>
+    Philip Pokorny <ppokorny@penguincomputing.com>
+    Philipp Riederer <pt@philipptoelke.de>
+    Phil Kauffman <philip@kauffman.me>
+    Ping Huang <huangping@smartx.com>
+    Piotr Kubaj <pkubaj@anongoth.pl>
+    Piotr P. Stefaniak <pstef@freebsd.org>
     Prakash Surya <prakash.surya@delphix.com>
     Prasad Joshi <prasadjoshi124@gmail.com>
+    privb0x23 <privb0x23@users.noreply.github.com>
+    P.SCH <p88@yahoo.com>
+    Quentin Zdanis <zdanisq@gmail.com>
+    Rafael Kitover <rkitover@gmail.com>
+    RageLtMan <sempervictus@users.noreply.github.com>
     Ralf Ertzinger <ralf@skytale.net>
     Randall Mason <ClashTheBunny@gmail.com>
     Remy Blank <remy.blank@pobox.com>
+    renelson <bnelson@nelsonbe.com>
+    Reno Reckling <e-github@wthack.de>
     Ricardo M. Correia <ricardo.correia@oracle.com>
-    Rich Ercolani <rincebrain@gmail.com>
+    Riccardo Schirone <rschirone91@gmail.com>
+    Richard Allen <belperite@gmail.com>
     Richard Elling <Richard.Elling@RichardElling.com>
     Richard Laager <rlaager@wiktel.com>
     Richard Lowe <richlowe@richlowe.net>
     Richard Sharpe <rsharpe@samba.org>
     Richard Yao <ryao@gentoo.org>
+    Rich Ercolani <rincebrain@gmail.com>
+    Robert Novak <sailnfool@gmail.com>
+    Roberto Ricci <ricci@disroot.org>
+    Rob Norris <robn@despairlabs.com>
+    Rob Wing <rew@FreeBSD.org>
     Rohan Puri <rohan.puri15@gmail.com>
     Romain Dolbeau <romain.dolbeau@atos.net>
     Roman Strashkin <roman.strashkin@nexenta.com>
+    Ross Williams <ross@ross-williams.net>
     Ruben Kerkhof <ruben@rubenkerkhof.com>
+    Ryan Hirasaki <ryanhirasaki@gmail.com>
+    Ryan Lahfa <masterancpp@gmail.com>
+    Ryan Libby <rlibby@FreeBSD.org>
+    Ryan Moeller <freqlabs@FreeBSD.org>
+    Sam Hathaway <github.com@munkynet.org>
+    Sam Lunt <samuel.j.lunt@gmail.com>
+    Samuel VERSCHELDE <stormi-github@ylix.fr>
+    Samuel Wycliffe <samuelwycliffe@gmail.com>
+    Samuel Wycliffe J <samwyc@hpe.com>
+    Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com>
+    Sara Hartse <sara.hartse@delphix.com>
     Saso Kiselkov <saso.kiselkov@nexenta.com>
+    Satadru Pramanik <satadru@gmail.com>
+    Savyasachee Jha <genghizkhan91@hawkradius.com>
+    Scott Colby <scott@scolby.com>
     Scot W. Stevenson <scot.stevenson@gmail.com>
     Sean Eric Fagan <sef@ixsystems.com>
     Sebastian Gottschall <s.gottschall@dd-wrt.com>
+    Sebastien Roy <seb@delphix.com>
     Sen Haerens <sen@senhaerens.be>
     Serapheim Dimitropoulos <serapheim@delphix.com>
     Seth Forshee <seth.forshee@canonical.com>
+    Shaan Nobee <sniper111@gmail.com>
     Shampavman <sham.pavman@nexenta.com>
+    Shaun Tancheff <shaun@aeonazure.com>
     Shen Yan <shenyanxxxy@qq.com>
     Simon Guest <simon.guest@tesujimath.org>
     Simon Klinkert <simon.klinkert@gmail.com>
     Sowrabha Gopal <sowrabha.gopal@delphix.com>
+    Spencer Kinny <spencerkinny1995@gmail.com>
+    Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com>
     Stanislav Seletskiy <s.seletskiy@gmail.com>
     Steffen Müthing <steffen.muething@iwr.uni-heidelberg.de>
     Stephen Blinick <stephen.blinick@delphix.com>
+    sterlingjensen <sterlingjensen@users.noreply.github.com>
     Steve Dougherty <sdougherty@barracuda.com>
+    Steve Mokris <smokris@softpixel.com>
     Steven Burgess <sburgess@dattobackup.com>
     Steven Hartland <smh@freebsd.org>
     Steven Johnson <sjohnson@sakuraindustries.com>
+    Steven Noonan <steven@uplinklabs.net>
+    stf <s@ctrlc.hu>
     Stian Ellingsen <stian@plaimi.net>
+    Stoiko Ivanov <github@nomore.at>
+    Stéphane Lesimple <speed47_github@speed47.net>
     Suman Chakravartula <schakrava@gmail.com>
     Sydney Vanda <sydney.m.vanda@intel.com>
     Sören Tempel <soeren+git@soeren-tempel.net>
+    Tamas TEVESZ <ice@extreme.hu>
+    Teodor Spæren <teodor_spaeren@riseup.net>
+    TerraTech <TerraTech@users.noreply.github.com>
     Thijs Cramer <thijs.cramer@gmail.com>
+    Thomas Geppert <geppi@digitx.de>
+    Thomas Lamprecht <guggentom@hotmail.de>
+    Till Maas <opensource@till.name>
     Tim Chase <tim@chase2k.com>
     Tim Connors <tconnors@rather.puzzling.org>
     Tim Crawford <tcrawford@datto.com>
     Tim Haley <Tim.Haley@Sun.COM>
+    timor <timor.dd@googlemail.com>
+    Timothy Day <tday141@gmail.com>
+    Tim Schumacher <timschumi@gmx.de>
     Tino Reichardt <milky-zfs@mcmilk.de>
     Tobin Harding <me@tobin.cc>
     Tom Caputi <tcaputi@datto.com>
     Tom Matthews <tom@axiom-partners.com>
-    Tom Prince <tom.prince@ualberta.net>
     Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
+    Tom Prince <tom.prince@ualberta.net>
     Tony Hutter <hutter2@llnl.gov>
+    Tony Nguyen <tony.nguyen@delphix.com>
+    Tony Perkins <tperkins@datto.com>
     Toomas Soome <tsoome@me.com>
+    Torsten Wörtwein <twoertwein@gmail.com>
+    Toyam Cox <aviator45003@gmail.com>
+    Trevor Bautista <trevrb@trevrb.net>
     Trey Dockendorf <treydock@gmail.com>
+    Troels Nørgaard <tnn@tradeshift.com>
+    Tulsi Jain <tulsi.jain@delphix.com>
     Turbo Fredriksson <turbo@bayour.com>
     Tyler J. Stachecki <stachecki.tyler@gmail.com>
+    Umer Saleem <usaleem@ixsystems.com>
+    Valmiky Arquissandas <kayvlim@gmail.com>
+    Val Packett <val@packett.cool>
+    Vince van Oosten <techhazard@codeforyouand.me>
+    Violet Purcell <vimproved@inventati.org>
+    Vipin Kumar Verma <vipin.verma@hpe.com>
     Vitaut Bajaryn <vitaut.bayaryn@gmail.com>
+    Volker Mauel <volkermauel@gmail.com>
+    Václav Skála <skala@vshosting.cz>
+    Walter Huf <hufman@gmail.com>
+    Warner Losh <imp@bsdimp.com>
     Weigang Li <weigang.li@intel.com>
+    WHR <msl0000023508@gmail.com>
     Will Andrews <will@freebsd.org>
     Will Rouesnel <w.rouesnel@gmail.com>
+    Windel Bouwman <windel@windel.nl>
+    Wojciech Małota-Wójcik <outofforest@users.noreply.github.com>
     Wolfgang Bumiller <w.bumiller@proxmox.com>
     Xin Li <delphij@FreeBSD.org>
+    Xinliang Liu <xinliang.liu@linaro.org>
+    xtouqh <xtouqh@hotmail.com>
+    Yann Collet <cyan@fb.com>
+    Yanping Gao <yanping.gao@xtaotech.com>
     Ying Zhu <casualfisher@gmail.com>
+    Youzhong Yang <youzhong@gmail.com>
+    yparitcher <y@paritcher.com>
+    yuina822 <ayuichi@club.kyutech.ac.jp>
     YunQiang Su <syq@debian.org>
     Yuri Pankov <yuri.pankov@gmail.com>
     Yuxuan Shui <yshuiv7@gmail.com>
     Zachary Bedell <zac@thebedells.org>
+    Zach Dykstra <dykstra.zachary@gmail.com>
+    zgock <zgock@nuc.base.zgock-lab.net>
+    Zhu Chuang <chuang@melty.land>
+    Érico Nogueira <erico.erc@gmail.com>
+    Đoàn Trần Công Danh <congdanhqx@gmail.com>
+    韩朴宇 <w12101111@gmail.com>
diff --git a/sys/contrib/openzfs/cmd/zdb/zdb.c b/sys/contrib/openzfs/cmd/zdb/zdb.c
index 87499cdc95cb..b39a0e8825fb 100644
--- a/sys/contrib/openzfs/cmd/zdb/zdb.c
+++ b/sys/contrib/openzfs/cmd/zdb/zdb.c
@@ -5179,7 +5179,7 @@ dump_label(const char *dev)
 			if (nvlist_size(config, &size, NV_ENCODE_XDR) != 0)
 				size = buflen;
 
-			/* If the device is a cache device clear the header. */
+			/* If the device is a cache device read the header. */
 			if (!read_l2arc_header) {
 				if (nvlist_lookup_uint64(config,
 				    ZPOOL_CONFIG_POOL_STATE, &l2cache) == 0 &&
diff --git a/sys/contrib/openzfs/cmd/zfs/zfs_main.c b/sys/contrib/openzfs/cmd/zfs/zfs_main.c
index 21fd02ff9782..da9b2e583d7a 100644
--- a/sys/contrib/openzfs/cmd/zfs/zfs_main.c
+++ b/sys/contrib/openzfs/cmd/zfs/zfs_main.c
@@ -339,7 +339,7 @@ get_usage(zfs_help_t idx)
 		    "\tsend [-nVvPe] -t <receive_resume_token>\n"
 		    "\tsend [-PnVv] --saved filesystem\n"));
 	case HELP_SET:
-		return (gettext("\tset <property=value> ... "
+		return (gettext("\tset [-u] <property=value> ... "
 		    "<filesystem|volume|snapshot> ...\n"));
 	case HELP_SHARE:
 		return (gettext("\tshare [-l] <-a [nfs|smb] | filesystem>\n"));
@@ -4206,8 +4206,8 @@ zfs_do_rollback(int argc, char **argv)
 static int
 set_callback(zfs_handle_t *zhp, void *data)
 {
-	nvlist_t *props = data;
-	int ret = zfs_prop_set_list(zhp, props);
+	zprop_set_cbdata_t *cb = data;
+	int ret = zfs_prop_set_list_flags(zhp, cb->cb_proplist, cb->cb_flags);
 
 	if (ret != 0 || libzfs_errno(g_zfs) != EZFS_SUCCESS) {
 		switch (libzfs_errno(g_zfs)) {
@@ -4227,25 +4227,35 @@ set_callback(zfs_handle_t *zhp, void *data)
 static int
 zfs_do_set(int argc, char **argv)
 {
-	nvlist_t *props = NULL;
+	zprop_set_cbdata_t cb = { 0 };
 	int ds_start = -1; /* argv idx of first dataset arg */
 	int ret = 0;
-	int i;
+	int i, c;
 
-	/* check for options */
-	if (argc > 1 && argv[1][0] == '-') {
-		(void) fprintf(stderr, gettext("invalid option '%c'\n"),
-		    argv[1][1]);
-		usage(B_FALSE);
+	/* check options */
+	while ((c = getopt(argc, argv, "u")) != -1) {
+		switch (c) {
+		case 'u':
+			cb.cb_flags |= ZFS_SET_NOMOUNT;
+			break;
+		case '?':
+		default:
+			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
+			    optopt);
+			usage(B_FALSE);
+		}
 	}
 
+	argc -= optind;
+	argv += optind;
+
 	/* check number of arguments */
-	if (argc < 2) {
+	if (argc < 1) {
 		(void) fprintf(stderr, gettext("missing arguments\n"));
 		usage(B_FALSE);
 	}
-	if (argc < 3) {
-		if (strchr(argv[1], '=') == NULL) {
+	if (argc < 2) {
+		if (strchr(argv[0], '=') == NULL) {
 			(void) fprintf(stderr, gettext("missing property=value "
 			    "argument(s)\n"));
 		} else {
@@ -4256,7 +4266,7 @@ zfs_do_set(int argc, char **argv)
 	}
 
 	/* validate argument order:  prop=val args followed by dataset args */
-	for (i = 1; i < argc; i++) {
+	for (i = 0; i < argc; i++) {
 		if (strchr(argv[i], '=') != NULL) {
 			if (ds_start > 0) {
 				/* out-of-order prop=val argument */
@@ -4274,20 +4284,20 @@ zfs_do_set(int argc, char **argv)
 	}
 
 	/* Populate a list of property settings */
-	if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
+	if (nvlist_alloc(&cb.cb_proplist, NV_UNIQUE_NAME, 0) != 0)
 		nomem();
-	for (i = 1; i < ds_start; i++) {
-		if (!parseprop(props, argv[i])) {
+	for (i = 0; i < ds_start; i++) {
+		if (!parseprop(cb.cb_proplist, argv[i])) {
 			ret = -1;
 			goto error;
 		}
 	}
 
 	ret = zfs_for_each(argc - ds_start, argv + ds_start, 0,
-	    ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, props);
+	    ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb);
 
 error:
-	nvlist_free(props);
+	nvlist_free(cb.cb_proplist);
 	return (ret);
 }
 
diff --git a/sys/contrib/openzfs/cmd/zpool/zpool_main.c b/sys/contrib/openzfs/cmd/zpool/zpool_main.c
index d64fdfa5ba4c..5507f9d3fd67 100644
--- a/sys/contrib/openzfs/cmd/zpool/zpool_main.c
+++ b/sys/contrib/openzfs/cmd/zpool/zpool_main.c
@@ -3122,12 +3122,21 @@ zfs_force_import_required(nvlist_t *config)
 	nvlist_t *nvinfo;
 
 	state = fnvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE);
-	(void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, &hostid);
+	nvinfo = fnvlist_lookup_nvlist(config, ZPOOL_CONFIG_LOAD_INFO);
+
+	/*
+	 * The hostid on LOAD_INFO comes from the MOS label via
+	 * spa_tryimport(). If its not there then we're likely talking to an
+	 * older kernel, so use the top one, which will be from the label
+	 * discovered in zpool_find_import(), or if a cachefile is in use, the
+	 * local hostid.
+	 */
+	if (nvlist_lookup_uint64(nvinfo, ZPOOL_CONFIG_HOSTID, &hostid) != 0)
+		nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, &hostid);
 
 	if (state != POOL_STATE_EXPORTED && hostid != get_system_hostid())
 		return (B_TRUE);
 
-	nvinfo = fnvlist_lookup_nvlist(config, ZPOOL_CONFIG_LOAD_INFO);
 	if (nvlist_exists(nvinfo, ZPOOL_CONFIG_MMP_STATE)) {
 		mmp_state_t mmp_state = fnvlist_lookup_uint64(nvinfo,
 		    ZPOOL_CONFIG_MMP_STATE);
@@ -3198,7 +3207,10 @@ do_import(nvlist_t *config, const char *newname, const char *mntopts,
 			time_t timestamp = 0;
 			uint64_t hostid = 0;
 
-			if (nvlist_exists(config, ZPOOL_CONFIG_HOSTNAME))
+			if (nvlist_exists(nvinfo, ZPOOL_CONFIG_HOSTNAME))
+				hostname = fnvlist_lookup_string(nvinfo,
+				    ZPOOL_CONFIG_HOSTNAME);
+			else if (nvlist_exists(config, ZPOOL_CONFIG_HOSTNAME))
 				hostname = fnvlist_lookup_string(config,
 				    ZPOOL_CONFIG_HOSTNAME);
 
@@ -3206,7 +3218,10 @@ do_import(nvlist_t *config, const char *newname, const char *mntopts,
 				timestamp = fnvlist_lookup_uint64(config,
 				    ZPOOL_CONFIG_TIMESTAMP);
 
-			if (nvlist_exists(config, ZPOOL_CONFIG_HOSTID))
+			if (nvlist_exists(nvinfo, ZPOOL_CONFIG_HOSTID))
+				hostid = fnvlist_lookup_uint64(nvinfo,
+				    ZPOOL_CONFIG_HOSTID);
+			else if (nvlist_exists(config, ZPOOL_CONFIG_HOSTID))
 				hostid = fnvlist_lookup_uint64(config,
 				    ZPOOL_CONFIG_HOSTID);
 
diff --git a/sys/contrib/openzfs/config/zfs-build.m4 b/sys/contrib/openzfs/config/zfs-build.m4
index 2703e6c016c4..5f36569fe25b 100644
--- a/sys/contrib/openzfs/config/zfs-build.m4
+++ b/sys/contrib/openzfs/config/zfs-build.m4
@@ -358,6 +358,9 @@ AC_DEFUN([ZFS_AC_RPM], [
 	AS_IF([test -n "$udevruledir" ], [
 		RPM_DEFINE_UTIL=${RPM_DEFINE_UTIL}' --define "_udevruledir $(udevruledir)"'
 	])
+	AS_IF([test -n "$bashcompletiondir" ], [
+		RPM_DEFINE_UTIL=${RPM_DEFINE_UTIL}' --define "_bashcompletiondir $(bashcompletiondir)"'
+	])
 	RPM_DEFINE_UTIL=${RPM_DEFINE_UTIL}' $(DEFINE_SYSTEMD)'
 	RPM_DEFINE_UTIL=${RPM_DEFINE_UTIL}' $(DEFINE_PYZFS)'
 	RPM_DEFINE_UTIL=${RPM_DEFINE_UTIL}' $(DEFINE_PAM)'
@@ -617,6 +620,18 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
 		AC_MSG_RESULT([no])
 	fi
 	AC_SUBST(RPM_DEFINE_INITRAMFS)
+
+	AC_MSG_CHECKING([default bash completion directory])
+	case "$VENDOR" in
+		ubuntu)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
+		debian)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
+		freebsd)    bashcompletiondir=$sysconfdir/bash_completion.d;;
+		gentoo)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
+		*)          bashcompletiondir=/etc/bash_completion.d   ;;
+	esac
+	AC_MSG_RESULT([$bashcompletiondir])
+	AC_SUBST(bashcompletiondir)
+
 ])
 
 dnl #
diff --git a/sys/contrib/openzfs/contrib/bash_completion.d/Makefile.am b/sys/contrib/openzfs/contrib/bash_completion.d/Makefile.am
index dc4b610c42b8..1ec05ed73d2d 100644
--- a/sys/contrib/openzfs/contrib/bash_completion.d/Makefile.am
+++ b/sys/contrib/openzfs/contrib/bash_completion.d/Makefile.am
@@ -1,5 +1,3 @@
-bashcompletiondir = $(sysconfdir)/bash_completion.d
-
 nodist_bashcompletion_DATA  = %D%/zfs
 SUBSTFILES                 += $(nodist_bashcompletion_DATA)
 
diff --git a/sys/contrib/openzfs/contrib/debian/control b/sys/contrib/openzfs/contrib/debian/control
index b9bb23b09ba0..f4e97fe16145 100644
--- a/sys/contrib/openzfs/contrib/debian/control
+++ b/sys/contrib/openzfs/contrib/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: ZFS on Linux specific mailing list <zfs-discuss@list.zfsonlinux.org>
 Build-Depends: debhelper-compat (= 12),
                dh-python,
-               dkms (>> 2.1.1.2-5),
+               dh-sequence-dkms | dkms (>> 2.1.1.2-5),
                libaio-dev,
                libblkid-dev,
                libcurl4-openssl-dev,
diff --git a/sys/contrib/openzfs/contrib/debian/openzfs-zfsutils.install b/sys/contrib/openzfs/contrib/debian/openzfs-zfsutils.install
index e2ce5084c095..741014398ade 100644
--- a/sys/contrib/openzfs/contrib/debian/openzfs-zfsutils.install
+++ b/sys/contrib/openzfs/contrib/debian/openzfs-zfsutils.install
@@ -1,7 +1,6 @@
 etc/default/zfs
 etc/zfs/zfs-functions
 etc/zfs/zpool.d/
-etc/bash_completion.d/zfs
 lib/systemd/system-generators/
 lib/systemd/system-preset/
 lib/systemd/system/zfs-import-cache.service
diff --git a/sys/contrib/openzfs/contrib/debian/rules.in b/sys/contrib/openzfs/contrib/debian/rules.in
index f0791cfabd38..a3a05efacb50 100755
--- a/sys/contrib/openzfs/contrib/debian/rules.in
+++ b/sys/contrib/openzfs/contrib/debian/rules.in
@@ -71,10 +71,6 @@ override_dh_auto_install:
 	@# Install the utilities.
 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 
-	# Use upstream's bash completion
-	install -D -t '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/' \
-		'$(CURDIR)/contrib/bash_completion.d/zfs'
-
 	# Move from bin_dir to /usr/sbin
 	# Remove suffix (.py) as per policy 10.4 - Scripts
 	# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
@@ -136,7 +132,6 @@ override_dh_auto_install:
 
 	chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
 	chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
-	chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
 
 override_dh_python3:
 	dh_python3 -p openzfs-python3-pyzfs
diff --git a/sys/contrib/openzfs/include/libzfs.h b/sys/contrib/openzfs/include/libzfs.h
index 0b5501bbe39f..4adfa38e87be 100644
--- a/sys/contrib/openzfs/include/libzfs.h
+++ b/sys/contrib/openzfs/include/libzfs.h
@@ -532,6 +532,7 @@ _LIBZFS_H nvlist_t *zfs_valid_proplist(libzfs_handle_t *, zfs_type_t,
 _LIBZFS_H const char *zfs_prop_to_name(zfs_prop_t);
 _LIBZFS_H int zfs_prop_set(zfs_handle_t *, const char *, const char *);
 _LIBZFS_H int zfs_prop_set_list(zfs_handle_t *, nvlist_t *);
+_LIBZFS_H int zfs_prop_set_list_flags(zfs_handle_t *, nvlist_t *, int);
 _LIBZFS_H int zfs_prop_get(zfs_handle_t *, zfs_prop_t, char *, size_t,
     zprop_source_t *, char *, size_t, boolean_t);
 _LIBZFS_H int zfs_prop_get_recvd(zfs_handle_t *, const char *, char *, size_t,
@@ -654,6 +655,13 @@ typedef struct zprop_get_cbdata {
 	vdev_cbdata_t cb_vdevs;
 } zprop_get_cbdata_t;
 
+#define	ZFS_SET_NOMOUNT		1
+
+typedef struct zprop_set_cbdata {
+	int cb_flags;
+	nvlist_t *cb_proplist;
+} zprop_set_cbdata_t;
+
 _LIBZFS_H void zprop_print_one_property(const char *, zprop_get_cbdata_t *,
     const char *, const char *, zprop_source_t, const char *,
     const char *);
diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/ctype.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/ctype.h
index 201fa95550e3..b9ca0f8ef2c4 100644
--- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/ctype.h
+++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/ctype.h
@@ -39,6 +39,6 @@
 		((C) >= 0x3A && (C) <= 0x40) ||				\
 		((C) >= 0x5B && (C) <= 0x60) ||				\
 		((C) >= 0x7B && (C) <= 0x7E))
-#define isspace(C)	((C) == 0x20 || ((C) >= 0x9 && (C) <= 0xD))
+#define	isspace(C)	((C) == 0x20 || ((C) >= 0x9 && (C) <= 0xD))
 
 #endif
diff --git a/sys/contrib/openzfs/include/os/linux/zfs/sys/trace_arc.h b/sys/contrib/openzfs/include/os/linux/zfs/sys/trace_arc.h
index c494f48bb48b..f749223daa72 100644
--- a/sys/contrib/openzfs/include/os/linux/zfs/sys/trace_arc.h
+++ b/sys/contrib/openzfs/include/os/linux/zfs/sys/trace_arc.h
@@ -51,7 +51,6 @@ DECLARE_EVENT_CLASS(zfs_arc_buf_hdr_class,
 	    __array(uint64_t,		hdr_dva_word, 2)
 	    __field(uint64_t,		hdr_birth)
 	    __field(uint32_t,		hdr_flags)
-	    __field(uint32_t,		hdr_bufcnt)
 	    __field(arc_buf_contents_t,	hdr_type)
 	    __field(uint16_t,		hdr_psize)
 	    __field(uint16_t,		hdr_lsize)
@@ -70,7 +69,6 @@ DECLARE_EVENT_CLASS(zfs_arc_buf_hdr_class,
 	    __entry->hdr_dva_word[1]	= ab->b_dva.dva_word[1];
 	    __entry->hdr_birth		= ab->b_birth;
 	    __entry->hdr_flags		= ab->b_flags;
-	    __entry->hdr_bufcnt	= ab->b_l1hdr.b_bufcnt;
 	    __entry->hdr_psize		= ab->b_psize;
 	    __entry->hdr_lsize		= ab->b_lsize;
 	    __entry->hdr_spa		= ab->b_spa;
@@ -84,12 +82,12 @@ DECLARE_EVENT_CLASS(zfs_arc_buf_hdr_class,
 	    __entry->hdr_refcount	= ab->b_l1hdr.b_refcnt.rc_count;
 	),
 	TP_printk("hdr { dva 0x%llx:0x%llx birth %llu "
-	    "flags 0x%x bufcnt %u type %u psize %u lsize %u spa %llu "
+	    "flags 0x%x type %u psize %u lsize %u spa %llu "
 	    "state_type %u access %lu mru_hits %u mru_ghost_hits %u "
 	    "mfu_hits %u mfu_ghost_hits %u l2_hits %u refcount %lli }",
 	    __entry->hdr_dva_word[0], __entry->hdr_dva_word[1],
 	    __entry->hdr_birth, __entry->hdr_flags,
-	    __entry->hdr_bufcnt, __entry->hdr_type, __entry->hdr_psize,
+	    __entry->hdr_type, __entry->hdr_psize,
 	    __entry->hdr_lsize, __entry->hdr_spa, __entry->hdr_state_type,
 	    __entry->hdr_access, __entry->hdr_mru_hits,
 	    __entry->hdr_mru_ghost_hits, __entry->hdr_mfu_hits,
@@ -192,7 +190,6 @@ DECLARE_EVENT_CLASS(zfs_arc_miss_class,
 	    __array(uint64_t,		hdr_dva_word, 2)
 	    __field(uint64_t,		hdr_birth)
 	    __field(uint32_t,		hdr_flags)
-	    __field(uint32_t,		hdr_bufcnt)
 	    __field(arc_buf_contents_t,	hdr_type)
 	    __field(uint16_t,		hdr_psize)
 	    __field(uint16_t,		hdr_lsize)
@@ -223,7 +220,6 @@ DECLARE_EVENT_CLASS(zfs_arc_miss_class,
 	    __entry->hdr_dva_word[1]	= hdr->b_dva.dva_word[1];
 	    __entry->hdr_birth		= hdr->b_birth;
 	    __entry->hdr_flags		= hdr->b_flags;
-	    __entry->hdr_bufcnt		= hdr->b_l1hdr.b_bufcnt;
 	    __entry->hdr_psize		= hdr->b_psize;
 	    __entry->hdr_lsize		= hdr->b_lsize;
 	    __entry->hdr_spa		= hdr->b_spa;
@@ -255,7 +251,7 @@ DECLARE_EVENT_CLASS(zfs_arc_miss_class,
 	    __entry->zb_blkid		= zb->zb_blkid;
 	),
 	TP_printk("hdr { dva 0x%llx:0x%llx birth %llu "
-	    "flags 0x%x bufcnt %u psize %u lsize %u spa %llu state_type %u "
+	    "flags 0x%x psize %u lsize %u spa %llu state_type %u "
 	    "access %lu mru_hits %u mru_ghost_hits %u mfu_hits %u "
 	    "mfu_ghost_hits %u l2_hits %u refcount %lli } "
 	    "bp { dva0 0x%llx:0x%llx dva1 0x%llx:0x%llx dva2 "
@@ -264,7 +260,7 @@ DECLARE_EVENT_CLASS(zfs_arc_miss_class,
 	    "blkid %llu }",
 	    __entry->hdr_dva_word[0], __entry->hdr_dva_word[1],
 	    __entry->hdr_birth, __entry->hdr_flags,
-	    __entry->hdr_bufcnt, __entry->hdr_psize, __entry->hdr_lsize,
+	    __entry->hdr_psize, __entry->hdr_lsize,
 	    __entry->hdr_spa, __entry->hdr_state_type, __entry->hdr_access,
 	    __entry->hdr_mru_hits, __entry->hdr_mru_ghost_hits,
 	    __entry->hdr_mfu_hits, __entry->hdr_mfu_ghost_hits,
diff --git a/sys/contrib/openzfs/include/os/linux/zfs/sys/trace_dbuf.h b/sys/contrib/openzfs/include/os/linux/zfs/sys/trace_dbuf.h
index 11d25be35bc4..0f6a98b47d60 100644
--- a/sys/contrib/openzfs/include/os/linux/zfs/sys/trace_dbuf.h
+++ b/sys/contrib/openzfs/include/os/linux/zfs/sys/trace_dbuf.h
@@ -60,8 +60,12 @@
 
 #define	DBUF_TP_FAST_ASSIGN						\
 	if (db != NULL) {						\
-		__assign_str(os_spa,					\
-		spa_name(DB_DNODE(db)->dn_objset->os_spa));		\
+		if (POINTER_IS_VALID(DB_DNODE(db)->dn_objset)) {	\
+			__assign_str(os_spa,				\
+			spa_name(DB_DNODE(db)->dn_objset->os_spa));	\
+		} else {						\
+			__assign_str(os_spa, "NULL");			\
+		}							\
 									\
 		__entry->ds_object = db->db_objset->os_dsl_dataset ?	\
 		db->db_objset->os_dsl_dataset->ds_object : 0;		\
diff --git a/sys/contrib/openzfs/include/sys/arc_impl.h b/sys/contrib/openzfs/include/sys/arc_impl.h
index 78774792f367..adff42c55d05 100644
--- a/sys/contrib/openzfs/include/sys/arc_impl.h
+++ b/sys/contrib/openzfs/include/sys/arc_impl.h
@@ -159,10 +159,6 @@ struct arc_write_callback {
  * these two allocation states.
  */
 typedef struct l1arc_buf_hdr {
-	/* for waiting on reads to complete */
-	kcondvar_t		b_cv;
-	uint8_t			b_byteswap;
-
 	/* protected by arc state mutex */
 	arc_state_t		*b_state;
 	multilist_node_t	b_arc_node;
@@ -173,7 +169,7 @@ typedef struct l1arc_buf_hdr {
 	uint32_t		b_mru_ghost_hits;
 	uint32_t		b_mfu_hits;
 	uint32_t		b_mfu_ghost_hits;
-	uint32_t		b_bufcnt;
+	uint8_t			b_byteswap;
 	arc_buf_t		*b_buf;
 
 	/* self protecting */
@@ -436,12 +432,12 @@ typedef struct l2arc_dev {
  */
 typedef struct arc_buf_hdr_crypt {
 	abd_t			*b_rabd;	/* raw encrypted data */
-	dmu_object_type_t	b_ot;		/* object type */
-	uint32_t		b_ebufcnt;	/* count of encrypted buffers */
 
 	/* dsobj for looking up encryption key for l2arc encryption */
 	uint64_t		b_dsobj;
 
+	dmu_object_type_t	b_ot;		/* object type */
+
 	/* encryption parameters */
 	uint8_t			b_salt[ZIO_DATA_SALT_LEN];
 	uint8_t			b_iv[ZIO_DATA_IV_LEN];
diff --git a/sys/contrib/openzfs/include/sys/metaslab_impl.h b/sys/contrib/openzfs/include/sys/metaslab_impl.h
index d328068890cc..4f434291ddbf 100644
--- a/sys/contrib/openzfs/include/sys/metaslab_impl.h
+++ b/sys/contrib/openzfs/include/sys/metaslab_impl.h
@@ -250,7 +250,6 @@ struct metaslab_group {
 	int64_t			mg_activation_count;
 	metaslab_class_t	*mg_class;
 	vdev_t			*mg_vd;
-	taskq_t			*mg_taskq;
 	metaslab_group_t	*mg_prev;
 	metaslab_group_t	*mg_next;
 
diff --git a/sys/contrib/openzfs/include/sys/spa_impl.h b/sys/contrib/openzfs/include/sys/spa_impl.h
index 1a04bedc3137..094258d47a48 100644
--- a/sys/contrib/openzfs/include/sys/spa_impl.h
+++ b/sys/contrib/openzfs/include/sys/spa_impl.h
@@ -424,7 +424,9 @@ struct spa {
 
 	hrtime_t	spa_ccw_fail_time;	/* Conf cache write fail time */
 	taskq_t		*spa_zvol_taskq;	/* Taskq for minor management */
+	taskq_t		*spa_metaslab_taskq;	/* Taskq for metaslab preload */
 	taskq_t		*spa_prefetch_taskq;	/* Taskq for prefetch threads */
+	taskq_t		*spa_upgrade_taskq;	/* Taskq for upgrade jobs */
 	uint64_t	spa_multihost;		/* multihost aware (mmp) */
 	mmp_thread_t	spa_mmp;		/* multihost mmp thread */
 	list_t		spa_leaf_list;		/* list of leaf vdevs */
@@ -448,8 +450,6 @@ struct spa {
 	 */
 	spa_config_lock_t spa_config_lock[SCL_LOCKS]; /* config changes */
 	zfs_refcount_t	spa_refcount;		/* number of opens */
-
-	taskq_t		*spa_upgrade_taskq;	/* taskq for upgrade jobs */
 };
 
 extern char *spa_config_path;
diff --git a/sys/contrib/openzfs/lib/libzfs/libzfs.abi b/sys/contrib/openzfs/lib/libzfs/libzfs.abi
index 907b0191f75b..c1ce3d0f67d8 100644
--- a/sys/contrib/openzfs/lib/libzfs/libzfs.abi
+++ b/sys/contrib/openzfs/lib/libzfs/libzfs.abi
@@ -396,6 +396,7 @@
     <elf-symbol name='zfs_prop_readonly' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfs_prop_set' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfs_prop_set_list' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zfs_prop_set_list_flags' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfs_prop_setonce' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfs_prop_string_to_index' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfs_prop_to_name' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -4428,6 +4429,12 @@
       <parameter type-id='5ce45b60' name='props'/>
       <return type-id='95e97e5e'/>
     </function-decl>
+    <function-decl name='zfs_prop_set_list_flags' mangled-name='zfs_prop_set_list_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_prop_set_list_flags'>
+      <parameter type-id='9200a744' name='zhp'/>
+      <parameter type-id='5ce45b60' name='props'/>
+      <parameter type-id='95e97e5e' name='flags'/>
+      <return type-id='95e97e5e'/>
+    </function-decl>
     <function-decl name='zfs_prop_inherit' mangled-name='zfs_prop_inherit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_prop_inherit'>
       <parameter type-id='9200a744' name='zhp'/>
       <parameter type-id='80f4b756' name='propname'/>
diff --git a/sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c b/sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c
index efe1c0c06035..4db1cbce9568 100644
--- a/sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c
+++ b/sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c
@@ -105,6 +105,15 @@ changelist_prefix(prop_changelist_t *clp)
 	    clp->cl_prop != ZFS_PROP_SHARESMB)
 		return (0);
 
+	/*
+	 * If CL_GATHER_DONT_UNMOUNT is set, don't want to unmount/unshare and
+	 * later (re)mount/(re)share the filesystem in postfix phase, so we
+	 * return from here. If filesystem is mounted or unmounted, leave it
+	 * as it is.
+	 */
+	if (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT)
+		return (0);
+
 	if ((walk = uu_avl_walk_start(clp->cl_tree, UU_WALK_ROBUST)) == NULL)
 		return (-1);
 
@@ -129,8 +138,6 @@ changelist_prefix(prop_changelist_t *clp)
 			 */
 			switch (clp->cl_prop) {
 			case ZFS_PROP_MOUNTPOINT:
-				if (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT)
-					break;
 				if (zfs_unmount(cn->cn_handle, NULL,
 				    clp->cl_mflags) != 0) {
 					ret = -1;
@@ -164,9 +171,8 @@ changelist_prefix(prop_changelist_t *clp)
  * reshare the filesystems as necessary.  In changelist_gather() we recorded
  * whether the filesystem was previously shared or mounted.  The action we take
  * depends on the previous state, and whether the value was previously 'legacy'.
- * For non-legacy properties, we only remount/reshare the filesystem if it was
- * previously mounted/shared.  Otherwise, we always remount/reshare the
- * filesystem.
+ * For non-legacy properties, we always remount/reshare the filesystem,
+ * if CL_GATHER_DONT_UNMOUNT is not set.
  */
 int
 changelist_postfix(prop_changelist_t *clp)
@@ -177,6 +183,14 @@ changelist_postfix(prop_changelist_t *clp)
 	boolean_t commit_smb_shares = B_FALSE;
 	boolean_t commit_nfs_shares = B_FALSE;
 
+	/*
+	 * If CL_GATHER_DONT_UNMOUNT is set, it means we don't want to (un)mount
+	 * or (re/un)share the filesystem, so we return from here. If filesystem
+	 * is mounted or unmounted, leave it as it is.
+	 */
+	if (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT)
+		return (0);
+
 	/*
 	 * If we're changing the mountpoint, attempt to destroy the underlying
 	 * mountpoint.  All other datasets will have inherited from this dataset
@@ -239,8 +253,7 @@ changelist_postfix(prop_changelist_t *clp)
 		needs_key = (zfs_prop_get_int(cn->cn_handle,
 		    ZFS_PROP_KEYSTATUS) == ZFS_KEYSTATUS_UNAVAILABLE);
 
-		mounted = (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT) ||
-		    zfs_is_mounted(cn->cn_handle, NULL);
+		mounted = zfs_is_mounted(cn->cn_handle, NULL);
 
 		if (!mounted && !needs_key && (cn->cn_mounted ||
 		    (((clp->cl_prop == ZFS_PROP_MOUNTPOINT &&
diff --git a/sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c b/sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c
index 11d3eb6a3c60..727efc5a91ad 100644
--- a/sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c
+++ b/sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c
@@ -1771,14 +1771,24 @@ zfs_prop_set(zfs_handle_t *zhp, const char *propname, const char *propval)
 	return (ret);
 }
 
-
-
 /*
  * Given an nvlist of property names and values, set the properties for the
  * given dataset.
  */
 int
 zfs_prop_set_list(zfs_handle_t *zhp, nvlist_t *props)
+{
+	return (zfs_prop_set_list_flags(zhp, props, 0));
+}
+
+/*
+ * Given an nvlist of property names, values and flags, set the properties
+ * for the given dataset. If ZFS_SET_NOMOUNT is set, it allows to update
+ * mountpoint, sharenfs and sharesmb properties without (un/re)mounting
+ * and (un/re)sharing the dataset.
+ */
+int
+zfs_prop_set_list_flags(zfs_handle_t *zhp, nvlist_t *props, int flags)
 {
 	zfs_cmd_t zc = {"\0"};
 	int ret = -1;
@@ -1848,7 +1858,9 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvlist_t *props)
 		if (prop != ZFS_PROP_CANMOUNT ||
 		    (fnvpair_value_uint64(elem) == ZFS_CANMOUNT_OFF &&
 		    zfs_is_mounted(zhp, NULL))) {
-			cls[cl_idx] = changelist_gather(zhp, prop, 0, 0);
+			cls[cl_idx] = changelist_gather(zhp, prop,
+			    ((flags & ZFS_SET_NOMOUNT) ?
+			    CL_GATHER_DONT_UNMOUNT : 0), 0);
 			if (cls[cl_idx] == NULL)
 				goto error;
 		}
diff --git a/sys/contrib/openzfs/man/man4/zfs.4 b/sys/contrib/openzfs/man/man4/zfs.4
index 3843419731b8..71a3e67ee67e 100644
--- a/sys/contrib/openzfs/man/man4/zfs.4
+++ b/sys/contrib/openzfs/man/man4/zfs.4
@@ -402,6 +402,12 @@ Practical upper limit of total metaslabs per top-level vdev.
 .It Sy metaslab_preload_enabled Ns = Ns Sy 1 Ns | Ns 0 Pq int
 Enable metaslab group preloading.
 .
+.It Sy metaslab_preload_limit Ns = Ns Sy 10 Pq uint
+Maximum number of metaslabs per group to preload
+.
+.It Sy metaslab_preload_pct Ns = Ns Sy 50 Pq uint
+Percentage of CPUs to run a metaslab preload taskq
+.
 .It Sy metaslab_lba_weighting_enabled Ns = Ns Sy 1 Ns | Ns 0 Pq int
 Give more weight to metaslabs with lower LBAs,
 assuming they have greater bandwidth,
@@ -2144,6 +2150,11 @@ On very fragmented pools, lowering this
 .Pq typically to Sy 36 KiB
 can improve performance.
 .
+.It Sy zil_maxcopied Ns = Ns Sy 7680 Ns B Po 7.5 KiB Pc Pq uint
+This sets the maximum number of write bytes logged via WR_COPIED.
+It tunes a tradeoff between additional memory copy and possibly worse log
+space efficiency vs additional range lock/unlock.
+.
 .It Sy zil_min_commit_timeout Ns = Ns Sy 5000 Pq u64
 This sets the minimum delay in nanoseconds ZIL care to delay block commit,
 waiting for more records.
@@ -2306,63 +2317,6 @@ If
 .Sy zvol_threads
 to the number of CPUs present or 32 (whichever is greater).
 .
-.It Sy zvol_blk_mq_threads Ns = Ns Sy 0 Pq uint
-The number of threads per zvol to use for queuing IO requests.
-This parameter will only appear if your kernel supports
-.Li blk-mq
-and is only read and assigned to a zvol at zvol load time.
-If
-.Sy 0
-(the default) then internally set
-.Sy zvol_blk_mq_threads
-to the number of CPUs present.
-.
-.It Sy zvol_use_blk_mq Ns = Ns Sy 0 Ns | Ns 1 Pq uint
-Set to
-.Sy 1
-to use the
-.Li blk-mq
-API for zvols.
-Set to
-.Sy 0
-(the default) to use the legacy zvol APIs.
-This setting can give better or worse zvol performance depending on
-the workload.
-This parameter will only appear if your kernel supports
-.Li blk-mq
-and is only read and assigned to a zvol at zvol load time.
-.
-.It Sy zvol_blk_mq_blocks_per_thread Ns = Ns Sy 8 Pq uint
-If
-.Sy zvol_use_blk_mq
-is enabled, then process this number of
-.Sy volblocksize Ns -sized blocks per zvol thread.
-This tunable can be use to favor better performance for zvol reads (lower
-values) or writes (higher values).
-If set to
-.Sy 0 ,
-then the zvol layer will process the maximum number of blocks
-per thread that it can.
-This parameter will only appear if your kernel supports
-.Li blk-mq
-and is only applied at each zvol's load time.
-.
-.It Sy zvol_blk_mq_queue_depth Ns = Ns Sy 0 Pq uint
-The queue_depth value for the zvol
-.Li blk-mq
-interface.
-This parameter will only appear if your kernel supports
-.Li blk-mq
-and is only applied at each zvol's load time.
-If
-.Sy 0
-(the default) then use the kernel's default queue depth.
-Values are clamped to the kernel's
-.Dv BLKDEV_MIN_RQ
-and
-.Dv BLKDEV_MAX_RQ Ns / Ns Dv BLKDEV_DEFAULT_RQ
-limits.
-.
 .It Sy zvol_volmode Ns = Ns Sy 1 Pq uint
 Defines zvol block devices behaviour when
 .Sy volmode Ns = Ns Sy default :
diff --git a/sys/contrib/openzfs/man/man7/zfsconcepts.7 b/sys/contrib/openzfs/man/man7/zfsconcepts.7
index 18a9e9b5cafe..1be3d961c3d7 100644
--- a/sys/contrib/openzfs/man/man7/zfsconcepts.7
+++ b/sys/contrib/openzfs/man/man7/zfsconcepts.7
@@ -28,8 +28,9 @@
 .\" Copyright 2019 Richard Laager. All rights reserved.
 .\" Copyright 2018 Nexenta Systems, Inc.
 .\" Copyright 2019 Joyent, Inc.
+.\" Copyright 2023 Klara, Inc.
 .\"
-.Dd June 30, 2019
+.Dd October 6, 2023
 .Dt ZFSCONCEPTS 7
 .Os
 .
@@ -205,3 +206,40 @@ practices, such as regular backups.
 Consider using the
 .Sy compression
 property as a less resource-intensive alternative.
+.Ss Block cloning
+Block cloning is a facility that allows a file (or parts of a file) to be
+.Qq cloned ,
+that is, a shallow copy made where the existing data blocks are referenced
+rather than copied.
+Later modifications to the data will cause a copy of the data block to be taken
+and that copy modified.
+This facility is used to implement
+.Qq reflinks
+or
+.Qq file-level copy-on-write .
+.Pp
+Cloned blocks are tracked in a special on-disk structure called the Block
+Reference Table
+.Po BRT
+.Pc .
+Unlike deduplication, this table has minimal overhead, so can be enabled at all
+times.
+.Pp
+Also unlike deduplication, cloning must be requested by a user program.
+Many common file copying programs, including newer versions of
+.Nm /bin/cp ,
+will try to create clones automatically.
+Look for
+.Qq clone ,
+.Qq dedupe
+or
+.Qq reflink
+in the documentation for more information.
+.Pp
+There are some limitations to block cloning.
+Only whole blocks can be cloned, and blocks can not be cloned if they are not
+yet written to disk, or if they are encrypted, or the source and destination
+.Sy recordsize
+properties differ.
+The OS may add additional restrictions;
+for example, most versions of Linux will not allow clones across datasets.
diff --git a/sys/contrib/openzfs/man/man7/zfsprops.7 b/sys/contrib/openzfs/man/man7/zfsprops.7
index 51ddd85eb79e..e3674b1f8a8d 100644
--- a/sys/contrib/openzfs/man/man7/zfsprops.7
+++ b/sys/contrib/openzfs/man/man7/zfsprops.7
@@ -1248,10 +1248,18 @@ Otherwise, they are automatically remounted in the new location if the property
 was previously
 .Sy legacy
 or
-.Sy none ,
-or if they were mounted before the property was changed.
+.Sy none .
 In addition, any shared file systems are unshared and shared in the new
 location.
+.Pp
+When the
+.Sy mountpoint
+property is set with
+.Nm zfs Cm set Fl u
+, the
+.Sy mountpoint
+property is updated but dataset is not mounted or unmounted and remains
+as it was before.
 .It Sy nbmand Ns = Ns Sy on Ns | Ns Sy off
 Controls whether the file system should be mounted with
 .Sy nbmand
@@ -1656,6 +1664,13 @@ by default.
 This means that any additional access control
 (disallow specific user specific access etc) must be done on the underlying file
 system.
+.Pp
+When the
+.Sy sharesmb
+property is updated with
+.Nm zfs Cm set Fl u
+, the property is set to desired value, but the operation to share, reshare
+or unshare the the dataset is not performed.
 .It Sy sharenfs Ns = Ns Sy on Ns | Ns Sy off Ns | Ns Ar opts
 Controls whether the file system is shared via NFS, and what options are to be
 used.
@@ -1699,6 +1714,13 @@ or if they were shared before the property was changed.
 If the new property is
 .Sy off ,
 the file systems are unshared.
+.Pp
+When the
+.Sy sharenfs
+property is updated with
+.Nm zfs Cm set Fl u
+, the property is set to desired value, but the operation to share, reshare
+or unshare the the dataset is not performed.
 .It Sy logbias Ns = Ns Sy latency Ns | Ns Sy throughput
 Provide a hint to ZFS about handling of synchronous requests in this dataset.
 If
diff --git a/sys/contrib/openzfs/man/man8/zfs-set.8 b/sys/contrib/openzfs/man/man8/zfs-set.8
index 4cabdcd8bd83..c01bcc643e5d 100644
--- a/sys/contrib/openzfs/man/man8/zfs-set.8
+++ b/sys/contrib/openzfs/man/man8/zfs-set.8
@@ -39,6 +39,7 @@
 .Sh SYNOPSIS
 .Nm zfs
 .Cm set
+.Op Fl u
 .Ar property Ns = Ns Ar value Oo Ar property Ns = Ns Ar value Oc Ns …
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns …
 .Nm zfs
@@ -60,6 +61,7 @@
 .It Xo
 .Nm zfs
 .Cm set
+.Op Fl u
 .Ar property Ns = Ns Ar value Oo Ar property Ns = Ns Ar value Oc Ns …
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns …
 .Xc
@@ -79,6 +81,11 @@ For more information, see the
 .Em User Properties
 section of
 .Xr zfsprops 7 .
+.Bl -tag -width "-u"
+.It Fl u
+Update mountpoint, sharenfs, sharesmb property but do not mount or share the
+dataset.
+.El
 .It Xo
 .Nm zfs
 .Cm get
diff --git a/sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha256-armv8.S b/sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha256-armv8.S
index fa50c4e74d59..7ae486e4e229 100644
--- a/sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha256-armv8.S
+++ b/sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha256-armv8.S
@@ -49,6 +49,7 @@
 .type	zfs_sha256_block_armv7,%function
 .align	6
 zfs_sha256_block_armv7:
+	hint	#34					// bti c
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 
@@ -1015,6 +1016,7 @@ zfs_sha256_block_armv7:
 .type	zfs_sha256_block_armv8,%function
 .align	6
 zfs_sha256_block_armv8:
+	hint		#34				// bti c
 .Lv8_entry:
 	stp		x29,x30,[sp,#-16]!
 	add		x29,sp,#0
@@ -1155,6 +1157,7 @@ zfs_sha256_block_armv8:
 .type	zfs_sha256_block_neon,%function
 .align	4
 zfs_sha256_block_neon:
+	hint	#34					// bti c
 .Lneon_entry:
 	stp	x29, x30, [sp, #-16]!
 	mov	x29, sp
diff --git a/sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha512-armv8.S b/sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha512-armv8.S
index 1683fc1ca53c..9c61eeee4d7b 100644
--- a/sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha512-armv8.S
+++ b/sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha512-armv8.S
@@ -73,6 +73,7 @@
 .type	zfs_sha512_block_armv7,%function
 .align	6
 zfs_sha512_block_armv7:
+	hint	#34					// bti c
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 
@@ -1040,6 +1041,7 @@ zfs_sha512_block_armv7:
 .type	zfs_sha512_block_armv8,%function
 .align	6
 zfs_sha512_block_armv8:
+	hint		#34				// bti c
 .Lv8_entry:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later
 	stp		x29,x30,[sp,#-16]!
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c
index ba9a95e4a66d..312d76c3e023 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c
@@ -614,28 +614,6 @@ SYSCTL_UINT(_vfs_zfs_metaslab, OID_AUTO, df_free_pct,
 	" space map to continue allocations in a first-fit fashion");
 /* END CSTYLED */
 
-/*
- * Percentage of all cpus that can be used by the metaslab taskq.
- */
-extern int metaslab_load_pct;
-
-/* BEGIN CSTYLED */
-SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, load_pct,
-	CTLFLAG_RWTUN, &metaslab_load_pct, 0,
-	"Percentage of cpus that can be used by the metaslab taskq");
-/* END CSTYLED */
-
-/*
- * Max number of metaslabs per group to preload.
- */
-extern uint_t metaslab_preload_limit;
-
-/* BEGIN CSTYLED */
-SYSCTL_UINT(_vfs_zfs_metaslab, OID_AUTO, preload_limit,
-	CTLFLAG_RWTUN, &metaslab_preload_limit, 0,
-	"Max number of metaslabs per group to preload");
-/* END CSTYLED */
-
 /* mmp.c */
 
 int
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
index 8969fd6a54bd..09e18de81748 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
@@ -89,7 +89,7 @@ int zfs_debug_level;
 SYSCTL_INT(_vfs_zfs, OID_AUTO, debug, CTLFLAG_RWTUN, &zfs_debug_level, 0,
 	"Debug level");
 
-int zfs_bclone_enabled;
+int zfs_bclone_enabled = 1;
 SYSCTL_INT(_vfs_zfs, OID_AUTO, bclone_enabled, CTLFLAG_RWTUN,
 	&zfs_bclone_enabled, 0, "Enable block cloning");
 
diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zpl_file_range.c b/sys/contrib/openzfs/module/os/linux/zfs/zpl_file_range.c
index 2abbf44df587..c47fe99dacff 100644
--- a/sys/contrib/openzfs/module/os/linux/zfs/zpl_file_range.c
+++ b/sys/contrib/openzfs/module/os/linux/zfs/zpl_file_range.c
@@ -202,8 +202,10 @@ zpl_ioctl_ficlone(struct file *dst_file, void *arg)
 	if (src_file == NULL)
 		return (-EBADF);
 
-	if (dst_file->f_op != src_file->f_op)
+	if (dst_file->f_op != src_file->f_op) {
+		fput(src_file);
 		return (-EXDEV);
+	}
 
 	size_t len = i_size_read(file_inode(src_file));
 
@@ -237,8 +239,10 @@ zpl_ioctl_ficlonerange(struct file *dst_file, void __user *arg)
 	if (src_file == NULL)
 		return (-EBADF);
 
-	if (dst_file->f_op != src_file->f_op)
+	if (dst_file->f_op != src_file->f_op) {
+		fput(src_file);
 		return (-EXDEV);
+	}
 
 	size_t len = fcr.fcr_src_length;
 	if (len == 0)
diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c b/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c
index f94ce69fb9e2..e145a8c876b4 100644
--- a/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c
+++ b/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c
@@ -1626,18 +1626,6 @@ MODULE_PARM_DESC(zvol_prefetch_bytes, "Prefetch N bytes at zvol start+end");
 module_param(zvol_volmode, uint, 0644);
 MODULE_PARM_DESC(zvol_volmode, "Default volmode property value");
 
-#ifdef HAVE_BLK_MQ
-module_param(zvol_blk_mq_queue_depth, uint, 0644);
-MODULE_PARM_DESC(zvol_blk_mq_queue_depth, "Default blk-mq queue depth");
-
-module_param(zvol_use_blk_mq, uint, 0644);
-MODULE_PARM_DESC(zvol_use_blk_mq, "Use the blk-mq API for zvols");
-
-module_param(zvol_blk_mq_blocks_per_thread, uint, 0644);
-MODULE_PARM_DESC(zvol_blk_mq_blocks_per_thread,
-    "Process volblocksize blocks per thread");
-#endif
-
 #ifndef HAVE_BLKDEV_GET_ERESTARTSYS
 module_param(zvol_open_timeout_ms, uint, 0644);
 MODULE_PARM_DESC(zvol_open_timeout_ms, "Timeout for ZVOL open retries");
diff --git a/sys/contrib/openzfs/module/zfs/arc.c b/sys/contrib/openzfs/module/zfs/arc.c
index 22dc0ed5e3b6..b5946e7604c0 100644
--- a/sys/contrib/openzfs/module/zfs/arc.c
+++ b/sys/contrib/openzfs/module/zfs/arc.c
@@ -748,8 +748,7 @@ taskq_t *arc_prune_taskq;
  * Other sizes
  */
 
-#define	HDR_FULL_CRYPT_SIZE ((int64_t)sizeof (arc_buf_hdr_t))
-#define	HDR_FULL_SIZE ((int64_t)offsetof(arc_buf_hdr_t, b_crypt_hdr))
+#define	HDR_FULL_SIZE ((int64_t)sizeof (arc_buf_hdr_t))
 #define	HDR_L2ONLY_SIZE ((int64_t)offsetof(arc_buf_hdr_t, b_l1hdr))
 
 /*
@@ -1113,7 +1112,6 @@ buf_hash_remove(arc_buf_hdr_t *hdr)
  */
 
 static kmem_cache_t *hdr_full_cache;
-static kmem_cache_t *hdr_full_crypt_cache;
 static kmem_cache_t *hdr_l2only_cache;
 static kmem_cache_t *buf_cache;
 
@@ -1134,7 +1132,6 @@ buf_fini(void)
 	for (int i = 0; i < BUF_LOCKS; i++)
 		mutex_destroy(BUF_HASH_LOCK(i));
 	kmem_cache_destroy(hdr_full_cache);
-	kmem_cache_destroy(hdr_full_crypt_cache);
 	kmem_cache_destroy(hdr_l2only_cache);
 	kmem_cache_destroy(buf_cache);
 }
@@ -1151,7 +1148,6 @@ hdr_full_cons(void *vbuf, void *unused, int kmflag)
 
 	memset(hdr, 0, HDR_FULL_SIZE);
 	hdr->b_l1hdr.b_byteswap = DMU_BSWAP_NUMFUNCS;
-	cv_init(&hdr->b_l1hdr.b_cv, NULL, CV_DEFAULT, NULL);
 	zfs_refcount_create(&hdr->b_l1hdr.b_refcnt);
 #ifdef ZFS_DEBUG
 	mutex_init(&hdr->b_l1hdr.b_freeze_lock, NULL, MUTEX_DEFAULT, NULL);
@@ -1163,19 +1159,6 @@ hdr_full_cons(void *vbuf, void *unused, int kmflag)
 	return (0);
 }
 
-static int
-hdr_full_crypt_cons(void *vbuf, void *unused, int kmflag)
-{
-	(void) unused;
-	arc_buf_hdr_t *hdr = vbuf;
-
-	hdr_full_cons(vbuf, unused, kmflag);
-	memset(&hdr->b_crypt_hdr, 0, sizeof (hdr->b_crypt_hdr));
-	arc_space_consume(sizeof (hdr->b_crypt_hdr), ARC_SPACE_HDRS);
-
-	return (0);
-}
-
 static int
 hdr_l2only_cons(void *vbuf, void *unused, int kmflag)
 {
@@ -1211,7 +1194,6 @@ hdr_full_dest(void *vbuf, void *unused)
 	arc_buf_hdr_t *hdr = vbuf;
 
 	ASSERT(HDR_EMPTY(hdr));
-	cv_destroy(&hdr->b_l1hdr.b_cv);
 	zfs_refcount_destroy(&hdr->b_l1hdr.b_refcnt);
 #ifdef ZFS_DEBUG
 	mutex_destroy(&hdr->b_l1hdr.b_freeze_lock);
@@ -1220,16 +1202,6 @@ hdr_full_dest(void *vbuf, void *unused)
 	arc_space_return(HDR_FULL_SIZE, ARC_SPACE_HDRS);
 }
 
-static void
-hdr_full_crypt_dest(void *vbuf, void *unused)
-{
-	(void) vbuf, (void) unused;
-
-	hdr_full_dest(vbuf, unused);
-	arc_space_return(sizeof (((arc_buf_hdr_t *)NULL)->b_crypt_hdr),
-	    ARC_SPACE_HDRS);
-}
-
 static void
 hdr_l2only_dest(void *vbuf, void *unused)
 {
@@ -1285,9 +1257,6 @@ buf_init(void)
 
 	hdr_full_cache = kmem_cache_create("arc_buf_hdr_t_full", HDR_FULL_SIZE,
 	    0, hdr_full_cons, hdr_full_dest, NULL, NULL, NULL, 0);
-	hdr_full_crypt_cache = kmem_cache_create("arc_buf_hdr_t_full_crypt",
-	    HDR_FULL_CRYPT_SIZE, 0, hdr_full_crypt_cons, hdr_full_crypt_dest,
-	    NULL, NULL, NULL, 0);
 	hdr_l2only_cache = kmem_cache_create("arc_buf_hdr_t_l2only",
 	    HDR_L2ONLY_SIZE, 0, hdr_l2only_cons, hdr_l2only_dest, NULL,
 	    NULL, NULL, 0);
@@ -1995,7 +1964,6 @@ arc_buf_untransform_in_place(arc_buf_t *buf)
 	    arc_buf_size(buf));
 	buf->b_flags &= ~ARC_BUF_FLAG_ENCRYPTED;
 	buf->b_flags &= ~ARC_BUF_FLAG_COMPRESSED;
-	hdr->b_crypt_hdr.b_ebufcnt -= 1;
 }
 
 /*
@@ -2230,7 +2198,6 @@ arc_evictable_space_increment(arc_buf_hdr_t *hdr, arc_state_t *state)
 	ASSERT(HDR_HAS_L1HDR(hdr));
 
 	if (GHOST_STATE(state)) {
-		ASSERT0(hdr->b_l1hdr.b_bufcnt);
 		ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
 		ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
 		ASSERT(!HDR_HAS_RABD(hdr));
@@ -2270,7 +2237,6 @@ arc_evictable_space_decrement(arc_buf_hdr_t *hdr, arc_state_t *state)
 	ASSERT(HDR_HAS_L1HDR(hdr));
 
 	if (GHOST_STATE(state)) {
-		ASSERT0(hdr->b_l1hdr.b_bufcnt);
 		ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
 		ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
 		ASSERT(!HDR_HAS_RABD(hdr));
@@ -2386,7 +2352,9 @@ arc_buf_info(arc_buf_t *ab, arc_buf_info_t *abi, int state_index)
 		l2hdr = &hdr->b_l2hdr;
 
 	if (l1hdr) {
-		abi->abi_bufcnt = l1hdr->b_bufcnt;
+		abi->abi_bufcnt = 0;
+		for (arc_buf_t *buf = l1hdr->b_buf; buf; buf = buf->b_next)
+			abi->abi_bufcnt++;
 		abi->abi_access = l1hdr->b_arc_access;
 		abi->abi_mru_hits = l1hdr->b_mru_hits;
 		abi->abi_mru_ghost_hits = l1hdr->b_mru_ghost_hits;
@@ -2414,7 +2382,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 {
 	arc_state_t *old_state;
 	int64_t refcnt;
-	uint32_t bufcnt;
 	boolean_t update_old, update_new;
 	arc_buf_contents_t type = arc_buf_type(hdr);
 
@@ -2428,19 +2395,16 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 	if (HDR_HAS_L1HDR(hdr)) {
 		old_state = hdr->b_l1hdr.b_state;
 		refcnt = zfs_refcount_count(&hdr->b_l1hdr.b_refcnt);
-		bufcnt = hdr->b_l1hdr.b_bufcnt;
-		update_old = (bufcnt > 0 || hdr->b_l1hdr.b_pabd != NULL ||
-		    HDR_HAS_RABD(hdr));
+		update_old = (hdr->b_l1hdr.b_buf != NULL ||
+		    hdr->b_l1hdr.b_pabd != NULL || HDR_HAS_RABD(hdr));
 
-		IMPLY(GHOST_STATE(old_state), bufcnt == 0);
-		IMPLY(GHOST_STATE(new_state), bufcnt == 0);
 		IMPLY(GHOST_STATE(old_state), hdr->b_l1hdr.b_buf == NULL);
 		IMPLY(GHOST_STATE(new_state), hdr->b_l1hdr.b_buf == NULL);
-		IMPLY(old_state == arc_anon, bufcnt <= 1);
+		IMPLY(old_state == arc_anon, hdr->b_l1hdr.b_buf == NULL ||
+		    ARC_BUF_LAST(hdr->b_l1hdr.b_buf));
 	} else {
 		old_state = arc_l2c_only;
 		refcnt = 0;
-		bufcnt = 0;
 		update_old = B_FALSE;
 	}
 	update_new = update_old;
@@ -2488,14 +2452,12 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 	if (update_new && new_state != arc_l2c_only) {
 		ASSERT(HDR_HAS_L1HDR(hdr));
 		if (GHOST_STATE(new_state)) {
-			ASSERT0(bufcnt);
 
 			/*
 			 * When moving a header to a ghost state, we first
-			 * remove all arc buffers. Thus, we'll have a
-			 * bufcnt of zero, and no arc buffer to use for
-			 * the reference. As a result, we use the arc
-			 * header pointer for the reference.
+			 * remove all arc buffers. Thus, we'll have no arc
+			 * buffer to use for the reference. As a result, we
+			 * use the arc header pointer for the reference.
 			 */
 			(void) zfs_refcount_add_many(
 			    &new_state->arcs_size[type],
@@ -2503,7 +2465,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 			ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
 			ASSERT(!HDR_HAS_RABD(hdr));
 		} else {
-			uint32_t buffers = 0;
 
 			/*
 			 * Each individual buffer holds a unique reference,
@@ -2512,8 +2473,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 			 */
 			for (arc_buf_t *buf = hdr->b_l1hdr.b_buf; buf != NULL;
 			    buf = buf->b_next) {
-				ASSERT3U(bufcnt, !=, 0);
-				buffers++;
 
 				/*
 				 * When the arc_buf_t is sharing the data
@@ -2529,7 +2488,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 				    &new_state->arcs_size[type],
 				    arc_buf_size(buf), buf);
 			}
-			ASSERT3U(bufcnt, ==, buffers);
 
 			if (hdr->b_l1hdr.b_pabd != NULL) {
 				(void) zfs_refcount_add_many(
@@ -2548,7 +2506,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 	if (update_old && old_state != arc_l2c_only) {
 		ASSERT(HDR_HAS_L1HDR(hdr));
 		if (GHOST_STATE(old_state)) {
-			ASSERT0(bufcnt);
 			ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
 			ASSERT(!HDR_HAS_RABD(hdr));
 
@@ -2564,7 +2521,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 			    &old_state->arcs_size[type],
 			    HDR_GET_LSIZE(hdr), hdr);
 		} else {
-			uint32_t buffers = 0;
 
 			/*
 			 * Each individual buffer holds a unique reference,
@@ -2573,8 +2529,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 			 */
 			for (arc_buf_t *buf = hdr->b_l1hdr.b_buf; buf != NULL;
 			    buf = buf->b_next) {
-				ASSERT3U(bufcnt, !=, 0);
-				buffers++;
 
 				/*
 				 * When the arc_buf_t is sharing the data
@@ -2590,7 +2544,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 				    &old_state->arcs_size[type],
 				    arc_buf_size(buf), buf);
 			}
-			ASSERT3U(bufcnt, ==, buffers);
 			ASSERT(hdr->b_l1hdr.b_pabd != NULL ||
 			    HDR_HAS_RABD(hdr));
 
@@ -2838,9 +2791,6 @@ arc_buf_alloc_impl(arc_buf_hdr_t *hdr, spa_t *spa, const zbookmark_phys_t *zb,
 	VERIFY3P(buf->b_data, !=, NULL);
 
 	hdr->b_l1hdr.b_buf = buf;
-	hdr->b_l1hdr.b_bufcnt += 1;
-	if (encrypted)
-		hdr->b_crypt_hdr.b_ebufcnt += 1;
 
 	/*
 	 * If the user wants the data from the hdr, we need to either copy or
@@ -3082,8 +3032,6 @@ arc_buf_remove(arc_buf_hdr_t *hdr, arc_buf_t *buf)
 	}
 	buf->b_next = NULL;
 	ASSERT3P(lastbuf, !=, buf);
-	IMPLY(hdr->b_l1hdr.b_bufcnt > 0, lastbuf != NULL);
-	IMPLY(hdr->b_l1hdr.b_bufcnt > 0, hdr->b_l1hdr.b_buf != NULL);
 	IMPLY(lastbuf != NULL, ARC_BUF_LAST(lastbuf));
 
 	return (lastbuf);
@@ -3122,22 +3070,20 @@ arc_buf_destroy_impl(arc_buf_t *buf)
 		}
 		buf->b_data = NULL;
 
-		ASSERT(hdr->b_l1hdr.b_bufcnt > 0);
-		hdr->b_l1hdr.b_bufcnt -= 1;
-
-		if (ARC_BUF_ENCRYPTED(buf)) {
-			hdr->b_crypt_hdr.b_ebufcnt -= 1;
-
-			/*
-			 * If we have no more encrypted buffers and we've
-			 * already gotten a copy of the decrypted data we can
-			 * free b_rabd to save some space.
-			 */
-			if (hdr->b_crypt_hdr.b_ebufcnt == 0 &&
-			    HDR_HAS_RABD(hdr) && hdr->b_l1hdr.b_pabd != NULL &&
-			    !HDR_IO_IN_PROGRESS(hdr)) {
-				arc_hdr_free_abd(hdr, B_TRUE);
+		/*
+		 * If we have no more encrypted buffers and we've already
+		 * gotten a copy of the decrypted data we can free b_rabd
+		 * to save some space.
+		 */
+		if (ARC_BUF_ENCRYPTED(buf) && HDR_HAS_RABD(hdr) &&
+		    hdr->b_l1hdr.b_pabd != NULL && !HDR_IO_IN_PROGRESS(hdr)) {
+			arc_buf_t *b;
+			for (b = hdr->b_l1hdr.b_buf; b; b = b->b_next) {
+				if (b != buf && ARC_BUF_ENCRYPTED(b))
+					break;
 			}
+			if (b == NULL)
+				arc_hdr_free_abd(hdr, B_TRUE);
 		}
 	}
 
@@ -3298,11 +3244,7 @@ arc_hdr_alloc(uint64_t spa, int32_t psize, int32_t lsize,
 	arc_buf_hdr_t *hdr;
 
 	VERIFY(type == ARC_BUFC_DATA || type == ARC_BUFC_METADATA);
-	if (protected) {
-		hdr = kmem_cache_alloc(hdr_full_crypt_cache, KM_PUSHPAGE);
-	} else {
-		hdr = kmem_cache_alloc(hdr_full_cache, KM_PUSHPAGE);
-	}
+	hdr = kmem_cache_alloc(hdr_full_cache, KM_PUSHPAGE);
 
 	ASSERT(HDR_EMPTY(hdr));
 #ifdef ZFS_DEBUG
@@ -3325,7 +3267,6 @@ arc_hdr_alloc(uint64_t spa, int32_t psize, int32_t lsize,
 	hdr->b_l1hdr.b_mru_ghost_hits = 0;
 	hdr->b_l1hdr.b_mfu_hits = 0;
 	hdr->b_l1hdr.b_mfu_ghost_hits = 0;
-	hdr->b_l1hdr.b_bufcnt = 0;
 	hdr->b_l1hdr.b_buf = NULL;
 
 	ASSERT(zfs_refcount_is_zero(&hdr->b_l1hdr.b_refcnt));
@@ -3351,16 +3292,6 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
 	ASSERT((old == hdr_full_cache && new == hdr_l2only_cache) ||
 	    (old == hdr_l2only_cache && new == hdr_full_cache));
 
-	/*
-	 * if the caller wanted a new full header and the header is to be
-	 * encrypted we will actually allocate the header from the full crypt
-	 * cache instead. The same applies to freeing from the old cache.
-	 */
-	if (HDR_PROTECTED(hdr) && new == hdr_full_cache)
-		new = hdr_full_crypt_cache;
-	if (HDR_PROTECTED(hdr) && old == hdr_full_cache)
-		old = hdr_full_crypt_cache;
-
 	nhdr = kmem_cache_alloc(new, KM_PUSHPAGE);
 
 	ASSERT(MUTEX_HELD(HDR_LOCK(hdr)));
@@ -3368,7 +3299,7 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
 
 	memcpy(nhdr, hdr, HDR_L2ONLY_SIZE);
 
-	if (new == hdr_full_cache || new == hdr_full_crypt_cache) {
+	if (new == hdr_full_cache) {
 		arc_hdr_set_flags(nhdr, ARC_FLAG_HAS_L1HDR);
 		/*
 		 * arc_access and arc_change_state need to be aware that a
@@ -3382,7 +3313,6 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
 		ASSERT(!HDR_HAS_RABD(hdr));
 	} else {
 		ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
-		ASSERT0(hdr->b_l1hdr.b_bufcnt);
 #ifdef ZFS_DEBUG
 		ASSERT3P(hdr->b_l1hdr.b_freeze_cksum, ==, NULL);
 #endif
@@ -3448,126 +3378,6 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
 	return (nhdr);
 }
 
-/*
- * This function allows an L1 header to be reallocated as a crypt
- * header and vice versa. If we are going to a crypt header, the
- * new fields will be zeroed out.
- */
-static arc_buf_hdr_t *
-arc_hdr_realloc_crypt(arc_buf_hdr_t *hdr, boolean_t need_crypt)
-{
-	arc_buf_hdr_t *nhdr;
-	arc_buf_t *buf;
-	kmem_cache_t *ncache, *ocache;
-
-	/*
-	 * This function requires that hdr is in the arc_anon state.
-	 * Therefore it won't have any L2ARC data for us to worry
-	 * about copying.
-	 */
-	ASSERT(HDR_HAS_L1HDR(hdr));
-	ASSERT(!HDR_HAS_L2HDR(hdr));
-	ASSERT3U(!!HDR_PROTECTED(hdr), !=, need_crypt);
-	ASSERT3P(hdr->b_l1hdr.b_state, ==, arc_anon);
-	ASSERT(!multilist_link_active(&hdr->b_l1hdr.b_arc_node));
-	ASSERT(!list_link_active(&hdr->b_l2hdr.b_l2node));
-	ASSERT3P(hdr->b_hash_next, ==, NULL);
-
-	if (need_crypt) {
-		ncache = hdr_full_crypt_cache;
-		ocache = hdr_full_cache;
-	} else {
-		ncache = hdr_full_cache;
-		ocache = hdr_full_crypt_cache;
-	}
-
-	nhdr = kmem_cache_alloc(ncache, KM_PUSHPAGE);
-
-	/*
-	 * Copy all members that aren't locks or condvars to the new header.
-	 * No lists are pointing to us (as we asserted above), so we don't
-	 * need to worry about the list nodes.
-	 */
-	nhdr->b_dva = hdr->b_dva;
-	nhdr->b_birth = hdr->b_birth;
-	nhdr->b_type = hdr->b_type;
-	nhdr->b_flags = hdr->b_flags;
-	nhdr->b_psize = hdr->b_psize;
-	nhdr->b_lsize = hdr->b_lsize;
-	nhdr->b_spa = hdr->b_spa;
-#ifdef ZFS_DEBUG
-	nhdr->b_l1hdr.b_freeze_cksum = hdr->b_l1hdr.b_freeze_cksum;
-#endif
-	nhdr->b_l1hdr.b_bufcnt = hdr->b_l1hdr.b_bufcnt;
-	nhdr->b_l1hdr.b_byteswap = hdr->b_l1hdr.b_byteswap;
-	nhdr->b_l1hdr.b_state = hdr->b_l1hdr.b_state;
-	nhdr->b_l1hdr.b_arc_access = hdr->b_l1hdr.b_arc_access;
-	nhdr->b_l1hdr.b_mru_hits = hdr->b_l1hdr.b_mru_hits;
-	nhdr->b_l1hdr.b_mru_ghost_hits = hdr->b_l1hdr.b_mru_ghost_hits;
-	nhdr->b_l1hdr.b_mfu_hits = hdr->b_l1hdr.b_mfu_hits;
-	nhdr->b_l1hdr.b_mfu_ghost_hits = hdr->b_l1hdr.b_mfu_ghost_hits;
-	nhdr->b_l1hdr.b_acb = hdr->b_l1hdr.b_acb;
-	nhdr->b_l1hdr.b_pabd = hdr->b_l1hdr.b_pabd;
-
-	/*
-	 * This zfs_refcount_add() exists only to ensure that the individual
-	 * arc buffers always point to a header that is referenced, avoiding
-	 * a small race condition that could trigger ASSERTs.
-	 */
-	(void) zfs_refcount_add(&nhdr->b_l1hdr.b_refcnt, FTAG);
-	nhdr->b_l1hdr.b_buf = hdr->b_l1hdr.b_buf;
-	for (buf = nhdr->b_l1hdr.b_buf; buf != NULL; buf = buf->b_next)
-		buf->b_hdr = nhdr;
-
-	zfs_refcount_transfer(&nhdr->b_l1hdr.b_refcnt, &hdr->b_l1hdr.b_refcnt);
-	(void) zfs_refcount_remove(&nhdr->b_l1hdr.b_refcnt, FTAG);
-	ASSERT0(zfs_refcount_count(&hdr->b_l1hdr.b_refcnt));
-
-	if (need_crypt) {
-		arc_hdr_set_flags(nhdr, ARC_FLAG_PROTECTED);
-	} else {
-		arc_hdr_clear_flags(nhdr, ARC_FLAG_PROTECTED);
-	}
-
-	/* unset all members of the original hdr */
-	memset(&hdr->b_dva, 0, sizeof (dva_t));
-	hdr->b_birth = 0;
-	hdr->b_type = 0;
-	hdr->b_flags = 0;
-	hdr->b_psize = 0;
-	hdr->b_lsize = 0;
-	hdr->b_spa = 0;
-#ifdef ZFS_DEBUG
-	hdr->b_l1hdr.b_freeze_cksum = NULL;
-#endif
-	hdr->b_l1hdr.b_buf = NULL;
-	hdr->b_l1hdr.b_bufcnt = 0;
-	hdr->b_l1hdr.b_byteswap = 0;
-	hdr->b_l1hdr.b_state = NULL;
-	hdr->b_l1hdr.b_arc_access = 0;
-	hdr->b_l1hdr.b_mru_hits = 0;
-	hdr->b_l1hdr.b_mru_ghost_hits = 0;
-	hdr->b_l1hdr.b_mfu_hits = 0;
-	hdr->b_l1hdr.b_mfu_ghost_hits = 0;
-	hdr->b_l1hdr.b_acb = NULL;
-	hdr->b_l1hdr.b_pabd = NULL;
-
-	if (ocache == hdr_full_crypt_cache) {
-		ASSERT(!HDR_HAS_RABD(hdr));
-		hdr->b_crypt_hdr.b_ot = DMU_OT_NONE;
-		hdr->b_crypt_hdr.b_ebufcnt = 0;
-		hdr->b_crypt_hdr.b_dsobj = 0;
-		memset(hdr->b_crypt_hdr.b_salt, 0, ZIO_DATA_SALT_LEN);
-		memset(hdr->b_crypt_hdr.b_iv, 0, ZIO_DATA_IV_LEN);
-		memset(hdr->b_crypt_hdr.b_mac, 0, ZIO_DATA_MAC_LEN);
-	}
-
-	buf_discard_identity(hdr);
-	kmem_cache_free(ocache, hdr);
-
-	return (nhdr);
-}
-
 /*
  * This function is used by the send / receive code to convert a newly
  * allocated arc_buf_t to one that is suitable for a raw encrypted write. It
@@ -3587,8 +3397,7 @@ arc_convert_to_raw(arc_buf_t *buf, uint64_t dsobj, boolean_t byteorder,
 	ASSERT3P(hdr->b_l1hdr.b_state, ==, arc_anon);
 
 	buf->b_flags |= (ARC_BUF_FLAG_COMPRESSED | ARC_BUF_FLAG_ENCRYPTED);
-	if (!HDR_PROTECTED(hdr))
-		hdr = arc_hdr_realloc_crypt(hdr, B_TRUE);
+	arc_hdr_set_flags(hdr, ARC_FLAG_PROTECTED);
 	hdr->b_crypt_hdr.b_dsobj = dsobj;
 	hdr->b_crypt_hdr.b_ot = ot;
 	hdr->b_l1hdr.b_byteswap = (byteorder == ZFS_HOST_BYTEORDER) ?
@@ -3789,8 +3598,6 @@ static void
 arc_hdr_destroy(arc_buf_hdr_t *hdr)
 {
 	if (HDR_HAS_L1HDR(hdr)) {
-		ASSERT(hdr->b_l1hdr.b_buf == NULL ||
-		    hdr->b_l1hdr.b_bufcnt > 0);
 		ASSERT(zfs_refcount_is_zero(&hdr->b_l1hdr.b_refcnt));
 		ASSERT3P(hdr->b_l1hdr.b_state, ==, arc_anon);
 	}
@@ -3854,12 +3661,7 @@ arc_hdr_destroy(arc_buf_hdr_t *hdr)
 #ifdef ZFS_DEBUG
 		ASSERT3P(hdr->b_l1hdr.b_freeze_cksum, ==, NULL);
 #endif
-
-		if (!HDR_PROTECTED(hdr)) {
-			kmem_cache_free(hdr_full_cache, hdr);
-		} else {
-			kmem_cache_free(hdr_full_crypt_cache, hdr);
-		}
+		kmem_cache_free(hdr_full_cache, hdr);
 	} else {
 		kmem_cache_free(hdr_l2only_cache, hdr);
 	}
@@ -3871,7 +3673,8 @@ arc_buf_destroy(arc_buf_t *buf, const void *tag)
 	arc_buf_hdr_t *hdr = buf->b_hdr;
 
 	if (hdr->b_l1hdr.b_state == arc_anon) {
-		ASSERT3U(hdr->b_l1hdr.b_bufcnt, ==, 1);
+		ASSERT3P(hdr->b_l1hdr.b_buf, ==, buf);
+		ASSERT(ARC_BUF_LAST(buf));
 		ASSERT(!HDR_IO_IN_PROGRESS(hdr));
 		VERIFY0(remove_reference(hdr, tag));
 		return;
@@ -3881,7 +3684,7 @@ arc_buf_destroy(arc_buf_t *buf, const void *tag)
 	mutex_enter(hash_lock);
 
 	ASSERT3P(hdr, ==, buf->b_hdr);
-	ASSERT(hdr->b_l1hdr.b_bufcnt > 0);
+	ASSERT3P(hdr->b_l1hdr.b_buf, !=, NULL);
 	ASSERT3P(hash_lock, ==, HDR_LOCK(hdr));
 	ASSERT3P(hdr->b_l1hdr.b_state, !=, arc_anon);
 	ASSERT3P(buf->b_data, !=, NULL);
@@ -3924,7 +3727,6 @@ arc_evict_hdr(arc_buf_hdr_t *hdr, uint64_t *real_evicted)
 	ASSERT(MUTEX_HELD(HDR_LOCK(hdr)));
 	ASSERT(HDR_HAS_L1HDR(hdr));
 	ASSERT(!HDR_IO_IN_PROGRESS(hdr));
-	ASSERT0(hdr->b_l1hdr.b_bufcnt);
 	ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
 	ASSERT0(zfs_refcount_count(&hdr->b_l1hdr.b_refcnt));
 
@@ -5586,13 +5388,6 @@ arc_read_done(zio_t *zio)
 			buf_hash_remove(hdr);
 	}
 
-	/*
-	 * Broadcast before we drop the hash_lock to avoid the possibility
-	 * that the hdr (and hence the cv) might be freed before we get to
-	 * the cv_broadcast().
-	 */
-	cv_broadcast(&hdr->b_l1hdr.b_cv);
-
 	arc_hdr_clear_flags(hdr, ARC_FLAG_IO_IN_PROGRESS);
 	(void) remove_reference(hdr, hdr);
 
@@ -5787,8 +5582,7 @@ arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
 				}
 				acb->acb_zio_head = head_zio;
 				acb->acb_next = hdr->b_l1hdr.b_acb;
-				if (hdr->b_l1hdr.b_acb)
-					hdr->b_l1hdr.b_acb->acb_prev = acb;
+				hdr->b_l1hdr.b_acb->acb_prev = acb;
 				hdr->b_l1hdr.b_acb = acb;
 			}
 			mutex_exit(hash_lock);
@@ -5928,8 +5722,28 @@ arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
 				 * and so the performance impact shouldn't
 				 * matter.
 				 */
-				cv_wait(&hdr->b_l1hdr.b_cv, hash_lock);
+				arc_callback_t *acb = kmem_zalloc(
+				    sizeof (arc_callback_t), KM_SLEEP);
+				acb->acb_wait = B_TRUE;
+				mutex_init(&acb->acb_wait_lock, NULL,
+				    MUTEX_DEFAULT, NULL);
+				cv_init(&acb->acb_wait_cv, NULL, CV_DEFAULT,
+				    NULL);
+				acb->acb_zio_head =
+				    hdr->b_l1hdr.b_acb->acb_zio_head;
+				acb->acb_next = hdr->b_l1hdr.b_acb;
+				hdr->b_l1hdr.b_acb->acb_prev = acb;
+				hdr->b_l1hdr.b_acb = acb;
 				mutex_exit(hash_lock);
+				mutex_enter(&acb->acb_wait_lock);
+				while (acb->acb_wait) {
+					cv_wait(&acb->acb_wait_cv,
+					    &acb->acb_wait_lock);
+				}
+				mutex_exit(&acb->acb_wait_lock);
+				mutex_destroy(&acb->acb_wait_lock);
+				cv_destroy(&acb->acb_wait_cv);
+				kmem_free(acb, sizeof (arc_callback_t));
 				goto top;
 			}
 		}
@@ -6310,7 +6124,8 @@ arc_release(arc_buf_t *buf, const void *tag)
 		ASSERT(!HDR_IN_HASH_TABLE(hdr));
 		ASSERT(!HDR_HAS_L2HDR(hdr));
 
-		ASSERT3U(hdr->b_l1hdr.b_bufcnt, ==, 1);
+		ASSERT3P(hdr->b_l1hdr.b_buf, ==, buf);
+		ASSERT(ARC_BUF_LAST(buf));
 		ASSERT3S(zfs_refcount_count(&hdr->b_l1hdr.b_refcnt), ==, 1);
 		ASSERT(!multilist_link_active(&hdr->b_l1hdr.b_arc_node));
 
@@ -6361,7 +6176,7 @@ arc_release(arc_buf_t *buf, const void *tag)
 	/*
 	 * Do we have more than one buf?
 	 */
-	if (hdr->b_l1hdr.b_bufcnt > 1) {
+	if (hdr->b_l1hdr.b_buf != buf || !ARC_BUF_LAST(buf)) {
 		arc_buf_hdr_t *nhdr;
 		uint64_t spa = hdr->b_spa;
 		uint64_t psize = HDR_GET_PSIZE(hdr);
@@ -6442,10 +6257,6 @@ arc_release(arc_buf_t *buf, const void *tag)
 			    arc_buf_size(buf), buf);
 		}
 
-		hdr->b_l1hdr.b_bufcnt -= 1;
-		if (ARC_BUF_ENCRYPTED(buf))
-			hdr->b_crypt_hdr.b_ebufcnt -= 1;
-
 		arc_cksum_verify(buf);
 		arc_buf_unwatch(buf);
 
@@ -6458,15 +6269,11 @@ arc_release(arc_buf_t *buf, const void *tag)
 		nhdr = arc_hdr_alloc(spa, psize, lsize, protected,
 		    compress, hdr->b_complevel, type);
 		ASSERT3P(nhdr->b_l1hdr.b_buf, ==, NULL);
-		ASSERT0(nhdr->b_l1hdr.b_bufcnt);
 		ASSERT0(zfs_refcount_count(&nhdr->b_l1hdr.b_refcnt));
 		VERIFY3U(nhdr->b_type, ==, type);
 		ASSERT(!HDR_SHARED_DATA(nhdr));
 
 		nhdr->b_l1hdr.b_buf = buf;
-		nhdr->b_l1hdr.b_bufcnt = 1;
-		if (ARC_BUF_ENCRYPTED(buf))
-			nhdr->b_crypt_hdr.b_ebufcnt = 1;
 		(void) zfs_refcount_add(&nhdr->b_l1hdr.b_refcnt, tag);
 		buf->b_hdr = nhdr;
 
@@ -6517,7 +6324,7 @@ arc_write_ready(zio_t *zio)
 
 	ASSERT(HDR_HAS_L1HDR(hdr));
 	ASSERT(!zfs_refcount_is_zero(&buf->b_hdr->b_l1hdr.b_refcnt));
-	ASSERT(hdr->b_l1hdr.b_bufcnt > 0);
+	ASSERT3P(hdr->b_l1hdr.b_buf, !=, NULL);
 
 	/*
 	 * If we're reexecuting this zio because the pool suspended, then
@@ -6552,13 +6359,9 @@ arc_write_ready(zio_t *zio)
 		add_reference(hdr, hdr); /* For IO_IN_PROGRESS. */
 	}
 
-	if (BP_IS_PROTECTED(bp) != !!HDR_PROTECTED(hdr))
-		hdr = arc_hdr_realloc_crypt(hdr, BP_IS_PROTECTED(bp));
-
 	if (BP_IS_PROTECTED(bp)) {
 		/* ZIL blocks are written through zio_rewrite */
 		ASSERT3U(BP_GET_TYPE(bp), !=, DMU_OT_INTENT_LOG);
-		ASSERT(HDR_PROTECTED(hdr));
 
 		if (BP_SHOULD_BYTESWAP(bp)) {
 			if (BP_GET_LEVEL(bp) > 0) {
@@ -6571,11 +6374,14 @@ arc_write_ready(zio_t *zio)
 			hdr->b_l1hdr.b_byteswap = DMU_BSWAP_NUMFUNCS;
 		}
 
+		arc_hdr_set_flags(hdr, ARC_FLAG_PROTECTED);
 		hdr->b_crypt_hdr.b_ot = BP_GET_TYPE(bp);
 		hdr->b_crypt_hdr.b_dsobj = zio->io_bookmark.zb_objset;
 		zio_crypt_decode_params_bp(bp, hdr->b_crypt_hdr.b_salt,
 		    hdr->b_crypt_hdr.b_iv);
 		zio_crypt_decode_mac_bp(bp, hdr->b_crypt_hdr.b_mac);
+	} else {
+		arc_hdr_clear_flags(hdr, ARC_FLAG_PROTECTED);
 	}
 
 	/*
@@ -6656,7 +6462,8 @@ arc_write_ready(zio_t *zio)
 	} else {
 		ASSERT3P(buf->b_data, ==, abd_to_buf(zio->io_orig_abd));
 		ASSERT3U(zio->io_orig_size, ==, arc_buf_size(buf));
-		ASSERT3U(hdr->b_l1hdr.b_bufcnt, ==, 1);
+		ASSERT3P(hdr->b_l1hdr.b_buf, ==, buf);
+		ASSERT(ARC_BUF_LAST(buf));
 
 		arc_share_buf(hdr, buf);
 	}
@@ -6737,7 +6544,8 @@ arc_write_done(zio_t *zio)
 					    (void *)hdr, (void *)exists);
 			} else {
 				/* Dedup */
-				ASSERT(hdr->b_l1hdr.b_bufcnt == 1);
+				ASSERT3P(hdr->b_l1hdr.b_buf, !=, NULL);
+				ASSERT(ARC_BUF_LAST(hdr->b_l1hdr.b_buf));
 				ASSERT(hdr->b_l1hdr.b_state == arc_anon);
 				ASSERT(BP_GET_DEDUP(zio->io_bp));
 				ASSERT(BP_GET_LEVEL(zio->io_bp) == 0);
@@ -6778,7 +6586,7 @@ arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
 	ASSERT(!HDR_IO_ERROR(hdr));
 	ASSERT(!HDR_IO_IN_PROGRESS(hdr));
 	ASSERT3P(hdr->b_l1hdr.b_acb, ==, NULL);
-	ASSERT3U(hdr->b_l1hdr.b_bufcnt, >, 0);
+	ASSERT3P(hdr->b_l1hdr.b_buf, !=, NULL);
 	if (uncached)
 		arc_hdr_set_flags(hdr, ARC_FLAG_UNCACHED);
 	else if (l2arc)
diff --git a/sys/contrib/openzfs/module/zfs/dmu_tx.c b/sys/contrib/openzfs/module/zfs/dmu_tx.c
index 0eb8c17e331a..8451b5082e86 100644
--- a/sys/contrib/openzfs/module/zfs/dmu_tx.c
+++ b/sys/contrib/openzfs/module/zfs/dmu_tx.c
@@ -210,10 +210,12 @@ dmu_tx_check_ioerr(zio_t *zio, dnode_t *dn, int level, uint64_t blkid)
 	dmu_buf_impl_t *db;
 
 	rw_enter(&dn->dn_struct_rwlock, RW_READER);
-	db = dbuf_hold_level(dn, level, blkid, FTAG);
+	err = dbuf_hold_impl(dn, level, blkid, TRUE, FALSE, FTAG, &db);
 	rw_exit(&dn->dn_struct_rwlock);
-	if (db == NULL)
-		return (SET_ERROR(EIO));
+	if (err == ENOENT)
+		return (0);
+	if (err != 0)
+		return (err);
 	/*
 	 * PARTIAL_FIRST allows caching for uncacheable blocks.  It will
 	 * be cleared after dmu_buf_will_dirty() call dbuf_read() again.
diff --git a/sys/contrib/openzfs/module/zfs/metaslab.c b/sys/contrib/openzfs/module/zfs/metaslab.c
index 8635403d6ad4..e0d4a6a63508 100644
--- a/sys/contrib/openzfs/module/zfs/metaslab.c
+++ b/sys/contrib/openzfs/module/zfs/metaslab.c
@@ -205,11 +205,6 @@ static const uint32_t metaslab_min_search_count = 100;
  */
 static int metaslab_df_use_largest_segment = B_FALSE;
 
-/*
- * Percentage of all cpus that can be used by the metaslab taskq.
- */
-int metaslab_load_pct = 50;
-
 /*
  * These tunables control how long a metaslab will remain loaded after the
  * last allocation from it.  A metaslab can't be unloaded until at least
@@ -854,9 +849,6 @@ metaslab_group_create(metaslab_class_t *mc, vdev_t *vd, int allocators)
 		zfs_refcount_create_tracked(&mga->mga_alloc_queue_depth);
 	}
 
-	mg->mg_taskq = taskq_create("metaslab_group_taskq", metaslab_load_pct,
-	    maxclsyspri, 10, INT_MAX, TASKQ_THREADS_CPU_PCT | TASKQ_DYNAMIC);
-
 	return (mg);
 }
 
@@ -872,7 +864,6 @@ metaslab_group_destroy(metaslab_group_t *mg)
 	 */
 	ASSERT(mg->mg_activation_count <= 0);
 
-	taskq_destroy(mg->mg_taskq);
 	avl_destroy(&mg->mg_metaslab_tree);
 	mutex_destroy(&mg->mg_lock);
 	mutex_destroy(&mg->mg_ms_disabled_lock);
@@ -963,7 +954,7 @@ metaslab_group_passivate(metaslab_group_t *mg)
 	 * allocations from taking place and any changes to the vdev tree.
 	 */
 	spa_config_exit(spa, locks & ~(SCL_ZIO - 1), spa);
-	taskq_wait_outstanding(mg->mg_taskq, 0);
+	taskq_wait_outstanding(spa->spa_metaslab_taskq, 0);
 	spa_config_enter(spa, locks & ~(SCL_ZIO - 1), spa, RW_WRITER);
 	metaslab_group_alloc_update(mg);
 	for (int i = 0; i < mg->mg_allocators; i++) {
@@ -3571,10 +3562,8 @@ metaslab_group_preload(metaslab_group_t *mg)
 	avl_tree_t *t = &mg->mg_metaslab_tree;
 	int m = 0;
 
-	if (spa_shutting_down(spa) || !metaslab_preload_enabled) {
-		taskq_wait_outstanding(mg->mg_taskq, 0);
+	if (spa_shutting_down(spa) || !metaslab_preload_enabled)
 		return;
-	}
 
 	mutex_enter(&mg->mg_lock);
 
@@ -3594,8 +3583,9 @@ metaslab_group_preload(metaslab_group_t *mg)
 			continue;
 		}
 
-		VERIFY(taskq_dispatch(mg->mg_taskq, metaslab_preload,
-		    msp, TQ_SLEEP) != TASKQID_INVALID);
+		VERIFY(taskq_dispatch(spa->spa_metaslab_taskq, metaslab_preload,
+		    msp, TQ_SLEEP | (m <= mg->mg_allocators ? TQ_FRONT : 0))
+		    != TASKQID_INVALID);
 	}
 	mutex_exit(&mg->mg_lock);
 }
@@ -6224,6 +6214,9 @@ ZFS_MODULE_PARAM(zfs_metaslab, metaslab_, debug_unload, INT, ZMOD_RW,
 ZFS_MODULE_PARAM(zfs_metaslab, metaslab_, preload_enabled, INT, ZMOD_RW,
 	"Preload potential metaslabs during reassessment");
 
+ZFS_MODULE_PARAM(zfs_metaslab, metaslab_, preload_limit, UINT, ZMOD_RW,
+	"Max number of metaslabs per group to preload");
+
 ZFS_MODULE_PARAM(zfs_metaslab, metaslab_, unload_delay, UINT, ZMOD_RW,
 	"Delay in txgs after metaslab was last used before unloading");
 
diff --git a/sys/contrib/openzfs/module/zfs/spa.c b/sys/contrib/openzfs/module/zfs/spa.c
index cda62f939c1e..0b69568e2aad 100644
--- a/sys/contrib/openzfs/module/zfs/spa.c
+++ b/sys/contrib/openzfs/module/zfs/spa.c
@@ -169,6 +169,11 @@ static int spa_load_impl(spa_t *spa, spa_import_type_t type,
     const char **ereport);
 static void spa_vdev_resilver_done(spa_t *spa);
 
+/*
+ * Percentage of all CPUs that can be used by the metaslab preload taskq.
+ */
+static uint_t metaslab_preload_pct = 50;
+
 static uint_t	zio_taskq_batch_pct = 80;	  /* 1 thread per cpu in pset */
 static uint_t	zio_taskq_batch_tpq;		  /* threads per taskq */
 static const boolean_t	zio_taskq_sysdc = B_TRUE; /* use SDC scheduling class */
@@ -1399,6 +1404,13 @@ spa_activate(spa_t *spa, spa_mode_t mode)
 	spa->spa_zvol_taskq = taskq_create("z_zvol", 1, defclsyspri,
 	    1, INT_MAX, 0);
 
+	/*
+	 * The taskq to preload metaslabs.
+	 */
+	spa->spa_metaslab_taskq = taskq_create("z_metaslab",
+	    metaslab_preload_pct, maxclsyspri, 1, INT_MAX,
+	    TASKQ_DYNAMIC | TASKQ_THREADS_CPU_PCT);
+
 	/*
 	 * Taskq dedicated to prefetcher threads: this is used to prevent the
 	 * pool traverse code from monopolizing the global (and limited)
@@ -1434,6 +1446,11 @@ spa_deactivate(spa_t *spa)
 		spa->spa_zvol_taskq = NULL;
 	}
 
+	if (spa->spa_metaslab_taskq) {
+		taskq_destroy(spa->spa_metaslab_taskq);
+		spa->spa_metaslab_taskq = NULL;
+	}
+
 	if (spa->spa_prefetch_taskq) {
 		taskq_destroy(spa->spa_prefetch_taskq);
 		spa->spa_prefetch_taskq = NULL;
@@ -1706,13 +1723,7 @@ spa_unload(spa_t *spa)
 	 * This ensures that there is no async metaslab prefetching
 	 * while we attempt to unload the spa.
 	 */
-	if (spa->spa_root_vdev != NULL) {
-		for (int c = 0; c < spa->spa_root_vdev->vdev_children; c++) {
-			vdev_t *vc = spa->spa_root_vdev->vdev_child[c];
-			if (vc->vdev_mg != NULL)
-				taskq_wait(vc->vdev_mg->mg_taskq);
-		}
-	}
+	taskq_wait(spa->spa_metaslab_taskq);
 
 	if (spa->spa_mmp.mmp_thread)
 		mmp_thread_stop(spa);
@@ -3922,6 +3933,24 @@ spa_ld_trusted_config(spa_t *spa, spa_import_type_t type,
 	rvd = mrvd;
 	spa_config_exit(spa, SCL_ALL, FTAG);
 
+	/*
+	 * If 'zpool import' used a cached config, then the on-disk hostid and
+	 * hostname may be different to the cached config in ways that should
+	 * prevent import.  Userspace can't discover this without a scan, but
+	 * we know, so we add these values to LOAD_INFO so the caller can know
+	 * the difference.
+	 *
+	 * Note that we have to do this before the config is regenerated,
+	 * because the new config will have the hostid and hostname for this
+	 * host, in readiness for import.
+	 */
+	if (nvlist_exists(mos_config, ZPOOL_CONFIG_HOSTID))
+		fnvlist_add_uint64(spa->spa_load_info, ZPOOL_CONFIG_HOSTID,
+		    fnvlist_lookup_uint64(mos_config, ZPOOL_CONFIG_HOSTID));
+	if (nvlist_exists(mos_config, ZPOOL_CONFIG_HOSTNAME))
+		fnvlist_add_string(spa->spa_load_info, ZPOOL_CONFIG_HOSTNAME,
+		    fnvlist_lookup_string(mos_config, ZPOOL_CONFIG_HOSTNAME));
+
 	/*
 	 * We will use spa_config if we decide to reload the spa or if spa_load
 	 * fails and we rewind. We must thus regenerate the config using the
@@ -10134,6 +10163,9 @@ EXPORT_SYMBOL(spa_prop_clear_bootfs);
 /* asynchronous event notification */
 EXPORT_SYMBOL(spa_event_notify);
 
+ZFS_MODULE_PARAM(zfs_metaslab, metaslab_, preload_pct, UINT, ZMOD_RW,
+	"Percentage of CPUs to run a metaslab preload taskq");
+
 /* BEGIN CSTYLED */
 ZFS_MODULE_PARAM(zfs_spa, spa_, load_verify_shift, UINT, ZMOD_RW,
 	"log2 fraction of arc that can be used by inflight I/Os when "
diff --git a/sys/contrib/openzfs/module/zfs/vdev_label.c b/sys/contrib/openzfs/module/zfs/vdev_label.c
index a5c76808f2d2..a2e5524a8391 100644
--- a/sys/contrib/openzfs/module/zfs/vdev_label.c
+++ b/sys/contrib/openzfs/module/zfs/vdev_label.c
@@ -1138,6 +1138,16 @@ vdev_label_init(vdev_t *vd, uint64_t crtxg, vdev_labeltype_t reason)
 		    POOL_STATE_L2CACHE) == 0);
 		VERIFY(nvlist_add_uint64(label, ZPOOL_CONFIG_GUID,
 		    vd->vdev_guid) == 0);
+
+		/*
+		 * This is merely to facilitate reporting the ashift of the
+		 * cache device through zdb. The actual retrieval of the
+		 * ashift (in vdev_alloc()) uses the nvlist
+		 * spa->spa_l2cache->sav_config (populated in
+		 * spa_ld_open_aux_vdevs()).
+		 */
+		VERIFY(nvlist_add_uint64(label, ZPOOL_CONFIG_ASHIFT,
+		    vd->vdev_ashift) == 0);
 	} else {
 		uint64_t txg = 0ULL;
 
diff --git a/sys/contrib/openzfs/module/zfs/vdev_trim.c b/sys/contrib/openzfs/module/zfs/vdev_trim.c
index 0d71b9434342..03e17db024ea 100644
--- a/sys/contrib/openzfs/module/zfs/vdev_trim.c
+++ b/sys/contrib/openzfs/module/zfs/vdev_trim.c
@@ -23,6 +23,7 @@
  * Copyright (c) 2016 by Delphix. All rights reserved.
  * Copyright (c) 2019 by Lawrence Livermore National Security, LLC.
  * Copyright (c) 2021 Hewlett Packard Enterprise Development LP
+ * Copyright 2023 RackTop Systems, Inc.
  */
 
 #include <sys/spa.h>
@@ -591,6 +592,7 @@ vdev_trim_ranges(trim_args_t *ta)
 	uint64_t extent_bytes_max = ta->trim_extent_bytes_max;
 	uint64_t extent_bytes_min = ta->trim_extent_bytes_min;
 	spa_t *spa = vd->vdev_spa;
+	int error = 0;
 
 	ta->trim_start_time = gethrtime();
 	ta->trim_bytes_done = 0;
@@ -610,19 +612,32 @@ vdev_trim_ranges(trim_args_t *ta)
 		uint64_t writes_required = ((size - 1) / extent_bytes_max) + 1;
 
 		for (uint64_t w = 0; w < writes_required; w++) {
-			int error;
-
 			error = vdev_trim_range(ta, VDEV_LABEL_START_SIZE +
 			    rs_get_start(rs, ta->trim_tree) +
 			    (w *extent_bytes_max), MIN(size -
 			    (w * extent_bytes_max), extent_bytes_max));
 			if (error != 0) {
-				return (error);
+				goto done;
 			}
 		}
 	}
 
-	return (0);
+done:
+	/*
+	 * Make sure all TRIMs for this metaslab have completed before
+	 * returning. TRIM zios have lower priority over regular or syncing
+	 * zios, so all TRIM zios for this metaslab must complete before the
+	 * metaslab is re-enabled. Otherwise it's possible write zios to
+	 * this metaslab could cut ahead of still queued TRIM zios for this
+	 * metaslab causing corruption if the ranges overlap.
+	 */
+	mutex_enter(&vd->vdev_trim_io_lock);
+	while (vd->vdev_trim_inflight[0] > 0) {
+		cv_wait(&vd->vdev_trim_io_cv, &vd->vdev_trim_io_lock);
+	}
+	mutex_exit(&vd->vdev_trim_io_lock);
+
+	return (error);
 }
 
 static void
@@ -941,11 +956,6 @@ vdev_trim_thread(void *arg)
 	}
 
 	spa_config_exit(spa, SCL_CONFIG, FTAG);
-	mutex_enter(&vd->vdev_trim_io_lock);
-	while (vd->vdev_trim_inflight[0] > 0) {
-		cv_wait(&vd->vdev_trim_io_cv, &vd->vdev_trim_io_lock);
-	}
-	mutex_exit(&vd->vdev_trim_io_lock);
 
 	range_tree_destroy(ta.trim_tree);
 
diff --git a/sys/contrib/openzfs/module/zfs/zil.c b/sys/contrib/openzfs/module/zfs/zil.c
index 9e9c9c22549d..18c6cbf028b3 100644
--- a/sys/contrib/openzfs/module/zfs/zil.c
+++ b/sys/contrib/openzfs/module/zfs/zil.c
@@ -1958,26 +1958,28 @@ zil_max_log_data(zilog_t *zilog, size_t hdrsize)
 
 /*
  * Maximum amount of log space we agree to waste to reduce number of
- * WR_NEED_COPY chunks to reduce zl_get_data() overhead (~12%).
+ * WR_NEED_COPY chunks to reduce zl_get_data() overhead (~6%).
  */
 static inline uint64_t
 zil_max_waste_space(zilog_t *zilog)
 {
-	return (zil_max_log_data(zilog, sizeof (lr_write_t)) / 8);
+	return (zil_max_log_data(zilog, sizeof (lr_write_t)) / 16);
 }
 
 /*
  * Maximum amount of write data for WR_COPIED.  For correctness, consumers
  * must fall back to WR_NEED_COPY if we can't fit the entire record into one
  * maximum sized log block, because each WR_COPIED record must fit in a
- * single log block.  For space efficiency, we want to fit two records into a
- * max-sized log block.
+ * single log block.  Below that it is a tradeoff of additional memory copy
+ * and possibly worse log space efficiency vs additional range lock/unlock.
  */
+static uint_t zil_maxcopied = 7680;
+
 uint64_t
 zil_max_copied_data(zilog_t *zilog)
 {
-	return ((zilog->zl_max_block_size - sizeof (zil_chain_t)) / 2 -
-	    sizeof (lr_write_t));
+	uint64_t max_data = zil_max_log_data(zilog, sizeof (lr_write_t));
+	return (MIN(max_data, zil_maxcopied));
 }
 
 /*
@@ -4226,3 +4228,6 @@ ZFS_MODULE_PARAM(zfs_zil, zil_, slog_bulk, U64, ZMOD_RW,
 
 ZFS_MODULE_PARAM(zfs_zil, zil_, maxblocksize, UINT, ZMOD_RW,
 	"Limit in bytes of ZIL log block size");
+
+ZFS_MODULE_PARAM(zfs_zil, zil_, maxcopied, UINT, ZMOD_RW,
+	"Limit in bytes WR_COPIED size");
diff --git a/sys/contrib/openzfs/rpm/generic/zfs.spec.in b/sys/contrib/openzfs/rpm/generic/zfs.spec.in
index 8c538a00d203..2e89abd0edfd 100644
--- a/sys/contrib/openzfs/rpm/generic/zfs.spec.in
+++ b/sys/contrib/openzfs/rpm/generic/zfs.spec.in
@@ -19,6 +19,15 @@
 %endif
 %endif
 
+# Set the default _bashcompletiondir directory based on distribution.
+%if %{undefined _bashcompletiondir}
+%if 0%{?rhel}%{?fedora}%{?centos}%{?suse_version}%{?openEuler}
+%global _bashcompletiondir    /etc/bash_completion.d
+%else
+%global _bashcompletiondir    /usr/share/bash-completion
+%endif
+%endif
+
 # Set the default dracut directory based on distribution.
 %if %{undefined _dracutdir}
 %if 0%{?rhel}%{?fedora}%{?centos}%{?suse_version}%{?openEuler}
@@ -522,7 +531,7 @@ systemctl --system daemon-reload >/dev/null || true
 %config(noreplace) %{_sysconfdir}/%{name}/vdev_id.conf.*.example
 %attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/*
 
-%config(noreplace) %{_sysconfdir}/bash_completion.d/zfs
+%config(noreplace) %{_bashcompletiondir}/zfs
 
 %files -n libzpool5
 %{_libdir}/libzpool.so.*
diff --git a/sys/contrib/openzfs/scripts/Makefile.am b/sys/contrib/openzfs/scripts/Makefile.am
index 075434566437..b43bf97dbdf4 100644
--- a/sys/contrib/openzfs/scripts/Makefile.am
+++ b/sys/contrib/openzfs/scripts/Makefile.am
@@ -29,6 +29,7 @@ endif
 dist_noinst_DATA += \
 	%D%/cstyle.pl \
 	%D%/enum-extract.pl \
+	%D%/update_authors.pl \
 	%D%/zfs2zol-patch.sed \
 	%D%/zol2zfs-patch.sed
 
diff --git a/sys/contrib/openzfs/scripts/update_authors.pl b/sys/contrib/openzfs/scripts/update_authors.pl
new file mode 100755
index 000000000000..8dd49b5fb38d
--- /dev/null
+++ b/sys/contrib/openzfs/scripts/update_authors.pl
@@ -0,0 +1,322 @@
+#!/usr/bin/env perl
+
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2023, Rob Norris <robn@despairlabs.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+
+# This program will update the AUTHORS file to include commit authors that are
+# in the git history but are not yet credited.
+#
+# The CONTRIBUTORS section of the AUTHORS file attempts to be a list of
+# individual contributors to OpenZFS, with one name, address and line per
+# person. This is good for readability, but does not really leave room for the
+# that names and emails on commits from the same individual can be different,
+# for all kinds of reasons, not limited to:
+#
+# - a person might change organisations, and so their email address changes
+#
+# - a person might be paid to work on OpenZFS for their employer, and then hack
+#   on personal projects in the evening, so commits legitimately come from
+#   different addresses
+#
+# - names change for all kinds of reasons
+#
+# To try and account for this, this program will try to find all the possible
+# names and emails for a single contributor, and then select the "best" one to
+# add to the AUTHORS file.
+#
+# The CONTRIBUTORS section of the AUTHORS file is considered the source of
+# truth. Once an individual committer is listed in there, that line will not be
+# removed regardless of what is discovered in the commit history. However, it
+# can't just be _anything_. The name or email still has to match something seen
+# in the commit history, so that we're able to undertand that its the same
+# contributor.
+#
+# The bulk of the work is in running `git log` to fetch commit author names and
+# emails. For each value, we generate a "slug" to use as an internal id for
+# that value, which is mostly just the lowercase of the value with whitespace
+# and punctuation removed. Two values with subtle differences can produce the
+# same slug, so at this point we also try to keep the "best" pre-slug value as
+# the display version. We use this slug to update two maps, one of email->name,
+# the other of name->email.
+#
+# Once collected, we then walk all the emails we've seen and get all the names
+# associated with every instance. Then for each of those names, we get all the
+# emails associated, and so on until we've seen all the connected names and
+# emails. This collection is every possible name and email for an individual
+# contributor.
+#
+# Finaly, we consider these groups, and select the "best" name and email for
+# the contributor, and add them to the author tables if they aren't there
+# already. Once we've done everyone, we write out a new AUTHORS file, and
+# that's the whole job.
+#
+# This is imperfect! Its necessary for the user to examine the diff and make
+# sure its sensible. If it hasn't hooked up right, it may necessary to adjust
+# the input data (via .mailmap) or improve the heuristics in this program. It
+# took a long time to get into good shape when first written (355 new names
+# added to AUTHORS!) but hopefully in the future we'll be running this
+# regularly so it doesn't fall so far behind.
+
+
+use 5.010;
+use warnings;
+use strict;
+
+# Storage for the "best looking" version of name or email, keyed on slug.
+my %display_name;
+my %display_email;
+
+# First, we load the existing AUTHORS file. We save everything before
+# CONTRIBUTORS: line as-is so we can write it back out to the new file. Then
+# we extract name,email pairs from the remainder and store them in a pair of
+# hashtables, keyed on slug.
+my %authors_name;
+my %authors_email;
+
+my @authors_header;
+
+for my $line (do { local (@ARGV) = ('AUTHORS'); <> }) {
+	chomp $line;
+	state $in_header = 1;
+	if ($in_header) {
+		push @authors_header, $line;
+		$in_header = 0 if $line =~ m/^CONTRIBUTORS:/;
+	} else {
+		my ($name, $email) = $line =~ m/^\s+(.+)(?= <) <([^>]+)/;
+		next unless $name;
+
+		my $semail = email_slug($email);
+		my $sname = name_slug($name);
+
+		$authors_name{$semail} = $sname;
+		$authors_email{$sname} = $semail;
+
+		# The name/email in AUTHORS is already the "best looking"
+		# version, by definition.
+		$display_name{$sname} = $name;
+		$display_email{$semail} = $email;
+	}
+}
+
+# Next, we load all the commit authors. and form name<->email mappings, keyed
+# on slug. Note that this format is getting the .mailmap-converted form. This
+# lets us control the input to some extent by making changes there.
+my %git_names;
+my %git_emails;
+
+for my $line (reverse qx(git log --pretty=tformat:'%aN:::%aE')) {
+	chomp $line;
+	my ($name, $email) = $line =~ m/^(.*):::(.*)/;
+	next unless $name && $email;
+
+	my $semail = email_slug($email);
+	my $sname = name_slug($name);
+
+	$git_names{$semail}{$sname} = 1;
+	$git_emails{$sname}{$semail} = 1;
+
+	# Update the "best looking" display value, but only if we don't already
+	# have something from the AUTHORS file. If we do, we must not change it.
+	if (!$authors_name{email_slug($email)}) {
+		update_display_email($email);
+	}
+
+	if (!$authors_email{name_slug($name)}) {
+		update_display_name($name);
+	}
+}
+
+# Now collect unique committers by all names+emails we've ever seen for them.
+# We start with emails and resolve all possible names, then we resolve the
+# emails for those names, and round and round until there's nothing left.
+my @committers;
+for my $start_email (sort keys %git_names) {
+	# it might have been deleted already through a cross-reference
+	next unless $git_names{$start_email};
+
+	my %emails;
+	my %names;
+
+	my @check_emails = ($start_email);
+	my @check_names;
+	while (@check_emails || @check_names) {
+		while (my $email = shift @check_emails) {
+			next if $emails{$email}++;
+			push @check_names,
+			    sort keys %{delete $git_names{$email}};
+		}
+		while (my $name = shift @check_names) {
+			next if $names{$name}++;
+			push @check_emails,
+			    sort keys %{delete $git_emails{$name}};
+		}
+	}
+
+	# A "committer" is the collection of connected names and emails.
+	push @committers, [[sort keys %emails], [sort keys %names]];
+}
+
+# Now we have our committers, we can work out what to add to AUTHORS.
+for my $committer (@committers) {
+	my ($emails, $names) = @$committer;
+
+	# If this commiter is already in AUTHORS, we must not touch.
+	next if grep { $authors_name{$_} } @$emails;
+	next if grep { $authors_email{$_} } @$names;
+
+	# Decide on the "best" name and email to use
+	my $email = best_email(@$emails);
+	my $name = best_name(@$names);
+
+	$authors_email{$name} = $email;
+	$authors_name{$email} = $name;
+}
+
+# Now output the new AUTHORS file
+open my $fh, '>', 'AUTHORS' or die "E: couldn't open AUTHORS for write: $!\n";
+#my $fh = \*STDOUT;
+say $fh join("\n", @authors_header, "");
+for my $name (sort keys %authors_email) {
+	my $cname = $display_name{$name};
+	my $cemail = $display_email{email_slug($authors_email{$name})};
+	say $fh "    $cname <$cemail>";
+}
+
+exit 0;
+
+# "Slugs" are used at the hashtable key for names and emails. They are used to
+# making two variants of a value be the "same" for matching. Mostly this is
+# to make upper and lower-case versions of a name or email compare the same,
+# but we do a little bit of munging to handle some common cases.
+#
+# Note that these are only used for matching internally; for display, the
+# slug will be used to look up the display form.
+sub name_slug {
+	my ($name) = @_;
+
+	# Remove spaces and dots, to handle differences in initials.
+	$name =~ s/[\s\.]//g;
+
+	return lc $name;
+}
+sub email_slug {
+	my ($email) = @_;
+
+	# Remove everything up to and including the first space, and the last
+	# space and everything after it.
+	$email =~ s/^(.*\s+)|(\s+.*)$//g;
+
+	# Remove the leading userid+ on Github noreply addresses. They're
+	# optional and we want to treat them as the same thing.
+	$email =~ s/^[^\+]*\+//g if $email =~ m/\.noreply\.github\.com$/;
+
+	return lc $email;
+}
+
+sub update_display_name {
+	my ($name) = @_;
+	my $sname = name_slug($name);
+
+	# For names, "more specific" means "has more non-lower-case characters"
+	# (in ASCII), guessing that if a person has gone to some effort to
+	# specialise their name in a later commit, they presumably care more
+	# about it. If this is wrong, its probably better to add a .mailmap
+	# entry.
+
+	my $cname = $display_name{$sname};
+	if (!$cname ||
+	    ($name =~ tr/a-z //) < ($cname =~ tr/a-z //)) {
+		$display_name{$sname} = $name;
+	}
+}
+sub update_display_email {
+	my ($email) = @_;
+	my $semail = email_slug($email);
+
+	# Like names, we prefer uppercase when possible. We also remove any
+	# leading "plus address" for Github noreply addresses.
+	$email =~ s/^[^\+]*\+//g if $email =~ m/\.noreply\.github\.com$/;
+
+	my $cemail = $display_email{$semail};
+	if (!$cemail ||
+	    ($email =~ tr/a-z //) < ($cemail =~ tr/a-z //)) {
+		$display_email{$semail} = $email;
+	}
+}
+
+sub best_name {
+	my @names = sort {
+		my $cmp;
+		my ($aa) = $display_name{$a};
+		my ($bb) = $display_name{$b};
+
+		# The "best" name is very subjective, and a simple sort
+		# produced good-enough results, so I didn't try harder. Use of
+		# accented characters, punctuation and caps are probably an
+		# indicator of "better", but possibly we should also take into
+		# account the most recent name we saw, in case the committer
+		# has changed their name or nickname or similar.
+		#
+		# Really, .mailmap is the place to control this.
+
+		return ($aa cmp $bb);
+	} @_;
+
+	return shift @names;
+}
+sub best_email {
+	state $internal_re = qr/\.(?:internal|local|\(none\))$/;
+	state $noreply_re  = qr/\.noreply\.github\.com$/;
+	state $freemail_re = qr/\@(?:gmail|hotmail)\.com$/;
+
+	my @emails = sort {
+		my $cmp;
+
+		# prefer address with a single @ over those without
+		$cmp = (($b =~ tr/@//) == 1) <=> (($a =~ tr/@//) == 1);
+		return $cmp unless $cmp == 0;
+
+		# prefer any address over internal/local addresses
+		$cmp = (($a =~ $internal_re) <=> ($b =~ $internal_re));
+		return $cmp unless $cmp == 0;
+
+		# prefer any address over github noreply aliases
+		$cmp = (($a =~ $noreply_re) <=> ($b =~ $noreply_re));
+		return $cmp unless $cmp == 0;
+
+		# prefer any address over freemail providers
+		$cmp = (($a =~ $freemail_re) <=> ($b =~ $freemail_re));
+		return $cmp unless $cmp == 0;
+
+		# alphabetical by domain
+		my ($alocal, $adom) = split /\@/, $a;
+		my ($blocal, $bdom) = split /\@/, $b;
+		$cmp = ($adom cmp $bdom);
+		return $cmp unless $cmp == 0;
+
+		# alphabetical by local part
+		return ($alocal cmp $blocal);
+	} @_;
+
+	return shift @emails;
+}
diff --git a/sys/contrib/openzfs/tests/runfiles/common.run b/sys/contrib/openzfs/tests/runfiles/common.run
index 342f56d50d04..ef787c65c0f9 100644
--- a/sys/contrib/openzfs/tests/runfiles/common.run
+++ b/sys/contrib/openzfs/tests/runfiles/common.run
@@ -281,7 +281,7 @@ tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos',
     'user_property_004_pos', 'version_001_neg', 'zfs_set_001_neg',
     'zfs_set_002_neg', 'zfs_set_003_neg', 'property_alias_001_pos',
     'mountpoint_003_pos', 'ro_props_001_pos', 'zfs_set_keylocation',
-    'zfs_set_feature_activation']
+    'zfs_set_feature_activation', 'zfs_set_nomount']
 tags = ['functional', 'cli_root', 'zfs_set']
 
 [tests/functional/cli_root/zfs_share]
diff --git a/sys/contrib/openzfs/tests/runfiles/linux.run b/sys/contrib/openzfs/tests/runfiles/linux.run
index 2c8d5cb0ecbb..2252e46df3a8 100644
--- a/sys/contrib/openzfs/tests/runfiles/linux.run
+++ b/sys/contrib/openzfs/tests/runfiles/linux.run
@@ -82,6 +82,13 @@ tests = ['zpool_expand_001_pos', 'zpool_expand_002_pos',
     'zpool_expand_003_neg', 'zpool_expand_004_pos', 'zpool_expand_005_pos']
 tags = ['functional', 'cli_root', 'zpool_expand']
 
+[tests/functional/cli_root/zpool_import:Linux]
+tests = ['zpool_import_hostid_changed',
+    'zpool_import_hostid_changed_unclean_export',
+    'zpool_import_hostid_changed_cachefile',
+    'zpool_import_hostid_changed_cachefile_unclean_export']
+tags = ['functional', 'cli_root', 'zpool_import']
+
 [tests/functional/cli_root/zpool_reopen:Linux]
 tests = ['zpool_reopen_001_pos', 'zpool_reopen_002_pos',
     'zpool_reopen_003_pos', 'zpool_reopen_004_pos', 'zpool_reopen_005_pos',
diff --git a/sys/contrib/openzfs/tests/runfiles/sanity.run b/sys/contrib/openzfs/tests/runfiles/sanity.run
index 449bf1c0f56a..ab41c05b8473 100644
--- a/sys/contrib/openzfs/tests/runfiles/sanity.run
+++ b/sys/contrib/openzfs/tests/runfiles/sanity.run
@@ -212,7 +212,7 @@ tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos',
     'user_property_001_pos', 'user_property_003_neg', 'readonly_001_pos',
     'user_property_004_pos', 'version_001_neg',
     'zfs_set_003_neg', 'property_alias_001_pos',
-    'zfs_set_keylocation', 'zfs_set_feature_activation']
+    'zfs_set_keylocation', 'zfs_set_feature_activation', 'zfs_set_nomount']
 tags = ['functional', 'cli_root', 'zfs_set']
 
 [tests/functional/cli_root/zfs_snapshot]
diff --git a/sys/contrib/openzfs/tests/test-runner/bin/zts-report.py.in b/sys/contrib/openzfs/tests/test-runner/bin/zts-report.py.in
index 558e4b57279d..5d1360380de5 100755
--- a/sys/contrib/openzfs/tests/test-runner/bin/zts-report.py.in
+++ b/sys/contrib/openzfs/tests/test-runner/bin/zts-report.py.in
@@ -262,7 +262,6 @@ if sys.platform.startswith('freebsd'):
         'cli_root/zfs_inherit/zfs_inherit_001_neg': ['FAIL', known_reason],
         'cli_root/zpool_import/zpool_import_012_pos': ['FAIL', known_reason],
         'delegate/zfs_allow_003_pos': ['FAIL', known_reason],
-        'delegate/zfs_allow_010_pos': ['FAIL', known_reason],
         'inheritance/inherit_001_pos': ['FAIL', 11829],
         'resilver/resilver_restart_001': ['FAIL', known_reason],
         'pool_checkpoint/checkpoint_big_rewind': ['FAIL', 12622],
diff --git a/sys/contrib/openzfs/tests/zfs-tests/include/tunables.cfg b/sys/contrib/openzfs/tests/zfs-tests/include/tunables.cfg
index 80e7bcb3bd09..8010a9451597 100644
--- a/sys/contrib/openzfs/tests/zfs-tests/include/tunables.cfg
+++ b/sys/contrib/openzfs/tests/zfs-tests/include/tunables.cfg
@@ -89,7 +89,7 @@ VDEV_VALIDATE_SKIP		vdev.validate_skip		vdev_validate_skip
 VOL_INHIBIT_DEV			UNSUPPORTED			zvol_inhibit_dev
 VOL_MODE			vol.mode			zvol_volmode
 VOL_RECURSIVE			vol.recursive			UNSUPPORTED
-VOL_USE_BLK_MQ			UNSUPPORTED			zvol_use_blk_mq
+VOL_USE_BLK_MQ			UNSUPPORTED			UNSUPPORTED
 XATTR_COMPAT			xattr_compat			zfs_xattr_compat
 ZEVENT_LEN_MAX			zevent.len_max			zfs_zevent_len_max
 ZEVENT_RETAIN_MAX		zevent.retain_max		zfs_zevent_retain_max
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am b/sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am
index 1a58e6f774e9..158401e078aa 100644
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am
@@ -870,6 +870,7 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
 	functional/cli_root/zfs_set/zfs_set_003_neg.ksh \
 	functional/cli_root/zfs_set/zfs_set_feature_activation.ksh \
 	functional/cli_root/zfs_set/zfs_set_keylocation.ksh \
+	functional/cli_root/zfs_set/zfs_set_nomount.ksh \
 	functional/cli_root/zfs_share/cleanup.ksh \
 	functional/cli_root/zfs_share/setup.ksh \
 	functional/cli_root/zfs_share/zfs_share_001_pos.ksh \
@@ -1103,6 +1104,10 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
 	functional/cli_root/zpool_import/zpool_import_features_001_pos.ksh \
 	functional/cli_root/zpool_import/zpool_import_features_002_neg.ksh \
 	functional/cli_root/zpool_import/zpool_import_features_003_pos.ksh \
+	functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh \
+	functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh \
+	functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh \
+	functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh \
 	functional/cli_root/zpool_import/zpool_import_missing_001_pos.ksh \
 	functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh \
 	functional/cli_root/zpool_import/zpool_import_missing_003_pos.ksh \
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh
index 2cd2f4763a73..e52b34ec8a51 100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh
@@ -52,6 +52,8 @@ log_must set_tunable64 TXG_TIMEOUT 5000
 
 log_must zpool create -o feature@block_cloning=enabled $TESTPOOL $DISKS
 
+log_must sync_pool $TESTPOOL true
+
 log_must dd if=/dev/urandom of=/$TESTPOOL/file bs=128K count=4
 log_must clonefile -f /$TESTPOOL/file /$TESTPOOL/clone 0 0 524288
 
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_nomount.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_nomount.ksh
new file mode 100755
index 000000000000..ebf08711423c
--- /dev/null
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_nomount.ksh
@@ -0,0 +1,103 @@
+#!/bin/ksh -p
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or https://opensource.org/licenses/CDDL-1.0.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2023 by iXsystems, Inc. All rights reserved.
+#
+
+. $STF_SUITE/include/libtest.shlib
+. $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
+
+#
+# DESCRIPTION:
+# 'zfs set -u' should update the mountpoint, sharenfs and sharesmb
+# properties without mounting and sharing the dataset. Validate the
+# bevaior while dataset is mounted and unmounted.
+#
+# STRATEGY:
+# 1. Confirm dataset is currently mounted
+# 2. Update the mountpoint with -u flag
+# 3. Confirm mountpoint property is updated with new value
+# 4. Confirm dataset is still mounted at previous mountpoint
+# 5. Unmount the dataset
+# 6. Confirm dataset is unmounted
+# 7. Mount the dataset
+# 8. Confirm dataset is mounted at new mountpoint, that was set with -u flag.
+# 9. Update and mount the dataset at previous mountpoint.
+# 10. Unmount the dataset
+# 11. Update mountpoint property with zfs set -u
+# 12. Confirm dataset is not mounted
+# 13. Update sharenfs property with zfs set -u
+# 14. Confirm dataset is not mounted
+# 15. Update sharesmb property with zfs set -u
+# 16. Confirm dataset is not mounted
+# 17. Mount the dataset and confirm dataset is mounted at new mountpoint
+#
+
+verify_runnable "both"
+
+function cleanup
+{
+	log_must zfs set sharenfs=off $TESTPOOL/$TESTFS
+	if is_linux; then
+		log_must zfs set sharesmb=off $TESTPOOL/$TESTFS
+	fi
+	rm -r $newmpt
+}
+
+log_assert "'zfs set -u' sets the mountpoint and share properties without " \
+	"mounting the dataset"
+log_onexit cleanup
+
+oldmpt=$(get_prop mountpoint $TESTPOOL/$TESTFS)
+newmpt=$TEST_BASE_DIR/abc
+
+# Test while dataset is mounted
+log_must ismounted $TESTPOOL/$TESTFS
+log_must zfs set -u mountpoint=$newmpt $TESTPOOL/$TESTFS
+log_must check_user_prop $TESTPOOL/$TESTFS mountpoint $newmpt
+log_must eval "[[ "$(mount | grep $TESTPOOL/$TESTFS | awk '{print $3}')" == $oldmpt ]]"
+log_must zfs unmount $TESTPOOL/$TESTFS
+log_mustnot ismounted $TESTPOOL/$TESTFS
+log_must zfs mount $TESTPOOL/$TESTFS
+log_must eval "[[ "$(mount | grep $TESTPOOL/$TESTFS | awk '{print $3}')" == $newmpt ]]"
+
+# Test while dataset is unmounted
+log_must zfs set mountpoint=$oldmpt $TESTPOOL/$TESTFS
+log_must ismounted $TESTPOOL/$TESTFS
+log_must zfs unmount $TESTPOOL/$TESTFS
+log_must zfs set -u mountpoint=$newmpt $TESTPOOL/$TESTFS
+log_mustnot ismounted $TESTPOOL/$TESTFS
+log_must zfs set -u sharenfs=on $TESTPOOL/$TESTFS
+log_mustnot ismounted $TESTPOOL/$TESTFS
+if is_linux; then
+	log_must zfs set -u sharesmb=on $TESTPOOL/$TESTFS
+	log_mustnot ismounted $TESTPOOL/$TESTFS
+fi
+log_must zfs mount $TESTPOOL/$TESTFS
+log_must check_user_prop $TESTPOOL/$TESTFS mountpoint $newmpt
+log_must eval "[[ "$(mount | grep $TESTPOOL/$TESTFS | awk '{print $3}')" == $newmpt ]]"
+
+log_must zfs set mountpoint=$oldmpt $TESTPOOL/$TESTFS
+log_must ismounted $TESTPOOL/$TESTFS
+
+log_pass "'zfs set -u' functions correctly"
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_concurrent_shares.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_concurrent_shares.ksh
index c226f56e3dcb..d779689f83bd 100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_concurrent_shares.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_concurrent_shares.ksh
@@ -98,11 +98,26 @@ function test_share # filesystem
 
 	zfs set sharenfs=on $filesystem || \
 	    sub_fail "zfs set sharenfs=on $filesystem failed."
-	is_shared $mntp || \
-	    sub_fail "File system $filesystem is not shared (set sharenfs)."
 
 	#
-	# Verify 'zfs share' works as well.
+	# Verify 'zfs share' results in a shared mount.  We check this
+	# multiple times because of Fedora 37+ it's been observed in
+	# the CI that the share may not be immediately reported.
+	#
+	for retry in $(seq 1 10); do
+		is_shared $mntp && break
+
+		log_note "Wait $retry / 10 for is_shared $mntp (set sharenfs)"
+
+		if [[ $retry -eq 10 ]]; then
+			sub_fail "File system $filesystem is not shared (set sharenfs)."
+		fi
+
+		sleep 1
+	done
+
+	#
+	# Verify 'zfs unshare' works as well.
 	#
 	zfs unshare $filesystem || \
 	    sub_fail "zfs unshare $filesystem failed."
@@ -112,9 +127,23 @@ function test_share # filesystem
 
 	zfs share $filesystem || \
 	    sub_fail "zfs share $filesystem failed."
-	is_shared $mntp || \
-	    sub_fail "file system $filesystem is not shared (zfs share)."
 
+	#
+	# Verify 'zfs share' results in a shared mount.  We check this
+	# multiple times because of Fedora 37+ it's been observed in
+	# the CI that the share may not be immediately reported.
+	#
+	for retry in $(seq 1 10); do
+		is_shared $mntp && break
+
+		log_note "Wait $retry / 10 for is_shared $mntp (zfs share)"
+
+		if [[ $retry -eq 10 ]]; then
+			sub_fail "File system $filesystem is not shared (zfs share)."
+		fi
+
+		sleep 1
+	done
 
 	#log_note "Sharing a shared file system fails."
 	zfs share $filesystem && \
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.cfg b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.cfg
index 4a9fb5e7489a..cf9c6a8499af 100644
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.cfg
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.cfg
@@ -26,6 +26,7 @@
 
 #
 # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -63,3 +64,7 @@ export VDEV4=$DEVICE_DIR/${DEVICE_FILE}4
 export VDEV5=$DEVICE_DIR/${DEVICE_FILE}5
 
 export ALTER_ROOT=/alter_import-test
+
+export HOSTID_FILE="/etc/hostid"
+export HOSTID1=01234567
+export HOSTID2=89abcdef
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib
index 559810ff0e30..50157fa80578 100644
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib
@@ -11,6 +11,7 @@
 
 #
 # Copyright (c) 2016 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
 #
 
 . $STF_SUITE/include/libtest.shlib
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh
new file mode 100755
index 000000000000..bc82b7cc1ee8
--- /dev/null
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh
@@ -0,0 +1,59 @@
+#!/bin/ksh -p
+
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2021 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
+#
+
+. $STF_SUITE/tests/functional/cli_root/zpool_import/zpool_import.kshlib
+
+#
+# DESCRIPTION:
+# A pool that was cleanly exported should be importable without force even if
+# the local hostid doesn't match the on-disk hostid.
+#
+# STRATEGY:
+#	1. Set a hostid.
+#	2. Create a pool.
+#	3. Export the pool.
+#	4. Change the hostid.
+#	5. Verify that importing the pool without force succeeds.
+#
+
+verify_runnable "global"
+
+function custom_cleanup
+{
+	rm -f $HOSTID_FILE
+	cleanup
+}
+
+log_onexit custom_cleanup
+
+# 1. Set a hostid.
+log_must zgenhostid -f $HOSTID1
+
+# 2. Create a pool.
+log_must zpool create $TESTPOOL1 $VDEV0
+
+# 3. Export the pool.
+log_must zpool export $TESTPOOL1
+
+# 4. Change the hostid.
+log_must zgenhostid -f $HOSTID2
+
+# 5. Verify that importing the pool without force succeeds.
+log_must zpool import -d $DEVICE_DIR $TESTPOOL1
+
+log_pass "zpool import can import cleanly exported pool when hostid changes."
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh
new file mode 100755
index 000000000000..07c43482d68f
--- /dev/null
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh
@@ -0,0 +1,65 @@
+#!/bin/ksh -p
+
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2021 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
+#
+
+. $STF_SUITE/tests/functional/cli_root/zpool_import/zpool_import.kshlib
+
+#
+# DESCRIPTION:
+# A pool that was cleanly exported should be importable from a cachefile
+# without force even if the local hostid doesn't match the on-disk hostid.
+#
+# STRATEGY:
+#	1. Set a hostid.
+#	2. Create a pool with a cachefile.
+#	3. Backup the cachfile.
+#	4. Export the pool.
+#	5. Change the hostid.
+#	6. Verify that importing the pool from the cachefile succeeds
+#	   without force.
+#
+
+verify_runnable "global"
+
+function custom_cleanup
+{
+	rm -f $HOSTID_FILE $CPATH $CPATHBKP
+	cleanup
+}
+
+log_onexit custom_cleanup
+
+# 1. Set a hostid.
+log_must zgenhostid -f $HOSTID1
+
+# 2. Create a pool.
+log_must zpool create -o cachefile=$CPATH $TESTPOOL1 $VDEV0
+
+# 3. Backup the cachfile.
+log_must cp $CPATH $CPATHBKP
+
+# 4. Export the pool.
+log_must zpool export $TESTPOOL1
+
+# 5. Change the hostid.
+log_must zgenhostid -f $HOSTID2
+
+# 6. Verify that importing the pool from the cachefile succeeds without force.
+log_must zpool import -c $CPATHBKP $TESTPOOL1
+
+log_pass "zpool import can import cleanly exported pool from cachefile " \
+  "when hostid changes."
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh
new file mode 100755
index 000000000000..dcb1ac1ab69f
--- /dev/null
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh
@@ -0,0 +1,75 @@
+#!/bin/ksh -p
+
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2021 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
+#
+
+. $STF_SUITE/tests/functional/cli_root/zpool_import/zpool_import.kshlib
+
+#
+# DESCRIPTION:
+# A pool that wasn't cleanly exported should not be importable from a cachefile
+# without force if the local hostid doesn't match the on-disk hostid.
+#
+# STRATEGY:
+#	1. Set a hostid.
+#	2. Create a pool.
+#	3. Backup the cachefile.
+#	4. Simulate the pool being torn down without export:
+#	4.1. Copy the underlying device state.
+#	4.2. Export the pool.
+#	4.3. Restore the device state from the copy.
+#	5. Change the hostid.
+#	6. Verify that importing the pool from the cachefile fails.
+#	7. Verify that importing the pool from the cachefile with force
+#	   succeeds.
+#
+
+verify_runnable "global"
+
+function custom_cleanup
+{
+	rm -f $HOSTID_FILE $CPATH $CPATHBKP $VDEV0.bak
+	cleanup
+}
+
+log_onexit custom_cleanup
+
+# 1. Set a hostid.
+log_must zgenhostid -f $HOSTID1
+
+# 2. Create a pool.
+log_must zpool create -o cachefile=$CPATH $TESTPOOL1 $VDEV0
+
+# 3. Backup the cachfile.
+log_must cp $CPATH $CPATHBKP
+
+# 4. Simulate the pool being torn down without export.
+log_must cp $VDEV0 $VDEV0.bak
+log_must zpool export $TESTPOOL1
+log_must cp -f $VDEV0.bak $VDEV0
+log_must rm -f $VDEV0.bak
+
+# 5. Change the hostid.
+log_must zgenhostid -f $HOSTID2
+
+# 6. Verify that importing the pool from the cachefile fails.
+log_mustnot zpool import -c $CPATHBKP $TESTPOOL1
+
+# 7. Verify that importing the pool from the cachefile with force succeeds.
+log_must zpool import -f -c $CPATHBKP $TESTPOOL1
+
+log_pass "zpool import from cachefile requires force if not cleanly " \
+    "exported and hostid changes."
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh
new file mode 100755
index 000000000000..ad8cca642dbc
--- /dev/null
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh
@@ -0,0 +1,70 @@
+#!/bin/ksh -p
+
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2021 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
+#
+
+. $STF_SUITE/tests/functional/cli_root/zpool_import/zpool_import.kshlib
+
+#
+# DESCRIPTION:
+# A pool that wasn't cleanly exported should not be importable without force if
+# the local hostid doesn't match the on-disk hostid.
+#
+# STRATEGY:
+#	1. Set a hostid.
+#	2. Create a pool.
+#	3. Simulate the pool being torn down without export:
+#	3.1. Copy the underlying device state.
+#	3.2. Export the pool.
+#	3.3. Restore the device state from the copy.
+#	4. Change the hostid.
+#	5. Verify that importing the pool fails.
+#	6. Verify that importing the pool with force succeeds.
+#
+
+verify_runnable "global"
+
+function custom_cleanup
+{
+	rm -f $HOSTID_FILE $VDEV0.bak
+	cleanup
+}
+
+log_onexit custom_cleanup
+
+# 1. Set a hostid.
+log_must zgenhostid -f $HOSTID1
+
+# 2. Create a pool.
+log_must zpool create $TESTPOOL1 $VDEV0
+
+# 3. Simulate the pool being torn down without export.
+log_must cp $VDEV0 $VDEV0.bak
+log_must zpool export $TESTPOOL1
+log_must cp -f $VDEV0.bak $VDEV0
+log_must rm -f $VDEV0.bak
+
+# 4. Change the hostid.
+log_must zgenhostid -f $HOSTID2
+
+# 5. Verify that importing the pool fails.
+log_mustnot zpool import -d $DEVICE_DIR $TESTPOOL1
+
+# 6. Verify that importing the pool with force succeeds.
+log_must zpool import -d $DEVICE_DIR -f $TESTPOOL1
+
+log_pass "zpool import requires force if not cleanly exported " \
+    "and hostid changed."
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
index 3f2f089e8171..5ddb6ca2ddc8 100644
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
@@ -861,7 +861,7 @@ function verify_fs_mount
 	fi
 
 	if ! ismounted $fs ; then
-		log_must zfs set mountpoint=$newmntpt $fs
+		log_must zfs set -u mountpoint=$newmntpt $fs
 		log_must rm -rf $newmntpt
 		log_must mkdir $newmntpt
 
@@ -878,7 +878,7 @@ function verify_fs_mount
 		fi
 		log_must zfs umount $fs
 		log_must rm -rf $newmntpt
-		log_must zfs set mountpoint=$mntpt $fs
+		log_must zfs set -u mountpoint=$mntpt $fs
 	fi
 
 	return 0
diff --git a/sys/contrib/subrepo-openzfs/.cirrus.yml b/sys/contrib/subrepo-openzfs/.cirrus.yml
new file mode 100644
index 000000000000..18b292289e20
--- /dev/null
+++ b/sys/contrib/subrepo-openzfs/.cirrus.yml
@@ -0,0 +1,21 @@
+env:
+  CIRRUS_CLONE_DEPTH: 1
+  ARCH: amd64
+
+build_task:
+  matrix:
+    freebsd_instance:
+      image_family: freebsd-12-4
+    freebsd_instance:
+      image_family: freebsd-13-2
+    freebsd_instance:
+      image_family: freebsd-14-0-snap
+  prepare_script:
+    - pkg install -y autoconf automake libtool gettext-runtime gmake ksh93 py39-packaging py39-cffi py39-sysctl
+  configure_script:
+    - env MAKE=gmake ./autogen.sh
+    - env MAKE=gmake ./configure --with-config="user" --with-python=3.9
+  build_script:
+    - gmake -j `sysctl -n kern.smp.cpus`
+  install_script:
+    - gmake install
diff --git a/sys/contrib/subrepo-openzfs/.gitignore b/sys/contrib/subrepo-openzfs/.gitignore
index 8d91dd9466c5..47d17ae16d34 100644
--- a/sys/contrib/subrepo-openzfs/.gitignore
+++ b/sys/contrib/subrepo-openzfs/.gitignore
@@ -42,8 +42,10 @@
 !udev/**
 
 !.editorconfig
+!.cirrus.yml
 !.gitignore
 !.gitmodules
+!.mailmap
 !AUTHORS
 !autogen.sh
 !CODE_OF_CONDUCT.md
@@ -60,7 +62,6 @@
 !TEST
 !zfs.release.in
 
-
 #
 # Normal rules
 #
diff --git a/sys/contrib/subrepo-openzfs/.gitrepo b/sys/contrib/subrepo-openzfs/.gitrepo
index ce4d1b901e5e..32c9f64e11b0 100644
--- a/sys/contrib/subrepo-openzfs/.gitrepo
+++ b/sys/contrib/subrepo-openzfs/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/CTSRD-CHERI/zfs.git
 	branch = cheri-hybrid
-	commit = 425d2462d2640852afe0f58955c8615dc21ddada
-	parent = ccd6719c16f3c22870251f741f959f96909acfe9
+	commit = af57e4cccf06b5bfa8f1e1f8c376340bf36abdd1
+	parent = 5c71b22936cd1f7ee6b8678325535038788ee020
 	method = merge
 	cmdver = 0.4.3
diff --git a/sys/contrib/subrepo-openzfs/.mailmap b/sys/contrib/subrepo-openzfs/.mailmap
new file mode 100644
index 000000000000..46ef016b93f8
--- /dev/null
+++ b/sys/contrib/subrepo-openzfs/.mailmap
@@ -0,0 +1,189 @@
+# This file maps the name+email seen in a commit back to a canonical
+# name+email. Git will replace the commit name/email with the canonical version
+# wherever it sees it.
+#
+# If there is a commit in the history with a "wrong" name or email, list it
+# here. If you regularly commit with an alternate name or email address and
+# would like to ensure that you are always listed consistently in the repo, add
+# mapping here.
+#
+# On the other hand, if you use multiple names or email addresses legitimately
+# (eg you use a company email address for your paid OpenZFS work, and a
+# personal address for your evening side projects), then don't map one to the
+# other here.
+#
+# The most common formats are:
+#
+# Canonical Name <canonical-email>
+# Canonical Name <canonical-email> <commit-email>
+# Canonical Name <canonical-email> Commit Name <commit-email>
+#
+# See https://git-scm.com/docs/gitmailmap for more info.
+
+# These maps are making names consistent where they have varied but the email
+# address has never changed. In most cases, the full name is in the
+# Signed-off-by of a commit with a matching author.
+Ahelenia Ziemiańska <nabijaczleweli@gmail.com>
+Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
+Alex John <alex@stty.io>
+Andreas Dilger <adilger@dilger.ca>
+Andrew Walker <awalker@ixsystems.com>
+Benedikt Neuffer <github@itfriend.de>
+Chengfei Zhu <chengfeix.zhu@intel.com>
+Chris Lindee <chris.lindee+github@gmail.com>
+Colm Buckley <colm@tuatha.org>
+Crag Wang <crag0715@gmail.com>
+Damian Szuberski <szuberskidamian@gmail.com>
+Daniel Kolesa <daniel@octaforge.org>
+Debabrata Banerjee <dbavatar@gmail.com>
+Finix Yan <yanchongwen@hotmail.com>
+Gaurav Kumar <gauravk.18@gmail.com>
+Gionatan Danti <g.danti@assyoma.it>
+Glenn Washburn <development@efficientek.com>
+Gordan Bobic <gordan.bobic@gmail.com>
+Gregory Bartholomew <gregory.lee.bartholomew@gmail.com>
+hedong zhang <h_d_zhang@163.com>
+InsanePrawn <Insane.Prawny@gmail.com>
+Jason Cohen <jwittlincohen@gmail.com>
+Jason Harmening <jason.harmening@gmail.com>
+Jeremy Faulkner <gldisater@gmail.com>
+Jinshan Xiong <jinshan.xiong@gmail.com>
+John Poduska <jpoduska@datto.com>
+Justin Scholz <git@justinscholz.de>
+Ka Ho Ng <khng300@gmail.com>
+Kash Pande <github@tripleback.net>
+Kay Pedersen <christianpe96@gmail.com>
+KernelOfTruth <kerneloftruth@gmail.com>
+Liu Hua <liu.hua130@zte.com.cn>
+Liu Qing <winglq@gmail.com>
+loli10K <ezomori.nozomu@gmail.com>
+Matthias Blankertz <matthias@blankertz.org>
+Michael Gmelin <grembo@FreeBSD.org>
+Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
+Piotr Kubaj <pkubaj@anongoth.pl>
+Quentin Zdanis <zdanisq@gmail.com>
+Roberto Ricci <ricci@disroot.org>
+Rob Norris <robn@despairlabs.com>
+Rob Norris <rob.norris@klarasystems.com>
+Sam Lunt <samuel.j.lunt@gmail.com>
+Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com>
+Stoiko Ivanov <github@nomore.at>
+Tamas TEVESZ <ice@extreme.hu>
+WHR <msl0000023508@gmail.com>
+Yanping Gao <yanping.gao@xtaotech.com>
+Youzhong Yang <youzhong@gmail.com>
+
+# Commits from strange places, long ago
+Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
+Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@fedora-17-amd64.(none)>
+Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@myhost.(none)>
+Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-16-145.us-west-1.compute.internal>
+Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-20-6.us-west-1.compute.internal>
+Herb Wartens <wartens2@llnl.gov> <wartens2@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
+Ned Bass <bass6@llnl.gov> <bass6@zeno1.(none)>
+Tulsi Jain <tulsi.jain@delphix.com> <tulsi.jain@Tulsi-Jains-MacBook-Pro.local>
+
+# Mappings from Github no-reply addresses
+ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com>
+Alek Pinchuk <apinchuk@axcient.com> <alek-p@users.noreply.github.com>
+Alexander Lobakin <alobakin@pm.me> <solbjorn@users.noreply.github.com>
+Alexey Smirnoff <fling@member.fsf.org> <fling-@users.noreply.github.com>
+Allen Holl <allen.m.holl@gmail.com> <65494904+allen-4@users.noreply.github.com>
+Ameer Hamza <ahamza@ixsystems.com> <106930537+ixhamza@users.noreply.github.com>
+Andrew J. Hesford <ajh@sideband.org> <48421688+ahesford@users.noreply.github.com>>
+Andrew Sun <me@andrewsun.com> <as-com@users.noreply.github.com>
+Aron Xu <happyaron.xu@gmail.com> <happyaron@users.noreply.github.com>
+Arun KV <arun.kv@datacore.com> <65647132+arun-kv@users.noreply.github.com>
+Ben Wolsieffer <benwolsieffer@gmail.com> <lopsided98@users.noreply.github.com>
+bernie1995 <bernie.pikes@gmail.com> <42413912+bernie1995@users.noreply.github.com>
+Boris Protopopov <boris.protopopov@actifio.com> <bprotopopov@users.noreply.github.com>
+Brad Forschinger <github@bnjf.id.au> <bnjf@users.noreply.github.com>
+Brandon Thetford <brandon@dodecatec.com> <dodexahedron@users.noreply.github.com>
+buzzingwires <buzzingwires@outlook.com> <131118055+buzzingwires@users.noreply.github.com>
+Cedric Maunoury <cedric.maunoury@gmail.com> <38213715+cedricmaunoury@users.noreply.github.com>
+Charles Suh <charles.suh@gmail.com> <charlessuh@users.noreply.github.com>
+Dacian Reece-Stremtan <dacianstremtan@gmail.com> <35844628+dacianstremtan@users.noreply.github.com>
+Damian Szuberski <szuberskidamian@gmail.com> <30863496+szubersk@users.noreply.github.com>
+Daniel Hiepler <d-git@coderdu.de> <32984777+heeplr@users.noreply.github.com>
+Daniel Kobras <d.kobras@science-computing.de> <sckobras@users.noreply.github.com>
+Daniel Reichelt <hacking@nachtgeist.net> <nachtgeist@users.noreply.github.com>
+David Quigley <david.quigley@intel.com> <dpquigl@users.noreply.github.com>
+DHE <git@dehacked.net> <DeHackEd@users.noreply.github.com>
+Dmitri John Ledkov <dimitri.ledkov@canonical.com> <19779+xnox@users.noreply.github.com>
+Dries Michiels <driesm.michiels@gmail.com> <32487486+driesmp@users.noreply.github.com>
+Edmund Nadolski <edmund.nadolski@ixsystems.com> <137826107+ednadolski-ix@users.noreply.github.com>
+Érico Nogueira <erico.erc@gmail.com> <34201958+ericonr@users.noreply.github.com>
+Fedor Uporov <fuporov.vstack@gmail.com> <60701163+fuporovvStack@users.noreply.github.com>
+Felix Dörre <felix@dogcraft.de> <felixdoerre@users.noreply.github.com>
+Felix Neumärker <xdch47@posteo.de> <34678034+xdch47@users.noreply.github.com>
+Finix Yan <yancw@info2soft.com> <Finix1979@users.noreply.github.com>
+Gaurav Kumar <gauravk.18@gmail.com> <gaurkuma@users.noreply.github.com>
+George Gaydarov <git@gg7.io> <gg7@users.noreply.github.com>
+Georgy Yakovlev <gyakovlev@gentoo.org> <168902+gyakovlev@users.noreply.github.com>
+Gerardwx <gerardw@alum.mit.edu> <Gerardwx@users.noreply.github.com>
+Gian-Carlo DeFazio <defazio1@llnl.gov> <defaziogiancarlo@users.noreply.github.com>
+Giuseppe Di Natale <dinatale2@llnl.gov> <dinatale2@users.noreply.github.com>
+Hajo Möller <dasjoe@gmail.com> <dasjoe@users.noreply.github.com>
+Harry Mallon <hjmallon@gmail.com> <1816667+hjmallon@users.noreply.github.com>
+Hiếu Lê <leorize+oss@disroot.org> <alaviss@users.noreply.github.com>
+Jake Howard <git@theorangeone.net> <RealOrangeOne@users.noreply.github.com>
+James Cowgill <james.cowgill@mips.com> <jcowgill@users.noreply.github.com>
+Jason King <jason.king@joyent.com> <jasonbking@users.noreply.github.com>
+Jeff Dike <jdike@akamai.com> <52420226+jdike@users.noreply.github.com>
+Jitendra Patidar <jitendra.patidar@nutanix.com> <53164267+jsai20@users.noreply.github.com>
+João Carlos Mendes Luís <jonny@jonny.eng.br> <dioni21@users.noreply.github.com>
+John Eismeier <john.eismeier@gmail.com> <32205350+jeis2497052@users.noreply.github.com>
+John L. Hammond <john.hammond@intel.com> <35266395+jhammond-intel@users.noreply.github.com>
+John-Mark Gurney <jmg@funkthat.com> <jmgurney@users.noreply.github.com>
+John Ramsden <johnramsden@riseup.net> <johnramsden@users.noreply.github.com>
+Jonathon Fernyhough <jonathon@m2x.dev> <559369+jonathonf@users.noreply.github.com>
+Justin Hibbits <chmeeedalf@gmail.com> <chmeeedalf@users.noreply.github.com>
+Kevin Jin <lostking2008@hotmail.com> <33590050+jxdking@users.noreply.github.com>
+Kevin P. Fleming <kevin@km6g.us> <kpfleming@users.noreply.github.com>
+Krzysztof Piecuch <piecuch@kpiecuch.pl> <3964215+pikrzysztof@users.noreply.github.com>
+Kyle Evans <kevans@FreeBSD.org> <kevans91@users.noreply.github.com>
+Laurențiu Nicola <lnicola@dend.ro> <lnicola@users.noreply.github.com>
+loli10K <ezomori.nozomu@gmail.com> <loli10K@users.noreply.github.com>
+Lorenz Hüdepohl <dev@stellardeath.org> <lhuedepohl@users.noreply.github.com>
+Luís Henriques <henrix@camandro.org> <73643340+lumigch@users.noreply.github.com>
+Marcin Skarbek <git@skarbek.name> <mskarbek@users.noreply.github.com>
+Matt Fiddaman <github@m.fiddaman.uk> <81489167+matt-fidd@users.noreply.github.com>
+Max Zettlmeißl <max@zettlmeissl.de> <6818198+maxz@users.noreply.github.com>
+Michael Niewöhner <foss@mniewoehner.de> <c0d3z3r0@users.noreply.github.com>
+Michael Zhivich <mzhivich@akamai.com> <33133421+mzhivich@users.noreply.github.com>
+Mo Zhou <cdluminate@gmail.com> <5723047+cdluminate@users.noreply.github.com>
+Nick Mattis <nickm970@gmail.com> <nmattis@users.noreply.github.com>
+omni <omni+vagant@hack.org> <79493359+omnivagant@users.noreply.github.com>
+Pablo Correa Gómez <ablocorrea@hotmail.com> <32678034+pablofsf@users.noreply.github.com>
+Paul Zuchowski <pzuchowski@datto.com> <31706010+PaulZ-98@users.noreply.github.com>
+Peter Ashford <ashford@accs.com> <pashford@users.noreply.github.com>
+Peter Dave Hello <hsu@peterdavehello.org> <PeterDaveHello@users.noreply.github.com>
+Peter Wirdemo <peter.wirdemo@gmail.com> <4224155+pewo@users.noreply.github.com>
+Petros Koutoupis <petros@petroskoutoupis.com> <pkoutoupis@users.noreply.github.com>
+Ping Huang <huangping@smartx.com> <101400146+hpingfs@users.noreply.github.com>
+Piotr P. Stefaniak <pstef@freebsd.org> <pstef@users.noreply.github.com>
+Richard Allen <belperite@gmail.com> <33836503+belperite@users.noreply.github.com>
+Rich Ercolani <rincebrain@gmail.com> <214141+rincebrain@users.noreply.github.com>
+Rob Wing <rob.wing@klarasystems.com> <98866084+rob-wing@users.noreply.github.com>
+Roman Strashkin <roman.strashkin@nexenta.com> <Ramzec@users.noreply.github.com>
+Ryan Hirasaki <ryanhirasaki@gmail.com> <4690732+RyanHir@users.noreply.github.com>
+Samuel Wycliffe J <samwyc@hpe.com> <115969550+samwyc@users.noreply.github.com>
+Samuel Wycliffe <samuelwycliffe@gmail.com> <50765275+npc203@users.noreply.github.com>
+Savyasachee Jha <hi@savyasacheejha.com> <savyajha@users.noreply.github.com>
+Scott Colby <scott@scolby.com> <scolby33@users.noreply.github.com>
+Sean Eric Fagan <kithrup@mac.com> <kithrup@users.noreply.github.com>
+Spencer Kinny <spencerkinny1995@gmail.com> <30333052+Spencer-Kinny@users.noreply.github.com>
+Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com> <75025422+nssrikanth@users.noreply.github.com>
+Thomas Geppert <geppi@digitx.de> <geppi@users.noreply.github.com>
+Tim Crawford <tcrawford@datto.com> <crawfxrd@users.noreply.github.com>
+Tom Matthews <tom@axiom-partners.com> <tomtastic@users.noreply.github.com>
+Tony Perkins <tperkins@datto.com> <62951051+tony-zfs@users.noreply.github.com>
+Torsten Wörtwein <twoertwein@gmail.com> <twoertwein@users.noreply.github.com>
+Tulsi Jain <tulsi.jain@delphix.com> <TulsiJain@users.noreply.github.com>
+Václav Skála <skala@vshosting.cz> <33496485+vaclavskala@users.noreply.github.com>
+Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com>
+Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com>
+Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com>
+xtouqh <xtouqh@hotmail.com> <72357159+xtouqh@users.noreply.github.com>
+Yuri Pankov <yuripv@FreeBSD.org> <113725409+yuripv@users.noreply.github.com>
+Yuri Pankov <yuripv@FreeBSD.org> <82001006+yuripv@users.noreply.github.com>
diff --git a/sys/contrib/subrepo-openzfs/AUTHORS b/sys/contrib/subrepo-openzfs/AUTHORS
index c2af58d75085..be1efb87b34c 100644
--- a/sys/contrib/subrepo-openzfs/AUTHORS
+++ b/sys/contrib/subrepo-openzfs/AUTHORS
@@ -10,228 +10,450 @@ PAST MAINTAINERS:
 CONTRIBUTORS:
 
     Aaron Fineman <abyxcos@gmail.com>
+    Adam D. Moss <c@yotes.com>
     Adam Leventhal <ahl@delphix.com>
     Adam Stevko <adam.stevko@gmail.com>
+    adisbladis <adis@blad.is>
+    Adrian Chadd <adrian@freebsd.org>
+    Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
     Ahmed G <ahmedg@delphix.com>
+    Aidan Harris <me@aidanharr.is>
+    AJ Jordan <alex@strugee.net>
+    ajs124 <git@ajs124.de>
     Akash Ayare <aayare@delphix.com>
+    Akash B <akash-b@hpe.com>
     Alan Somers <asomers@gmail.com>
     Alar Aun <spamtoaun@gmail.com>
     Albert Lee <trisk@nexenta.com>
     Alec Salazar <alec.j.salazar@gmail.com>
+    Alejandro Colomar <Colomar.6.4.3@GMail.com>
     Alejandro R. Sedeño <asedeno@mit.edu>
     Alek Pinchuk <alek@nexenta.com>
     Aleksa Sarai <cyphar@cyphar.com>
-    Alex Braunegg <alex.braunegg@gmail.com>
-    Alex McWhirter <alexmcwhirter@triadic.us>
-    Alex Reece <alex@delphix.com>
-    Alex Wilson <alex.wilson@joyent.com>
-    Alex Zhuravlev <alexey.zhuravlev@intel.com>
     Alexander Eremin <a.eremin@nexenta.com>
+    Alexander Lobakin <alobakin@pm.me>
     Alexander Motin <mav@freebsd.org>
     Alexander Pyhalov <apyhalov@gmail.com>
+    Alexander Richardson <Alexander.Richardson@cl.cam.ac.uk>
     Alexander Stetsenko <ams@nexenta.com>
+    Alex Braunegg <alex.braunegg@gmail.com>
     Alexey Shvetsov <alexxy@gentoo.org>
     Alexey Smirnoff <fling@member.fsf.org>
+    Alex John <alex@stty.io>
+    Alex McWhirter <alexmcwhirter@triadic.us>
+    Alex Reece <alex@delphix.com>
+    Alex Wilson <alex.wilson@joyent.com>
+    Alex Zhuravlev <alexey.zhuravlev@intel.com>
     Allan Jude <allanjude@freebsd.org>
+    Allen Holl <allen.m.holl@gmail.com>
+    alteriks <alteriks@gmail.com>
+    Alyssa Ross <hi@alyssa.is>
+    Ameer Hamza <ahamza@ixsystems.com>
+    Anatoly Borodin <anatoly.borodin@gmail.com>
     AndCycle <andcycle@andcycle.idv.tw>
+    Andrea Gelmini <andrea.gelmini@gelma.net>
+    Andrea Righi <andrea.righi@canonical.com>
     Andreas Buschmann <andreas.buschmann@tech.net.de>
     Andreas Dilger <adilger@intel.com>
+    Andreas Vögele <andreas@andreasvoegele.com>
     Andrew Barnes <barnes333@gmail.com>
     Andrew Hamilton <ahamilto@tjhsst.edu>
+    Andrew Innes <andrew.c12@gmail.com>
+    Andrew J. Hesford <ajh@sideband.org>
     Andrew Reid <ColdCanuck@nailedtotheperch.com>
     Andrew Stormont <andrew.stormont@nexenta.com>
+    Andrew Sun <me@andrewsun.com>
     Andrew Tselischev <andrewtselischev@gmail.com>
+    Andrew Turner <andrew@fubar.geek.nz>
+    Andrew Walker <awalker@ixsystems.com>
+    Andrey Prokopenko <job@terem.fr>
     Andrey Vesnovaty <andrey.vesnovaty@gmail.com>
     Andriy Gapon <avg@freebsd.org>
     Andy Bakun <github@thwartedefforts.org>
+    Andy Fiddaman <omnios@citrus-it.co.uk>
     Aniruddha Shankar <k@191a.net>
+    Anton Gubarkov <anton.gubarkov@gmail.com>
     Antonio Russo <antonio.e.russo@gmail.com>
     Arkadiusz Bubała <arkadiusz.bubala@open-e.com>
+    Armin Wehrfritz <dkxls23@gmail.com>
     Arne Jansen <arne@die-jansens.de>
     Aron Xu <happyaron.xu@gmail.com>
+    Arshad Hussain <arshad.hussain@aeoncomputing.com>
+    Arun KV <arun.kv@datacore.com>
+    Arvind Sankar <nivedita@alum.mit.edu>
+    Attila Fülöp <attila@fueloep.org>
+    Avatat <kontakt@avatat.pl>
     Bart Coddens <bart.coddens@gmail.com>
     Basil Crow <basil.crow@delphix.com>
-    Huang Liu <liu.huang@zte.com.cn>
+    Bassu <bassu@phi9.com>
     Ben Allen <bsallen@alcf.anl.gov>
-    Ben Rubson <ben.rubson@gmail.com>
+    Ben Cordero <bencord0@condi.me>
+    Benedikt Neuffer <github@itfriend.de>
     Benjamin Albrecht <git@albrecht.io>
+    Benjamin Gentil <benjgentil.pro@gmail.com>
+    Ben McGough <bmcgough@fredhutch.org>
+    Ben Rubson <ben.rubson@gmail.com>
+    Ben Wolsieffer <benwolsieffer@gmail.com>
+    bernie1995 <bernie.pikes@gmail.com>
     Bill McGonigle <bill-github.com-public1@bfccomputing.com>
     Bill Pijewski <wdp@joyent.com>
     Boris Protopopov <boris.protopopov@nexenta.com>
+    Brad Forschinger <github@bnjf.id.au>
     Brad Lewis <brad.lewis@delphix.com>
+    Brandon Thetford <brandon@dodecatec.com>
+    Brian Atkinson <bwa@g.clemson.edu>
     Brian Behlendorf <behlendorf1@llnl.gov>
     Brian J. Murrell <brian@sun.com>
+    Brooks Davis <brooks@one-eyed-alien.net>
+    BtbN <btbn@btbn.de>
+    bunder2015 <omfgbunder@gmail.com>
+    buzzingwires <buzzingwires@outlook.com>
+    bzzz77 <bzzz.tomas@gmail.com>
+    cable2999 <cable2999@users.noreply.github.com>
     Caleb James DeLisle <calebdelisle@lavabit.com>
     Cao Xuewen <cao.xuewen@zte.com.cn>
     Carlo Landmeter <clandmeter@gmail.com>
     Carlos Alberto Lopez Perez <clopez@igalia.com>
+    Cedric Maunoury <cedric.maunoury@gmail.com>
     Chaoyu Zhang <zhang.chaoyu@zte.com.cn>
+    Charles Suh <charles.suh@gmail.com>
     Chen Can <chen.can2@zte.com.cn>
+    Chengfei Zhu <chengfeix.zhu@intel.com>
     Chen Haiquan <oc@yunify.com>
     Chip Parker <aparker@enthought.com>
     Chris Burroughs <chris.burroughs@gmail.com>
     Chris Dunlap <cdunlap@llnl.gov>
     Chris Dunlop <chris@onthe.net.au>
+    Chris Lindee <chris.lindee+github@gmail.com>
+    Chris McDonough <chrism@plope.com>
     Chris Siden <chris.siden@delphix.com>
-    Chris Wedgwood <cw@f00f.org>
-    Chris Williamson <chris.williamson@delphix.com>
-    Chris Zubrzycki <github@mid-earth.net>
-    Christ Schlacta <aarcane@aarcane.info>
+    Chris Siebenmann <cks.github@cs.toronto.edu>
     Christer Ekholm <che@chrekh.se>
     Christian Kohlschütter <christian@kohlschutter.com>
     Christian Neukirchen <chneukirchen@gmail.com>
     Christian Schwarz <me@cschwarz.com>
     Christopher Voltz <cjunk@voltz.ws>
+    Christ Schlacta <aarcane@aarcane.info>
+    Chris Wedgwood <cw@f00f.org>
+    Chris Williamson <chris.williamson@delphix.com>
+    Chris Zubrzycki <github@mid-earth.net>
+    Chuck Tuffli <ctuffli@gmail.com>
     Chunwei Chen <david.chen@nutanix.com>
     Clemens Fruhwirth <clemens@endorphin.org>
+    Clemens Lang <cl@clang.name>
+    Clint Armstrong <clint@clintarmstrong.net>
     Coleman Kane <ckane@colemankane.org>
     Colin Ian King <colin.king@canonical.com>
+    Colm Buckley <colm@tuatha.org>
+    Crag Wang <crag0715@gmail.com>
     Craig Loomis <cloomis@astro.princeton.edu>
     Craig Sanders <github@taz.net.au>
     Cyril Plisko <cyril.plisko@infinidat.com>
-    DHE <git@dehacked.net>
+    Cy Schubert <cy@FreeBSD.org>
+    Cédric Berger <cedric@precidata.com>
+    Dacian Reece-Stremtan <dacianstremtan@gmail.com>
+    Dag-Erling Smørgrav <des@FreeBSD.org>
+    Damiano Albani <damiano.albani@gmail.com>
+    Damian Szuberski <szuberskidamian@gmail.com>
     Damian Wojsław <damian@wojslaw.pl>
+    Daniel Hiepler <d-git@coderdu.de>
+    Daniel Hoffman <dj.hoffman@delphix.com>
+    Daniel Kobras <d.kobras@science-computing.de>
+    Daniel Kolesa <daniel@octaforge.org>
+    Daniel Reichelt <hacking@nachtgeist.net>
+    Daniel Stevenson <bot@dstev.net>
+    Daniel Verite <daniel@verite.pro>
+    Daniil Lunev <d.lunev.mail@gmail.com>
     Dan Kimmel <dan.kimmel@delphix.com>
     Dan McDonald <danmcd@nexenta.com>
     Dan Swartzendruber <dswartz@druber.com>
     Dan Vatca <dan.vatca@gmail.com>
-    Daniel Hoffman <dj.hoffman@delphix.com>
-    Daniel Verite <daniel@verite.pro>
-    Daniil Lunev <d.lunev.mail@gmail.com>
     Darik Horn <dajhorn@vanadac.com>
     Dave Eddy <dave@daveeddy.com>
+    David Hedberg <david@qzx.se>
     David Lamparter <equinox@diac24.net>
     David Qian <david.qian@intel.com>
     David Quigley <david.quigley@intel.com>
     Debabrata Banerjee <dbanerje@akamai.com>
+    D. Ebdrup <debdrup@freebsd.org>
     Denys Rtveliashvili <denys@rtveliashvili.name>
     Derek Dai <daiderek@gmail.com>
+    DHE <git@dehacked.net>
+    Didier Roche <didrocks@ubuntu.com>
     Dimitri John Ledkov <xnox@ubuntu.com>
+    Dimitry Andric <dimitry@andric.com>
+    Dirkjan Bussink <d.bussink@gmail.com>
     Dmitry Khasanov <pik4ez@gmail.com>
+    Dominic Pearson <dsp@technoanimal.net>
     Dominik Hassler <hadfl@omniosce.org>
     Dominik Honnef <dominikh@fork-bomb.org>
     Don Brady <don.brady@delphix.com>
+    Doug Rabson <dfr@rabson.org>
     Dr. András Korn <korn-github.com@elan.rulez.org>
+    Dries Michiels <driesm.michiels@gmail.com>
+    Edmund Nadolski <edmund.nadolski@ixsystems.com>
+    Eitan Adler <lists@eitanadler.com>
     Eli Rosenthal <eli.rosenthal@delphix.com>
+    Eli Schwartz <eschwartz93@gmail.com>
     Eric Desrochers <eric.desrochers@canonical.com>
     Eric Dillmann <eric@jave.fr>
     Eric Schrock <Eric.Schrock@delphix.com>
+    Ethan Coe-Renner <coerenner1@llnl.gov>
     Etienne Dechamps <etienne@edechamps.fr>
+    Evan Allrich <eallrich@gmail.com>
+    Evan Harris <eharris@puremagic.com>
     Evan Susarret <evansus@gmail.com>
     Fabian Grünbichler <f.gruenbichler@proxmox.com>
+    Fabio Buso <dev.siroibaf@gmail.com>
+    Fabio Scaccabarozzi <fsvm88@gmail.com>
     Fajar A. Nugraha <github@fajar.net>
     Fan Yong <fan.yong@intel.com>
+    fbynite <fbynite@users.noreply.github.com>
+    Fedor Uporov <fuporov.vstack@gmail.com>
+    Felix Dörre <felix@dogcraft.de>
+    Felix Neumärker <xdch47@posteo.de>
     Feng Sun <loyou85@gmail.com>
+    Finix Yan <yancw@info2soft.com>
+    Francesco Mazzoli <f@mazzo.li>
     Frederik Wessels <wessels147@gmail.com>
     Frédéric Vanniere <f.vanniere@planet-work.com>
+    Gabriel A. Devenyi <gdevenyi@gmail.com>
     Garrett D'Amore <garrett@nexenta.com>
+    Garrett Fields <ghfields@gmail.com>
     Garrison Jensen <garrison.jensen@gmail.com>
     Gary Mills <gary_mills@fastmail.fm>
     Gaurav Kumar  <gauravk.18@gmail.com>
     GeLiXin <ge.lixin@zte.com.cn>
     George Amanakis <g_amanakis@yahoo.com>
+    George Diamantopoulos <georgediam@gmail.com>
+    George Gaydarov <git@gg7.io>
     George Melikov <mail@gmelikov.ru>
     George Wilson <gwilson@delphix.com>
     Georgy Yakovlev <ya@sysdump.net>
+    Gerardwx <gerardw@alum.mit.edu>
+    Gian-Carlo DeFazio <defazio1@llnl.gov>
+    Gionatan Danti <g.danti@assyoma.it>
     Giuseppe Di Natale <guss80@gmail.com>
+    Glenn Washburn <development@efficientek.com>
     Gordan Bobic <gordan@redsleeve.org>
+    Gordon Bergling <gbergling@googlemail.com>
     Gordon Ross <gwr@nexenta.com>
+    Graham Christensen <graham@grahamc.com>
+    Graham Perrin <grahamperrin@gmail.com>
     Gregor Kopka <gregor@kopka.net>
+    Gregory Bartholomew <gregory.lee.bartholomew@gmail.com>
+    grembo <freebsd@grem.de>
     Grischa Zengel <github.zfsonlinux@zengel.info>
+    grodik <pat@litke.dev>
     Gunnar Beutner <gunnar@beutner.name>
     Gvozden Neskovic <neskovic@gmail.com>
     Hajo Möller <dasjoe@gmail.com>
+    Han Gao <rabenda.cn@gmail.com>
     Hans Rosenfeld <hans.rosenfeld@nexenta.com>
+    Harald van Dijk <harald@gigawatt.nl>
+    Harry Mallon <hjmallon@gmail.com>
+    Harry Sintonen <github-piru@kyber.fi>
+    HC <mmttdebbcc@yahoo.com>
+    hedong zhang <h_d_zhang@163.com>
+    Heitor Alves de Siqueira <halves@canonical.com>
+    Henrik Riomar <henrik.riomar@gmail.com>
+    Herb Wartens <wartens2@llnl.gov>
+    Hiếu Lê <leorize+oss@disroot.org>
+    Huang Liu <liu.huang@zte.com.cn>
     Håkan Johansson <f96hajo@chalmers.se>
+    Igor K <igor@dilos.org>
     Igor Kozhukhov <ikozhukhov@gmail.com>
     Igor Lvovsky <ilvovsky@gmail.com>
+    ilbsmart <wgqimut@gmail.com>
+    illiliti <illiliti@protonmail.com>
+    ilovezfs <ilovezfs@icloud.com>
+    InsanePrawn <Insane.Prawny@gmail.com>
     Isaac Huang <he.huang@intel.com>
-    JK Dingwall <james@dingwall.me.uk>
     Jacek Fefliński <feflik@gmail.com>
+    Jacob Adams <tookmund@gmail.com>
+    Jake Howard <git@theorangeone.net>
     James Cowgill <james.cowgill@mips.com>
+    James H <james@kagisoft.co.uk>
     James Lee <jlee@thestaticvoid.com>
     James Pan <jiaming.pan@yahoo.com>
+    James Wah <james@laird-wah.net>
     Jan Engelhardt <jengelh@inai.de>
     Jan Kryl <jan.kryl@nexenta.com>
     Jan Sanislo <oystr@cs.washington.edu>
+    Jason Cohen <jwittlincohen@gmail.com>
+    Jason Harmening <jason.harmening@gmail.com>
     Jason King <jason.brian.king@gmail.com>
     Jason Zaman <jasonzaman@gmail.com>
     Javen Wu <wu.javen@gmail.com>
+    Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
+    Jeff Dike <jdike@akamai.com>
+    Jeremy Faulkner <gldisater@gmail.com>
     Jeremy Gill <jgill@parallax-innovations.com>
     Jeremy Jones <jeremy@delphix.com>
+    Jeremy Visser <jeremy.visser@gmail.com>
     Jerry Jelinek <jerry.jelinek@joyent.com>
+    Jessica Clarke <jrtc27@jrtc27.com>
     Jinshan Xiong <jinshan.xiong@intel.com>
+    Jitendra Patidar <jitendra.patidar@nutanix.com>
+    JK Dingwall <james@dingwall.me.uk>
     Joe Stein <joe.stein@delphix.com>
+    John-Mark Gurney <jmg@funkthat.com>
     John Albietz <inthecloud247@gmail.com>
     John Eismeier <john.eismeier@gmail.com>
-    John L. Hammond <john.hammond@intel.com>
+    John Gallagher <john.gallagher@delphix.com>
     John Layman <jlayman@sagecloud.com>
+    John L. Hammond <john.hammond@intel.com>
+    John M. Layman <jml@frijid.net>
+    Johnny Stenback <github@jstenback.com>
     John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+    John Poduska <jpoduska@datto.com>
+    John Ramsden <johnramsden@riseup.net>
     John Wren Kennedy <john.kennedy@delphix.com>
-    Johnny Stenback <github@jstenback.com>
+    jokersus <lolivampireslave@gmail.com>
+    Jonathon Fernyhough <jonathon@m2x.dev>
     Jorgen Lundman <lundman@lundman.net>
     Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
+    Josh Soref <jsoref@users.noreply.github.com>
     Joshua M. Clulow <josh@sysmgr.org>
+    José Luis Salvador Rufo <salvador.joseluis@gmail.com>
+    João Carlos Mendes Luís <jonny@jonny.eng.br>
+    Julian Brunner <julian.brunner@gmail.com>
+    Julian Heuking <JulianH@beckhoff.com>
+    jumbi77 <jumbi77@users.noreply.github.com>
     Justin Bedő <cu@cua0.org>
+    Justin Gottula <justin@jgottula.com>
+    Justin Hibbits <chmeeedalf@gmail.com>
+    Justin Keogh <github.com@v6y.net>
     Justin Lecher <jlec@gentoo.org>
+    Justin Scholz <git@justinscholz.de>
     Justin T. Gibbs <gibbs@FreeBSD.org>
+    jyxent <jordanp@gmail.com>
     Jörg Thalheim <joerg@higgsboson.tk>
-    KORN Andras <korn@elan.rulez.org>
+    ka7 <ka7@la-evento.com>
+    Ka Ho Ng <khng@FreeBSD.org>
     Kamil Domański <kamil@domanski.co>
     Karsten Kretschmer <kkretschmer@gmail.com>
     Kash Pande <kash@tripleback.net>
+    Kay Pedersen <christianpe96@gmail.com>
     Keith M Wesolowski <wesolows@foobazco.org>
+    KernelOfTruth <kerneloftruth@gmail.com>
+    Kevin Bowling <kevin.bowling@kev009.com>
+    Kevin Jin <lostking2008@hotmail.com>
+    Kevin P. Fleming <kevin@km6g.us>
     Kevin Tanguy <kevin.tanguy@ovh.net>
     KireinaHoro <i@jsteward.moe>
     Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
+    Kleber Tarcísio <klebertarcisio@yahoo.com.br>
+    Kody A Kantor <kody.kantor@gmail.com>
     Kohsuke Kawaguchi <kk@kohsuke.org>
+    Konstantin Khorenko <khorenko@virtuozzo.com>
+    KORN Andras <korn@elan.rulez.org>
+    Kristof Provost <github@sigsegv.be>
+    Krzysztof Piecuch <piecuch@kpiecuch.pl>
     Kyle Blatter <kyleblatter@llnl.gov>
+    Kyle Evans <kevans@FreeBSD.org>
     Kyle Fuller <inbox@kylefuller.co.uk>
-    Loli <ezomori.nozomu@gmail.com>
+    Laevos <Laevos@users.noreply.github.com>
+    Lalufu <Lalufu@users.noreply.github.com>
     Lars Johannsen <laj@it.dk>
+    Laura Hild <lsh@jlab.org>
+    Laurențiu Nicola <lnicola@dend.ro>
+    Lauri Tirkkonen <lauri@hacktheplanet.fi>
+    liaoyuxiangqin <guo.yong33@zte.com.cn>
     Li Dongyang <dongyang.li@anu.edu.au>
+    Liu Hua <liu.hua130@zte.com.cn>
+    Liu Qing <winglq@gmail.com>
     Li Wei <W.Li@Sun.COM>
+    Loli <ezomori.nozomu@gmail.com>
+    lorddoskias <lorddoskias@gmail.com>
+    Lorenz Brun <lorenz@dolansoft.org>
+    Lorenz Hüdepohl <dev@stellardeath.org>
+    louwrentius <louwrentius@gmail.com>
     Lukas Wunner <lukas@wunner.de>
+    luozhengzheng <luo.zhengzheng@zte.com.cn>
+    Luís Henriques <henrix@camandro.org>
     Madhav Suresh <madhav.suresh@delphix.com>
+    manfromafar <jonsonb10@gmail.com>
     Manoj Joseph <manoj.joseph@delphix.com>
     Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
     Marcel Huber <marcelhuberfoo@gmail.com>
+    Marcel Menzel <mail@mcl.gg>
+    Marcel Schilling <marcel.schilling@uni-luebeck.de>
     Marcel Telka <marcel.telka@nexenta.com>
     Marcel Wysocki <maci.stgn@gmail.com>
+    Marcin Skarbek <git@skarbek.name>
+    Mariusz Zaborski <mariusz.zaborski@klarasystems.com>
+    Mark Johnston <markj@FreeBSD.org>
+    Mark Maybee <mark.maybee@delphix.com>
+    Mark Roper <markroper@gmail.com>
     Mark Shellenbaum <Mark.Shellenbaum@Oracle.COM>
+    marku89 <mar42@kola.li>
     Mark Wright <markwright@internode.on.net>
     Martin Matuska <mm@FreeBSD.org>
+    Martin Rüegg <martin.rueegg@metaworx.ch>
     Massimo Maggi <me@massimo-maggi.eu>
-    Matt Johnston <matt@fugro-fsi.com.au>
-    Matt Kemp <matt@mattikus.com>
+    Mateusz Guzik <mjguzik@gmail.com>
+    Mateusz Piotrowski <0mp@FreeBSD.org>
+    Mathieu Velten <matmaul@gmail.com>
+    Matt Fiddaman <github@m.fiddaman.uk>
     Matthew Ahrens <matt@delphix.com>
     Matthew Thode <mthode@mthode.org>
+    Matthias Blankertz <matthias@blankertz.org>
+    Matt Johnston <matt@fugro-fsi.com.au>
+    Matt Kemp <matt@mattikus.com>
+    Matt Macy <mmacy@freebsd.org>
     Matus Kral <matuskral@me.com>
+    Mauricio Faria de Oliveira <mfo@canonical.com>
     Max Grossman <max.grossman@delphix.com>
     Maximilian Mehnert <maximilian.mehnert@gmx.de>
+    Max Zettlmeißl <max@zettlmeissl.de>
+    Md Islam <mdnahian@outlook.com>
+    megari <megari@iki.fi>
+    Michael D Labriola <michael.d.labriola@gmail.com>
+    Michael Franzl <michael@franzl.name>
     Michael Gebetsroither <michael@mgeb.org>
     Michael Kjorling <michael@kjorling.se>
     Michael Martin <mgmartin.mgm@gmail.com>
     Michael Niewöhner <foss@mniewoehner.de>
+    Michael Zhivich <mzhivich@akamai.com>
+    Michal Vasilek <michal@vasilek.cz>
     Mike Gerdts <mike.gerdts@joyent.com>
     Mike Harsch <mike@harschsystems.com>
     Mike Leddy <mike.leddy@gmail.com>
     Mike Swanson <mikeonthecomputer@gmail.com>
     Milan Jurik <milan.jurik@xylab.cz>
+    Minsoo Choo <minsoochoo0122@proton.me>
+    Mohamed Tawfik <m_tawfik@aucegypt.edu>
     Morgan Jones <mjones@rice.edu>
     Moritz Maxeiner <moritz@ucworks.org>
+    Mo Zhou <cdluminate@gmail.com>
+    naivekun <naivekun@outlook.com>
+    nathancheek <myself@nathancheek.com>
     Nathaniel Clark <Nathaniel.Clark@misrule.us>
     Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
+    Nathan Lewis <linux.robotdude@gmail.com>
     Nav Ravindranath <nav@delphix.com>
     Neal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
     Ned Bass <bass6@llnl.gov>
     Neependra Khare <neependra@kqinfotech.com>
     Neil Stockbridge <neil@dist.ro>
+    Nick Black <dank@qemfd.net>
     Nick Garvey <garvey.nick@gmail.com>
+    Nick Mattis <nickm970@gmail.com>
+    Nick Terrell <terrelln@fb.com>
+    Niklas Haas <github-c6e1c8@haasn.xyz>
     Nikolay Borisov <n.borisov.lkml@gmail.com>
+    nordaux <nordaux@gmail.com>
+    ofthesun9 <olivier@ofthesun.net>
     Olaf Faaland <faaland1@llnl.gov>
     Oleg Drokin <green@linuxhacker.ru>
     Oleg Stepura <oleg@stepura.com>
+    Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
+    omni <omni+vagant@hack.org>
+    Orivej Desh <orivej@gmx.fr>
+    Pablo Correa Gómez <ablocorrea@hotmail.com>
+    Palash Gandhi <pbg4930@rit.edu>
+    Patrick Mooney <pmooney@pfmooney.com>
     Patrik Greco <sikevux@sikevux.se>
     Paul B. Henson <henson@acm.org>
     Paul Dagnelie <pcd@delphix.com>
@@ -243,69 +465,160 @@ CONTRIBUTORS:
     Pedro Giffuni <pfg@freebsd.org>
     Peng <peng.hse@xtaotech.com>
     Peter Ashford <ashford@accs.com>
+    Peter Dave Hello <hsu@peterdavehello.org>
+    Peter Levine <plevine457@gmail.com>
+    Peter Wirdemo <peter.wirdemo@gmail.com>
+    Petros Koutoupis <petros@petroskoutoupis.com>
+    Philip Pokorny <ppokorny@penguincomputing.com>
+    Philipp Riederer <pt@philipptoelke.de>
+    Phil Kauffman <philip@kauffman.me>
+    Ping Huang <huangping@smartx.com>
+    Piotr Kubaj <pkubaj@anongoth.pl>
+    Piotr P. Stefaniak <pstef@freebsd.org>
     Prakash Surya <prakash.surya@delphix.com>
     Prasad Joshi <prasadjoshi124@gmail.com>
+    privb0x23 <privb0x23@users.noreply.github.com>
+    P.SCH <p88@yahoo.com>
+    Quentin Zdanis <zdanisq@gmail.com>
+    Rafael Kitover <rkitover@gmail.com>
+    RageLtMan <sempervictus@users.noreply.github.com>
     Ralf Ertzinger <ralf@skytale.net>
     Randall Mason <ClashTheBunny@gmail.com>
     Remy Blank <remy.blank@pobox.com>
+    renelson <bnelson@nelsonbe.com>
+    Reno Reckling <e-github@wthack.de>
     Ricardo M. Correia <ricardo.correia@oracle.com>
-    Rich Ercolani <rincebrain@gmail.com>
+    Riccardo Schirone <rschirone91@gmail.com>
+    Richard Allen <belperite@gmail.com>
     Richard Elling <Richard.Elling@RichardElling.com>
     Richard Laager <rlaager@wiktel.com>
     Richard Lowe <richlowe@richlowe.net>
     Richard Sharpe <rsharpe@samba.org>
     Richard Yao <ryao@gentoo.org>
+    Rich Ercolani <rincebrain@gmail.com>
+    Robert Novak <sailnfool@gmail.com>
+    Roberto Ricci <ricci@disroot.org>
+    Rob Norris <robn@despairlabs.com>
+    Rob Wing <rew@FreeBSD.org>
     Rohan Puri <rohan.puri15@gmail.com>
     Romain Dolbeau <romain.dolbeau@atos.net>
     Roman Strashkin <roman.strashkin@nexenta.com>
+    Ross Williams <ross@ross-williams.net>
     Ruben Kerkhof <ruben@rubenkerkhof.com>
+    Ryan Hirasaki <ryanhirasaki@gmail.com>
+    Ryan Lahfa <masterancpp@gmail.com>
+    Ryan Libby <rlibby@FreeBSD.org>
+    Ryan Moeller <freqlabs@FreeBSD.org>
+    Sam Hathaway <github.com@munkynet.org>
+    Sam Lunt <samuel.j.lunt@gmail.com>
+    Samuel VERSCHELDE <stormi-github@ylix.fr>
+    Samuel Wycliffe <samuelwycliffe@gmail.com>
+    Samuel Wycliffe J <samwyc@hpe.com>
+    Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com>
+    Sara Hartse <sara.hartse@delphix.com>
     Saso Kiselkov <saso.kiselkov@nexenta.com>
+    Satadru Pramanik <satadru@gmail.com>
+    Savyasachee Jha <genghizkhan91@hawkradius.com>
+    Scott Colby <scott@scolby.com>
     Scot W. Stevenson <scot.stevenson@gmail.com>
     Sean Eric Fagan <sef@ixsystems.com>
     Sebastian Gottschall <s.gottschall@dd-wrt.com>
+    Sebastien Roy <seb@delphix.com>
     Sen Haerens <sen@senhaerens.be>
     Serapheim Dimitropoulos <serapheim@delphix.com>
     Seth Forshee <seth.forshee@canonical.com>
+    Shaan Nobee <sniper111@gmail.com>
     Shampavman <sham.pavman@nexenta.com>
+    Shaun Tancheff <shaun@aeonazure.com>
     Shen Yan <shenyanxxxy@qq.com>
     Simon Guest <simon.guest@tesujimath.org>
     Simon Klinkert <simon.klinkert@gmail.com>
     Sowrabha Gopal <sowrabha.gopal@delphix.com>
+    Spencer Kinny <spencerkinny1995@gmail.com>
+    Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com>
     Stanislav Seletskiy <s.seletskiy@gmail.com>
     Steffen Müthing <steffen.muething@iwr.uni-heidelberg.de>
     Stephen Blinick <stephen.blinick@delphix.com>
+    sterlingjensen <sterlingjensen@users.noreply.github.com>
     Steve Dougherty <sdougherty@barracuda.com>
+    Steve Mokris <smokris@softpixel.com>
     Steven Burgess <sburgess@dattobackup.com>
     Steven Hartland <smh@freebsd.org>
     Steven Johnson <sjohnson@sakuraindustries.com>
+    Steven Noonan <steven@uplinklabs.net>
+    stf <s@ctrlc.hu>
     Stian Ellingsen <stian@plaimi.net>
+    Stoiko Ivanov <github@nomore.at>
+    Stéphane Lesimple <speed47_github@speed47.net>
     Suman Chakravartula <schakrava@gmail.com>
     Sydney Vanda <sydney.m.vanda@intel.com>
     Sören Tempel <soeren+git@soeren-tempel.net>
+    Tamas TEVESZ <ice@extreme.hu>
+    Teodor Spæren <teodor_spaeren@riseup.net>
+    TerraTech <TerraTech@users.noreply.github.com>
     Thijs Cramer <thijs.cramer@gmail.com>
+    Thomas Geppert <geppi@digitx.de>
+    Thomas Lamprecht <guggentom@hotmail.de>
+    Till Maas <opensource@till.name>
     Tim Chase <tim@chase2k.com>
     Tim Connors <tconnors@rather.puzzling.org>
     Tim Crawford <tcrawford@datto.com>
     Tim Haley <Tim.Haley@Sun.COM>
+    timor <timor.dd@googlemail.com>
+    Timothy Day <tday141@gmail.com>
+    Tim Schumacher <timschumi@gmx.de>
     Tino Reichardt <milky-zfs@mcmilk.de>
     Tobin Harding <me@tobin.cc>
     Tom Caputi <tcaputi@datto.com>
     Tom Matthews <tom@axiom-partners.com>
-    Tom Prince <tom.prince@ualberta.net>
     Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
+    Tom Prince <tom.prince@ualberta.net>
     Tony Hutter <hutter2@llnl.gov>
+    Tony Nguyen <tony.nguyen@delphix.com>
+    Tony Perkins <tperkins@datto.com>
     Toomas Soome <tsoome@me.com>
+    Torsten Wörtwein <twoertwein@gmail.com>
+    Toyam Cox <aviator45003@gmail.com>
+    Trevor Bautista <trevrb@trevrb.net>
     Trey Dockendorf <treydock@gmail.com>
+    Troels Nørgaard <tnn@tradeshift.com>
+    Tulsi Jain <tulsi.jain@delphix.com>
     Turbo Fredriksson <turbo@bayour.com>
     Tyler J. Stachecki <stachecki.tyler@gmail.com>
+    Umer Saleem <usaleem@ixsystems.com>
+    Valmiky Arquissandas <kayvlim@gmail.com>
+    Val Packett <val@packett.cool>
+    Vince van Oosten <techhazard@codeforyouand.me>
+    Violet Purcell <vimproved@inventati.org>
+    Vipin Kumar Verma <vipin.verma@hpe.com>
     Vitaut Bajaryn <vitaut.bayaryn@gmail.com>
+    Volker Mauel <volkermauel@gmail.com>
+    Václav Skála <skala@vshosting.cz>
+    Walter Huf <hufman@gmail.com>
+    Warner Losh <imp@bsdimp.com>
     Weigang Li <weigang.li@intel.com>
+    WHR <msl0000023508@gmail.com>
     Will Andrews <will@freebsd.org>
     Will Rouesnel <w.rouesnel@gmail.com>
+    Windel Bouwman <windel@windel.nl>
+    Wojciech Małota-Wójcik <outofforest@users.noreply.github.com>
     Wolfgang Bumiller <w.bumiller@proxmox.com>
     Xin Li <delphij@FreeBSD.org>
+    Xinliang Liu <xinliang.liu@linaro.org>
+    xtouqh <xtouqh@hotmail.com>
+    Yann Collet <cyan@fb.com>
+    Yanping Gao <yanping.gao@xtaotech.com>
     Ying Zhu <casualfisher@gmail.com>
+    Youzhong Yang <youzhong@gmail.com>
+    yparitcher <y@paritcher.com>
+    yuina822 <ayuichi@club.kyutech.ac.jp>
     YunQiang Su <syq@debian.org>
     Yuri Pankov <yuri.pankov@gmail.com>
     Yuxuan Shui <yshuiv7@gmail.com>
     Zachary Bedell <zac@thebedells.org>
+    Zach Dykstra <dykstra.zachary@gmail.com>
+    zgock <zgock@nuc.base.zgock-lab.net>
+    Zhu Chuang <chuang@melty.land>
+    Érico Nogueira <erico.erc@gmail.com>
+    Đoàn Trần Công Danh <congdanhqx@gmail.com>
+    韩朴宇 <w12101111@gmail.com>
diff --git a/sys/contrib/subrepo-openzfs/cmd/zdb/zdb.c b/sys/contrib/subrepo-openzfs/cmd/zdb/zdb.c
index 87499cdc95cb..b39a0e8825fb 100644
--- a/sys/contrib/subrepo-openzfs/cmd/zdb/zdb.c
+++ b/sys/contrib/subrepo-openzfs/cmd/zdb/zdb.c
@@ -5179,7 +5179,7 @@ dump_label(const char *dev)
 			if (nvlist_size(config, &size, NV_ENCODE_XDR) != 0)
 				size = buflen;
 
-			/* If the device is a cache device clear the header. */
+			/* If the device is a cache device read the header. */
 			if (!read_l2arc_header) {
 				if (nvlist_lookup_uint64(config,
 				    ZPOOL_CONFIG_POOL_STATE, &l2cache) == 0 &&
diff --git a/sys/contrib/subrepo-openzfs/cmd/zfs/zfs_main.c b/sys/contrib/subrepo-openzfs/cmd/zfs/zfs_main.c
index 21fd02ff9782..da9b2e583d7a 100644
--- a/sys/contrib/subrepo-openzfs/cmd/zfs/zfs_main.c
+++ b/sys/contrib/subrepo-openzfs/cmd/zfs/zfs_main.c
@@ -339,7 +339,7 @@ get_usage(zfs_help_t idx)
 		    "\tsend [-nVvPe] -t <receive_resume_token>\n"
 		    "\tsend [-PnVv] --saved filesystem\n"));
 	case HELP_SET:
-		return (gettext("\tset <property=value> ... "
+		return (gettext("\tset [-u] <property=value> ... "
 		    "<filesystem|volume|snapshot> ...\n"));
 	case HELP_SHARE:
 		return (gettext("\tshare [-l] <-a [nfs|smb] | filesystem>\n"));
@@ -4206,8 +4206,8 @@ zfs_do_rollback(int argc, char **argv)
 static int
 set_callback(zfs_handle_t *zhp, void *data)
 {
-	nvlist_t *props = data;
-	int ret = zfs_prop_set_list(zhp, props);
+	zprop_set_cbdata_t *cb = data;
+	int ret = zfs_prop_set_list_flags(zhp, cb->cb_proplist, cb->cb_flags);
 
 	if (ret != 0 || libzfs_errno(g_zfs) != EZFS_SUCCESS) {
 		switch (libzfs_errno(g_zfs)) {
@@ -4227,25 +4227,35 @@ set_callback(zfs_handle_t *zhp, void *data)
 static int
 zfs_do_set(int argc, char **argv)
 {
-	nvlist_t *props = NULL;
+	zprop_set_cbdata_t cb = { 0 };
 	int ds_start = -1; /* argv idx of first dataset arg */
 	int ret = 0;
-	int i;
+	int i, c;
 
-	/* check for options */
-	if (argc > 1 && argv[1][0] == '-') {
-		(void) fprintf(stderr, gettext("invalid option '%c'\n"),
-		    argv[1][1]);
-		usage(B_FALSE);
+	/* check options */
+	while ((c = getopt(argc, argv, "u")) != -1) {
+		switch (c) {
+		case 'u':
+			cb.cb_flags |= ZFS_SET_NOMOUNT;
+			break;
+		case '?':
+		default:
+			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
+			    optopt);
+			usage(B_FALSE);
+		}
 	}
 
+	argc -= optind;
+	argv += optind;
+
 	/* check number of arguments */
-	if (argc < 2) {
+	if (argc < 1) {
 		(void) fprintf(stderr, gettext("missing arguments\n"));
 		usage(B_FALSE);
 	}
-	if (argc < 3) {
-		if (strchr(argv[1], '=') == NULL) {
+	if (argc < 2) {
+		if (strchr(argv[0], '=') == NULL) {
 			(void) fprintf(stderr, gettext("missing property=value "
 			    "argument(s)\n"));
 		} else {
@@ -4256,7 +4266,7 @@ zfs_do_set(int argc, char **argv)
 	}
 
 	/* validate argument order:  prop=val args followed by dataset args */
-	for (i = 1; i < argc; i++) {
+	for (i = 0; i < argc; i++) {
 		if (strchr(argv[i], '=') != NULL) {
 			if (ds_start > 0) {
 				/* out-of-order prop=val argument */
@@ -4274,20 +4284,20 @@ zfs_do_set(int argc, char **argv)
 	}
 
 	/* Populate a list of property settings */
-	if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
+	if (nvlist_alloc(&cb.cb_proplist, NV_UNIQUE_NAME, 0) != 0)
 		nomem();
-	for (i = 1; i < ds_start; i++) {
-		if (!parseprop(props, argv[i])) {
+	for (i = 0; i < ds_start; i++) {
+		if (!parseprop(cb.cb_proplist, argv[i])) {
 			ret = -1;
 			goto error;
 		}
 	}
 
 	ret = zfs_for_each(argc - ds_start, argv + ds_start, 0,
-	    ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, props);
+	    ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb);
 
 error:
-	nvlist_free(props);
+	nvlist_free(cb.cb_proplist);
 	return (ret);
 }
 
diff --git a/sys/contrib/subrepo-openzfs/cmd/zpool/zpool_main.c b/sys/contrib/subrepo-openzfs/cmd/zpool/zpool_main.c
index d64fdfa5ba4c..5507f9d3fd67 100644
--- a/sys/contrib/subrepo-openzfs/cmd/zpool/zpool_main.c
+++ b/sys/contrib/subrepo-openzfs/cmd/zpool/zpool_main.c
@@ -3122,12 +3122,21 @@ zfs_force_import_required(nvlist_t *config)
 	nvlist_t *nvinfo;
 
 	state = fnvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE);
-	(void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, &hostid);
+	nvinfo = fnvlist_lookup_nvlist(config, ZPOOL_CONFIG_LOAD_INFO);
+
+	/*
+	 * The hostid on LOAD_INFO comes from the MOS label via
+	 * spa_tryimport(). If its not there then we're likely talking to an
+	 * older kernel, so use the top one, which will be from the label
+	 * discovered in zpool_find_import(), or if a cachefile is in use, the
+	 * local hostid.
+	 */
+	if (nvlist_lookup_uint64(nvinfo, ZPOOL_CONFIG_HOSTID, &hostid) != 0)
+		nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, &hostid);
 
 	if (state != POOL_STATE_EXPORTED && hostid != get_system_hostid())
 		return (B_TRUE);
 
-	nvinfo = fnvlist_lookup_nvlist(config, ZPOOL_CONFIG_LOAD_INFO);
 	if (nvlist_exists(nvinfo, ZPOOL_CONFIG_MMP_STATE)) {
 		mmp_state_t mmp_state = fnvlist_lookup_uint64(nvinfo,
 		    ZPOOL_CONFIG_MMP_STATE);
@@ -3198,7 +3207,10 @@ do_import(nvlist_t *config, const char *newname, const char *mntopts,
 			time_t timestamp = 0;
 			uint64_t hostid = 0;
 
-			if (nvlist_exists(config, ZPOOL_CONFIG_HOSTNAME))
+			if (nvlist_exists(nvinfo, ZPOOL_CONFIG_HOSTNAME))
+				hostname = fnvlist_lookup_string(nvinfo,
+				    ZPOOL_CONFIG_HOSTNAME);
+			else if (nvlist_exists(config, ZPOOL_CONFIG_HOSTNAME))
 				hostname = fnvlist_lookup_string(config,
 				    ZPOOL_CONFIG_HOSTNAME);
 
@@ -3206,7 +3218,10 @@ do_import(nvlist_t *config, const char *newname, const char *mntopts,
 				timestamp = fnvlist_lookup_uint64(config,
 				    ZPOOL_CONFIG_TIMESTAMP);
 
-			if (nvlist_exists(config, ZPOOL_CONFIG_HOSTID))
+			if (nvlist_exists(nvinfo, ZPOOL_CONFIG_HOSTID))
+				hostid = fnvlist_lookup_uint64(nvinfo,
+				    ZPOOL_CONFIG_HOSTID);
+			else if (nvlist_exists(config, ZPOOL_CONFIG_HOSTID))
 				hostid = fnvlist_lookup_uint64(config,
 				    ZPOOL_CONFIG_HOSTID);
 
diff --git a/sys/contrib/subrepo-openzfs/config/zfs-build.m4 b/sys/contrib/subrepo-openzfs/config/zfs-build.m4
index 2703e6c016c4..5f36569fe25b 100644
--- a/sys/contrib/subrepo-openzfs/config/zfs-build.m4
+++ b/sys/contrib/subrepo-openzfs/config/zfs-build.m4
@@ -358,6 +358,9 @@ AC_DEFUN([ZFS_AC_RPM], [
 	AS_IF([test -n "$udevruledir" ], [
 		RPM_DEFINE_UTIL=${RPM_DEFINE_UTIL}' --define "_udevruledir $(udevruledir)"'
 	])
+	AS_IF([test -n "$bashcompletiondir" ], [
+		RPM_DEFINE_UTIL=${RPM_DEFINE_UTIL}' --define "_bashcompletiondir $(bashcompletiondir)"'
+	])
 	RPM_DEFINE_UTIL=${RPM_DEFINE_UTIL}' $(DEFINE_SYSTEMD)'
 	RPM_DEFINE_UTIL=${RPM_DEFINE_UTIL}' $(DEFINE_PYZFS)'
 	RPM_DEFINE_UTIL=${RPM_DEFINE_UTIL}' $(DEFINE_PAM)'
@@ -617,6 +620,18 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
 		AC_MSG_RESULT([no])
 	fi
 	AC_SUBST(RPM_DEFINE_INITRAMFS)
+
+	AC_MSG_CHECKING([default bash completion directory])
+	case "$VENDOR" in
+		ubuntu)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
+		debian)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
+		freebsd)    bashcompletiondir=$sysconfdir/bash_completion.d;;
+		gentoo)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
+		*)          bashcompletiondir=/etc/bash_completion.d   ;;
+	esac
+	AC_MSG_RESULT([$bashcompletiondir])
+	AC_SUBST(bashcompletiondir)
+
 ])
 
 dnl #
diff --git a/sys/contrib/subrepo-openzfs/contrib/bash_completion.d/Makefile.am b/sys/contrib/subrepo-openzfs/contrib/bash_completion.d/Makefile.am
index dc4b610c42b8..1ec05ed73d2d 100644
--- a/sys/contrib/subrepo-openzfs/contrib/bash_completion.d/Makefile.am
+++ b/sys/contrib/subrepo-openzfs/contrib/bash_completion.d/Makefile.am
@@ -1,5 +1,3 @@
-bashcompletiondir = $(sysconfdir)/bash_completion.d
-
 nodist_bashcompletion_DATA  = %D%/zfs
 SUBSTFILES                 += $(nodist_bashcompletion_DATA)
 
diff --git a/sys/contrib/subrepo-openzfs/contrib/debian/control b/sys/contrib/subrepo-openzfs/contrib/debian/control
index b9bb23b09ba0..f4e97fe16145 100644
--- a/sys/contrib/subrepo-openzfs/contrib/debian/control
+++ b/sys/contrib/subrepo-openzfs/contrib/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: ZFS on Linux specific mailing list <zfs-discuss@list.zfsonlinux.org>
 Build-Depends: debhelper-compat (= 12),
                dh-python,
-               dkms (>> 2.1.1.2-5),
+               dh-sequence-dkms | dkms (>> 2.1.1.2-5),
                libaio-dev,
                libblkid-dev,
                libcurl4-openssl-dev,
diff --git a/sys/contrib/subrepo-openzfs/contrib/debian/openzfs-zfsutils.install b/sys/contrib/subrepo-openzfs/contrib/debian/openzfs-zfsutils.install
index e2ce5084c095..741014398ade 100644
--- a/sys/contrib/subrepo-openzfs/contrib/debian/openzfs-zfsutils.install
+++ b/sys/contrib/subrepo-openzfs/contrib/debian/openzfs-zfsutils.install
@@ -1,7 +1,6 @@
 etc/default/zfs
 etc/zfs/zfs-functions
 etc/zfs/zpool.d/
-etc/bash_completion.d/zfs
 lib/systemd/system-generators/
 lib/systemd/system-preset/
 lib/systemd/system/zfs-import-cache.service
diff --git a/sys/contrib/subrepo-openzfs/contrib/debian/rules.in b/sys/contrib/subrepo-openzfs/contrib/debian/rules.in
index f0791cfabd38..a3a05efacb50 100755
--- a/sys/contrib/subrepo-openzfs/contrib/debian/rules.in
+++ b/sys/contrib/subrepo-openzfs/contrib/debian/rules.in
@@ -71,10 +71,6 @@ override_dh_auto_install:
 	@# Install the utilities.
 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 
-	# Use upstream's bash completion
-	install -D -t '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/' \
-		'$(CURDIR)/contrib/bash_completion.d/zfs'
-
 	# Move from bin_dir to /usr/sbin
 	# Remove suffix (.py) as per policy 10.4 - Scripts
 	# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
@@ -136,7 +132,6 @@ override_dh_auto_install:
 
 	chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
 	chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
-	chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
 
 override_dh_python3:
 	dh_python3 -p openzfs-python3-pyzfs
diff --git a/sys/contrib/subrepo-openzfs/include/libzfs.h b/sys/contrib/subrepo-openzfs/include/libzfs.h
index 0b5501bbe39f..4adfa38e87be 100644
--- a/sys/contrib/subrepo-openzfs/include/libzfs.h
+++ b/sys/contrib/subrepo-openzfs/include/libzfs.h
@@ -532,6 +532,7 @@ _LIBZFS_H nvlist_t *zfs_valid_proplist(libzfs_handle_t *, zfs_type_t,
 _LIBZFS_H const char *zfs_prop_to_name(zfs_prop_t);
 _LIBZFS_H int zfs_prop_set(zfs_handle_t *, const char *, const char *);
 _LIBZFS_H int zfs_prop_set_list(zfs_handle_t *, nvlist_t *);
+_LIBZFS_H int zfs_prop_set_list_flags(zfs_handle_t *, nvlist_t *, int);
 _LIBZFS_H int zfs_prop_get(zfs_handle_t *, zfs_prop_t, char *, size_t,
     zprop_source_t *, char *, size_t, boolean_t);
 _LIBZFS_H int zfs_prop_get_recvd(zfs_handle_t *, const char *, char *, size_t,
@@ -654,6 +655,13 @@ typedef struct zprop_get_cbdata {
 	vdev_cbdata_t cb_vdevs;
 } zprop_get_cbdata_t;
 
+#define	ZFS_SET_NOMOUNT		1
+
+typedef struct zprop_set_cbdata {
+	int cb_flags;
+	nvlist_t *cb_proplist;
+} zprop_set_cbdata_t;
+
 _LIBZFS_H void zprop_print_one_property(const char *, zprop_get_cbdata_t *,
     const char *, const char *, zprop_source_t, const char *,
     const char *);
diff --git a/sys/contrib/subrepo-openzfs/include/os/freebsd/spl/sys/ctype.h b/sys/contrib/subrepo-openzfs/include/os/freebsd/spl/sys/ctype.h
index 201fa95550e3..b9ca0f8ef2c4 100644
--- a/sys/contrib/subrepo-openzfs/include/os/freebsd/spl/sys/ctype.h
+++ b/sys/contrib/subrepo-openzfs/include/os/freebsd/spl/sys/ctype.h
@@ -39,6 +39,6 @@
 		((C) >= 0x3A && (C) <= 0x40) ||				\
 		((C) >= 0x5B && (C) <= 0x60) ||				\
 		((C) >= 0x7B && (C) <= 0x7E))
-#define isspace(C)	((C) == 0x20 || ((C) >= 0x9 && (C) <= 0xD))
+#define	isspace(C)	((C) == 0x20 || ((C) >= 0x9 && (C) <= 0xD))
 
 #endif
diff --git a/sys/contrib/subrepo-openzfs/include/os/linux/zfs/sys/trace_arc.h b/sys/contrib/subrepo-openzfs/include/os/linux/zfs/sys/trace_arc.h
index c494f48bb48b..f749223daa72 100644
--- a/sys/contrib/subrepo-openzfs/include/os/linux/zfs/sys/trace_arc.h
+++ b/sys/contrib/subrepo-openzfs/include/os/linux/zfs/sys/trace_arc.h
@@ -51,7 +51,6 @@ DECLARE_EVENT_CLASS(zfs_arc_buf_hdr_class,
 	    __array(uint64_t,		hdr_dva_word, 2)
 	    __field(uint64_t,		hdr_birth)
 	    __field(uint32_t,		hdr_flags)
-	    __field(uint32_t,		hdr_bufcnt)
 	    __field(arc_buf_contents_t,	hdr_type)
 	    __field(uint16_t,		hdr_psize)
 	    __field(uint16_t,		hdr_lsize)
@@ -70,7 +69,6 @@ DECLARE_EVENT_CLASS(zfs_arc_buf_hdr_class,
 	    __entry->hdr_dva_word[1]	= ab->b_dva.dva_word[1];
 	    __entry->hdr_birth		= ab->b_birth;
 	    __entry->hdr_flags		= ab->b_flags;
-	    __entry->hdr_bufcnt	= ab->b_l1hdr.b_bufcnt;
 	    __entry->hdr_psize		= ab->b_psize;
 	    __entry->hdr_lsize		= ab->b_lsize;
 	    __entry->hdr_spa		= ab->b_spa;
@@ -84,12 +82,12 @@ DECLARE_EVENT_CLASS(zfs_arc_buf_hdr_class,
 	    __entry->hdr_refcount	= ab->b_l1hdr.b_refcnt.rc_count;
 	),
 	TP_printk("hdr { dva 0x%llx:0x%llx birth %llu "
-	    "flags 0x%x bufcnt %u type %u psize %u lsize %u spa %llu "
+	    "flags 0x%x type %u psize %u lsize %u spa %llu "
 	    "state_type %u access %lu mru_hits %u mru_ghost_hits %u "
 	    "mfu_hits %u mfu_ghost_hits %u l2_hits %u refcount %lli }",
 	    __entry->hdr_dva_word[0], __entry->hdr_dva_word[1],
 	    __entry->hdr_birth, __entry->hdr_flags,
-	    __entry->hdr_bufcnt, __entry->hdr_type, __entry->hdr_psize,
+	    __entry->hdr_type, __entry->hdr_psize,
 	    __entry->hdr_lsize, __entry->hdr_spa, __entry->hdr_state_type,
 	    __entry->hdr_access, __entry->hdr_mru_hits,
 	    __entry->hdr_mru_ghost_hits, __entry->hdr_mfu_hits,
@@ -192,7 +190,6 @@ DECLARE_EVENT_CLASS(zfs_arc_miss_class,
 	    __array(uint64_t,		hdr_dva_word, 2)
 	    __field(uint64_t,		hdr_birth)
 	    __field(uint32_t,		hdr_flags)
-	    __field(uint32_t,		hdr_bufcnt)
 	    __field(arc_buf_contents_t,	hdr_type)
 	    __field(uint16_t,		hdr_psize)
 	    __field(uint16_t,		hdr_lsize)
@@ -223,7 +220,6 @@ DECLARE_EVENT_CLASS(zfs_arc_miss_class,
 	    __entry->hdr_dva_word[1]	= hdr->b_dva.dva_word[1];
 	    __entry->hdr_birth		= hdr->b_birth;
 	    __entry->hdr_flags		= hdr->b_flags;
-	    __entry->hdr_bufcnt		= hdr->b_l1hdr.b_bufcnt;
 	    __entry->hdr_psize		= hdr->b_psize;
 	    __entry->hdr_lsize		= hdr->b_lsize;
 	    __entry->hdr_spa		= hdr->b_spa;
@@ -255,7 +251,7 @@ DECLARE_EVENT_CLASS(zfs_arc_miss_class,
 	    __entry->zb_blkid		= zb->zb_blkid;
 	),
 	TP_printk("hdr { dva 0x%llx:0x%llx birth %llu "
-	    "flags 0x%x bufcnt %u psize %u lsize %u spa %llu state_type %u "
+	    "flags 0x%x psize %u lsize %u spa %llu state_type %u "
 	    "access %lu mru_hits %u mru_ghost_hits %u mfu_hits %u "
 	    "mfu_ghost_hits %u l2_hits %u refcount %lli } "
 	    "bp { dva0 0x%llx:0x%llx dva1 0x%llx:0x%llx dva2 "
@@ -264,7 +260,7 @@ DECLARE_EVENT_CLASS(zfs_arc_miss_class,
 	    "blkid %llu }",
 	    __entry->hdr_dva_word[0], __entry->hdr_dva_word[1],
 	    __entry->hdr_birth, __entry->hdr_flags,
-	    __entry->hdr_bufcnt, __entry->hdr_psize, __entry->hdr_lsize,
+	    __entry->hdr_psize, __entry->hdr_lsize,
 	    __entry->hdr_spa, __entry->hdr_state_type, __entry->hdr_access,
 	    __entry->hdr_mru_hits, __entry->hdr_mru_ghost_hits,
 	    __entry->hdr_mfu_hits, __entry->hdr_mfu_ghost_hits,
diff --git a/sys/contrib/subrepo-openzfs/include/os/linux/zfs/sys/trace_dbuf.h b/sys/contrib/subrepo-openzfs/include/os/linux/zfs/sys/trace_dbuf.h
index 11d25be35bc4..0f6a98b47d60 100644
--- a/sys/contrib/subrepo-openzfs/include/os/linux/zfs/sys/trace_dbuf.h
+++ b/sys/contrib/subrepo-openzfs/include/os/linux/zfs/sys/trace_dbuf.h
@@ -60,8 +60,12 @@
 
 #define	DBUF_TP_FAST_ASSIGN						\
 	if (db != NULL) {						\
-		__assign_str(os_spa,					\
-		spa_name(DB_DNODE(db)->dn_objset->os_spa));		\
+		if (POINTER_IS_VALID(DB_DNODE(db)->dn_objset)) {	\
+			__assign_str(os_spa,				\
+			spa_name(DB_DNODE(db)->dn_objset->os_spa));	\
+		} else {						\
+			__assign_str(os_spa, "NULL");			\
+		}							\
 									\
 		__entry->ds_object = db->db_objset->os_dsl_dataset ?	\
 		db->db_objset->os_dsl_dataset->ds_object : 0;		\
diff --git a/sys/contrib/subrepo-openzfs/include/sys/arc_impl.h b/sys/contrib/subrepo-openzfs/include/sys/arc_impl.h
index 78774792f367..adff42c55d05 100644
--- a/sys/contrib/subrepo-openzfs/include/sys/arc_impl.h
+++ b/sys/contrib/subrepo-openzfs/include/sys/arc_impl.h
@@ -159,10 +159,6 @@ struct arc_write_callback {
  * these two allocation states.
  */
 typedef struct l1arc_buf_hdr {
-	/* for waiting on reads to complete */
-	kcondvar_t		b_cv;
-	uint8_t			b_byteswap;
-
 	/* protected by arc state mutex */
 	arc_state_t		*b_state;
 	multilist_node_t	b_arc_node;
@@ -173,7 +169,7 @@ typedef struct l1arc_buf_hdr {
 	uint32_t		b_mru_ghost_hits;
 	uint32_t		b_mfu_hits;
 	uint32_t		b_mfu_ghost_hits;
-	uint32_t		b_bufcnt;
+	uint8_t			b_byteswap;
 	arc_buf_t		*b_buf;
 
 	/* self protecting */
@@ -436,12 +432,12 @@ typedef struct l2arc_dev {
  */
 typedef struct arc_buf_hdr_crypt {
 	abd_t			*b_rabd;	/* raw encrypted data */
-	dmu_object_type_t	b_ot;		/* object type */
-	uint32_t		b_ebufcnt;	/* count of encrypted buffers */
 
 	/* dsobj for looking up encryption key for l2arc encryption */
 	uint64_t		b_dsobj;
 
+	dmu_object_type_t	b_ot;		/* object type */
+
 	/* encryption parameters */
 	uint8_t			b_salt[ZIO_DATA_SALT_LEN];
 	uint8_t			b_iv[ZIO_DATA_IV_LEN];
diff --git a/sys/contrib/subrepo-openzfs/include/sys/metaslab_impl.h b/sys/contrib/subrepo-openzfs/include/sys/metaslab_impl.h
index d328068890cc..4f434291ddbf 100644
--- a/sys/contrib/subrepo-openzfs/include/sys/metaslab_impl.h
+++ b/sys/contrib/subrepo-openzfs/include/sys/metaslab_impl.h
@@ -250,7 +250,6 @@ struct metaslab_group {
 	int64_t			mg_activation_count;
 	metaslab_class_t	*mg_class;
 	vdev_t			*mg_vd;
-	taskq_t			*mg_taskq;
 	metaslab_group_t	*mg_prev;
 	metaslab_group_t	*mg_next;
 
diff --git a/sys/contrib/subrepo-openzfs/include/sys/spa_impl.h b/sys/contrib/subrepo-openzfs/include/sys/spa_impl.h
index 1a04bedc3137..094258d47a48 100644
--- a/sys/contrib/subrepo-openzfs/include/sys/spa_impl.h
+++ b/sys/contrib/subrepo-openzfs/include/sys/spa_impl.h
@@ -424,7 +424,9 @@ struct spa {
 
 	hrtime_t	spa_ccw_fail_time;	/* Conf cache write fail time */
 	taskq_t		*spa_zvol_taskq;	/* Taskq for minor management */
+	taskq_t		*spa_metaslab_taskq;	/* Taskq for metaslab preload */
 	taskq_t		*spa_prefetch_taskq;	/* Taskq for prefetch threads */
+	taskq_t		*spa_upgrade_taskq;	/* Taskq for upgrade jobs */
 	uint64_t	spa_multihost;		/* multihost aware (mmp) */
 	mmp_thread_t	spa_mmp;		/* multihost mmp thread */
 	list_t		spa_leaf_list;		/* list of leaf vdevs */
@@ -448,8 +450,6 @@ struct spa {
 	 */
 	spa_config_lock_t spa_config_lock[SCL_LOCKS]; /* config changes */
 	zfs_refcount_t	spa_refcount;		/* number of opens */
-
-	taskq_t		*spa_upgrade_taskq;	/* taskq for upgrade jobs */
 };
 
 extern char *spa_config_path;
diff --git a/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs.abi b/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs.abi
index 907b0191f75b..c1ce3d0f67d8 100644
--- a/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs.abi
+++ b/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs.abi
@@ -396,6 +396,7 @@
     <elf-symbol name='zfs_prop_readonly' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfs_prop_set' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfs_prop_set_list' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zfs_prop_set_list_flags' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfs_prop_setonce' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfs_prop_string_to_index' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfs_prop_to_name' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -4428,6 +4429,12 @@
       <parameter type-id='5ce45b60' name='props'/>
       <return type-id='95e97e5e'/>
     </function-decl>
+    <function-decl name='zfs_prop_set_list_flags' mangled-name='zfs_prop_set_list_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_prop_set_list_flags'>
+      <parameter type-id='9200a744' name='zhp'/>
+      <parameter type-id='5ce45b60' name='props'/>
+      <parameter type-id='95e97e5e' name='flags'/>
+      <return type-id='95e97e5e'/>
+    </function-decl>
     <function-decl name='zfs_prop_inherit' mangled-name='zfs_prop_inherit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_prop_inherit'>
       <parameter type-id='9200a744' name='zhp'/>
       <parameter type-id='80f4b756' name='propname'/>
diff --git a/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs_changelist.c b/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs_changelist.c
index efe1c0c06035..4db1cbce9568 100644
--- a/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs_changelist.c
+++ b/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs_changelist.c
@@ -105,6 +105,15 @@ changelist_prefix(prop_changelist_t *clp)
 	    clp->cl_prop != ZFS_PROP_SHARESMB)
 		return (0);
 
+	/*
+	 * If CL_GATHER_DONT_UNMOUNT is set, don't want to unmount/unshare and
+	 * later (re)mount/(re)share the filesystem in postfix phase, so we
+	 * return from here. If filesystem is mounted or unmounted, leave it
+	 * as it is.
+	 */
+	if (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT)
+		return (0);
+
 	if ((walk = uu_avl_walk_start(clp->cl_tree, UU_WALK_ROBUST)) == NULL)
 		return (-1);
 
@@ -129,8 +138,6 @@ changelist_prefix(prop_changelist_t *clp)
 			 */
 			switch (clp->cl_prop) {
 			case ZFS_PROP_MOUNTPOINT:
-				if (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT)
-					break;
 				if (zfs_unmount(cn->cn_handle, NULL,
 				    clp->cl_mflags) != 0) {
 					ret = -1;
@@ -164,9 +171,8 @@ changelist_prefix(prop_changelist_t *clp)
  * reshare the filesystems as necessary.  In changelist_gather() we recorded
  * whether the filesystem was previously shared or mounted.  The action we take
  * depends on the previous state, and whether the value was previously 'legacy'.
- * For non-legacy properties, we only remount/reshare the filesystem if it was
- * previously mounted/shared.  Otherwise, we always remount/reshare the
- * filesystem.
+ * For non-legacy properties, we always remount/reshare the filesystem,
+ * if CL_GATHER_DONT_UNMOUNT is not set.
  */
 int
 changelist_postfix(prop_changelist_t *clp)
@@ -177,6 +183,14 @@ changelist_postfix(prop_changelist_t *clp)
 	boolean_t commit_smb_shares = B_FALSE;
 	boolean_t commit_nfs_shares = B_FALSE;
 
+	/*
+	 * If CL_GATHER_DONT_UNMOUNT is set, it means we don't want to (un)mount
+	 * or (re/un)share the filesystem, so we return from here. If filesystem
+	 * is mounted or unmounted, leave it as it is.
+	 */
+	if (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT)
+		return (0);
+
 	/*
 	 * If we're changing the mountpoint, attempt to destroy the underlying
 	 * mountpoint.  All other datasets will have inherited from this dataset
@@ -239,8 +253,7 @@ changelist_postfix(prop_changelist_t *clp)
 		needs_key = (zfs_prop_get_int(cn->cn_handle,
 		    ZFS_PROP_KEYSTATUS) == ZFS_KEYSTATUS_UNAVAILABLE);
 
-		mounted = (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT) ||
-		    zfs_is_mounted(cn->cn_handle, NULL);
+		mounted = zfs_is_mounted(cn->cn_handle, NULL);
 
 		if (!mounted && !needs_key && (cn->cn_mounted ||
 		    (((clp->cl_prop == ZFS_PROP_MOUNTPOINT &&
diff --git a/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs_dataset.c b/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs_dataset.c
index 43726746c596..54fb23f421c2 100644
--- a/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs_dataset.c
+++ b/sys/contrib/subrepo-openzfs/lib/libzfs/libzfs_dataset.c
@@ -1771,14 +1771,24 @@ zfs_prop_set(zfs_handle_t *zhp, const char *propname, const char *propval)
 	return (ret);
 }
 
-
-
 /*
  * Given an nvlist of property names and values, set the properties for the
  * given dataset.
  */
 int
 zfs_prop_set_list(zfs_handle_t *zhp, nvlist_t *props)
+{
+	return (zfs_prop_set_list_flags(zhp, props, 0));
+}
+
+/*
+ * Given an nvlist of property names, values and flags, set the properties
+ * for the given dataset. If ZFS_SET_NOMOUNT is set, it allows to update
+ * mountpoint, sharenfs and sharesmb properties without (un/re)mounting
+ * and (un/re)sharing the dataset.
+ */
+int
+zfs_prop_set_list_flags(zfs_handle_t *zhp, nvlist_t *props, int flags)
 {
 	zfs_cmd_t zc = {"\0"};
 	int ret = -1;
@@ -1848,7 +1858,9 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvlist_t *props)
 		if (prop != ZFS_PROP_CANMOUNT ||
 		    (fnvpair_value_uint64(elem) == ZFS_CANMOUNT_OFF &&
 		    zfs_is_mounted(zhp, NULL))) {
-			cls[cl_idx] = changelist_gather(zhp, prop, 0, 0);
+			cls[cl_idx] = changelist_gather(zhp, prop,
+			    ((flags & ZFS_SET_NOMOUNT) ?
+			    CL_GATHER_DONT_UNMOUNT : 0), 0);
 			if (cls[cl_idx] == NULL)
 				goto error;
 		}
diff --git a/sys/contrib/subrepo-openzfs/man/man4/zfs.4 b/sys/contrib/subrepo-openzfs/man/man4/zfs.4
index 3843419731b8..71a3e67ee67e 100644
--- a/sys/contrib/subrepo-openzfs/man/man4/zfs.4
+++ b/sys/contrib/subrepo-openzfs/man/man4/zfs.4
@@ -402,6 +402,12 @@ Practical upper limit of total metaslabs per top-level vdev.
 .It Sy metaslab_preload_enabled Ns = Ns Sy 1 Ns | Ns 0 Pq int
 Enable metaslab group preloading.
 .
+.It Sy metaslab_preload_limit Ns = Ns Sy 10 Pq uint
+Maximum number of metaslabs per group to preload
+.
+.It Sy metaslab_preload_pct Ns = Ns Sy 50 Pq uint
+Percentage of CPUs to run a metaslab preload taskq
+.
 .It Sy metaslab_lba_weighting_enabled Ns = Ns Sy 1 Ns | Ns 0 Pq int
 Give more weight to metaslabs with lower LBAs,
 assuming they have greater bandwidth,
@@ -2144,6 +2150,11 @@ On very fragmented pools, lowering this
 .Pq typically to Sy 36 KiB
 can improve performance.
 .
+.It Sy zil_maxcopied Ns = Ns Sy 7680 Ns B Po 7.5 KiB Pc Pq uint
+This sets the maximum number of write bytes logged via WR_COPIED.
+It tunes a tradeoff between additional memory copy and possibly worse log
+space efficiency vs additional range lock/unlock.
+.
 .It Sy zil_min_commit_timeout Ns = Ns Sy 5000 Pq u64
 This sets the minimum delay in nanoseconds ZIL care to delay block commit,
 waiting for more records.
@@ -2306,63 +2317,6 @@ If
 .Sy zvol_threads
 to the number of CPUs present or 32 (whichever is greater).
 .
-.It Sy zvol_blk_mq_threads Ns = Ns Sy 0 Pq uint
-The number of threads per zvol to use for queuing IO requests.
-This parameter will only appear if your kernel supports
-.Li blk-mq
-and is only read and assigned to a zvol at zvol load time.
-If
-.Sy 0
-(the default) then internally set
-.Sy zvol_blk_mq_threads
-to the number of CPUs present.
-.
-.It Sy zvol_use_blk_mq Ns = Ns Sy 0 Ns | Ns 1 Pq uint
-Set to
-.Sy 1
-to use the
-.Li blk-mq
-API for zvols.
-Set to
-.Sy 0
-(the default) to use the legacy zvol APIs.
-This setting can give better or worse zvol performance depending on
-the workload.
-This parameter will only appear if your kernel supports
-.Li blk-mq
-and is only read and assigned to a zvol at zvol load time.
-.
-.It Sy zvol_blk_mq_blocks_per_thread Ns = Ns Sy 8 Pq uint
-If
-.Sy zvol_use_blk_mq
-is enabled, then process this number of
-.Sy volblocksize Ns -sized blocks per zvol thread.
-This tunable can be use to favor better performance for zvol reads (lower
-values) or writes (higher values).
-If set to
-.Sy 0 ,
-then the zvol layer will process the maximum number of blocks
-per thread that it can.
-This parameter will only appear if your kernel supports
-.Li blk-mq
-and is only applied at each zvol's load time.
-.
-.It Sy zvol_blk_mq_queue_depth Ns = Ns Sy 0 Pq uint
-The queue_depth value for the zvol
-.Li blk-mq
-interface.
-This parameter will only appear if your kernel supports
-.Li blk-mq
-and is only applied at each zvol's load time.
-If
-.Sy 0
-(the default) then use the kernel's default queue depth.
-Values are clamped to the kernel's
-.Dv BLKDEV_MIN_RQ
-and
-.Dv BLKDEV_MAX_RQ Ns / Ns Dv BLKDEV_DEFAULT_RQ
-limits.
-.
 .It Sy zvol_volmode Ns = Ns Sy 1 Pq uint
 Defines zvol block devices behaviour when
 .Sy volmode Ns = Ns Sy default :
diff --git a/sys/contrib/subrepo-openzfs/man/man7/zfsconcepts.7 b/sys/contrib/subrepo-openzfs/man/man7/zfsconcepts.7
index 18a9e9b5cafe..1be3d961c3d7 100644
--- a/sys/contrib/subrepo-openzfs/man/man7/zfsconcepts.7
+++ b/sys/contrib/subrepo-openzfs/man/man7/zfsconcepts.7
@@ -28,8 +28,9 @@
 .\" Copyright 2019 Richard Laager. All rights reserved.
 .\" Copyright 2018 Nexenta Systems, Inc.
 .\" Copyright 2019 Joyent, Inc.
+.\" Copyright 2023 Klara, Inc.
 .\"
-.Dd June 30, 2019
+.Dd October 6, 2023
 .Dt ZFSCONCEPTS 7
 .Os
 .
@@ -205,3 +206,40 @@ practices, such as regular backups.
 Consider using the
 .Sy compression
 property as a less resource-intensive alternative.
+.Ss Block cloning
+Block cloning is a facility that allows a file (or parts of a file) to be
+.Qq cloned ,
+that is, a shallow copy made where the existing data blocks are referenced
+rather than copied.
+Later modifications to the data will cause a copy of the data block to be taken
+and that copy modified.
+This facility is used to implement
+.Qq reflinks
+or
+.Qq file-level copy-on-write .
+.Pp
+Cloned blocks are tracked in a special on-disk structure called the Block
+Reference Table
+.Po BRT
+.Pc .
+Unlike deduplication, this table has minimal overhead, so can be enabled at all
+times.
+.Pp
+Also unlike deduplication, cloning must be requested by a user program.
+Many common file copying programs, including newer versions of
+.Nm /bin/cp ,
+will try to create clones automatically.
+Look for
+.Qq clone ,
+.Qq dedupe
+or
+.Qq reflink
+in the documentation for more information.
+.Pp
+There are some limitations to block cloning.
+Only whole blocks can be cloned, and blocks can not be cloned if they are not
+yet written to disk, or if they are encrypted, or the source and destination
+.Sy recordsize
+properties differ.
+The OS may add additional restrictions;
+for example, most versions of Linux will not allow clones across datasets.
diff --git a/sys/contrib/subrepo-openzfs/man/man7/zfsprops.7 b/sys/contrib/subrepo-openzfs/man/man7/zfsprops.7
index 51ddd85eb79e..e3674b1f8a8d 100644
--- a/sys/contrib/subrepo-openzfs/man/man7/zfsprops.7
+++ b/sys/contrib/subrepo-openzfs/man/man7/zfsprops.7
@@ -1248,10 +1248,18 @@ Otherwise, they are automatically remounted in the new location if the property
 was previously
 .Sy legacy
 or
-.Sy none ,
-or if they were mounted before the property was changed.
+.Sy none .
 In addition, any shared file systems are unshared and shared in the new
 location.
+.Pp
+When the
+.Sy mountpoint
+property is set with
+.Nm zfs Cm set Fl u
+, the
+.Sy mountpoint
+property is updated but dataset is not mounted or unmounted and remains
+as it was before.
 .It Sy nbmand Ns = Ns Sy on Ns | Ns Sy off
 Controls whether the file system should be mounted with
 .Sy nbmand
@@ -1656,6 +1664,13 @@ by default.
 This means that any additional access control
 (disallow specific user specific access etc) must be done on the underlying file
 system.
+.Pp
+When the
+.Sy sharesmb
+property is updated with
+.Nm zfs Cm set Fl u
+, the property is set to desired value, but the operation to share, reshare
+or unshare the the dataset is not performed.
 .It Sy sharenfs Ns = Ns Sy on Ns | Ns Sy off Ns | Ns Ar opts
 Controls whether the file system is shared via NFS, and what options are to be
 used.
@@ -1699,6 +1714,13 @@ or if they were shared before the property was changed.
 If the new property is
 .Sy off ,
 the file systems are unshared.
+.Pp
+When the
+.Sy sharenfs
+property is updated with
+.Nm zfs Cm set Fl u
+, the property is set to desired value, but the operation to share, reshare
+or unshare the the dataset is not performed.
 .It Sy logbias Ns = Ns Sy latency Ns | Ns Sy throughput
 Provide a hint to ZFS about handling of synchronous requests in this dataset.
 If
diff --git a/sys/contrib/subrepo-openzfs/man/man8/zfs-set.8 b/sys/contrib/subrepo-openzfs/man/man8/zfs-set.8
index 4cabdcd8bd83..c01bcc643e5d 100644
--- a/sys/contrib/subrepo-openzfs/man/man8/zfs-set.8
+++ b/sys/contrib/subrepo-openzfs/man/man8/zfs-set.8
@@ -39,6 +39,7 @@
 .Sh SYNOPSIS
 .Nm zfs
 .Cm set
+.Op Fl u
 .Ar property Ns = Ns Ar value Oo Ar property Ns = Ns Ar value Oc Ns …
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns …
 .Nm zfs
@@ -60,6 +61,7 @@
 .It Xo
 .Nm zfs
 .Cm set
+.Op Fl u
 .Ar property Ns = Ns Ar value Oo Ar property Ns = Ns Ar value Oc Ns …
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns …
 .Xc
@@ -79,6 +81,11 @@ For more information, see the
 .Em User Properties
 section of
 .Xr zfsprops 7 .
+.Bl -tag -width "-u"
+.It Fl u
+Update mountpoint, sharenfs, sharesmb property but do not mount or share the
+dataset.
+.El
 .It Xo
 .Nm zfs
 .Cm get
diff --git a/sys/contrib/subrepo-openzfs/module/icp/asm-aarch64/sha2/sha256-armv8.S b/sys/contrib/subrepo-openzfs/module/icp/asm-aarch64/sha2/sha256-armv8.S
index aebeb4bae125..689783502c09 100644
--- a/sys/contrib/subrepo-openzfs/module/icp/asm-aarch64/sha2/sha256-armv8.S
+++ b/sys/contrib/subrepo-openzfs/module/icp/asm-aarch64/sha2/sha256-armv8.S
@@ -49,6 +49,7 @@
 .type	zfs_sha256_block_armv7,%function
 .align	6
 zfs_sha256_block_armv7:
+	hint	#34					// bti c
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 
@@ -1015,6 +1016,7 @@ zfs_sha256_block_armv7:
 .type	zfs_sha256_block_armv8,%function
 .align	6
 zfs_sha256_block_armv8:
+	hint		#34				// bti c
 .Lv8_entry:
 	stp		x29,x30,[sp,#-16]!
 	add		x29,sp,#0
@@ -1155,6 +1157,7 @@ zfs_sha256_block_armv8:
 .type	zfs_sha256_block_neon,%function
 .align	4
 zfs_sha256_block_neon:
+	hint	#34					// bti c
 .Lneon_entry:
 	stp	x29, x30, [sp, #-16]!
 	mov	x29, sp
diff --git a/sys/contrib/subrepo-openzfs/module/icp/asm-aarch64/sha2/sha512-armv8.S b/sys/contrib/subrepo-openzfs/module/icp/asm-aarch64/sha2/sha512-armv8.S
index 779263f36c01..892fedf629ac 100644
--- a/sys/contrib/subrepo-openzfs/module/icp/asm-aarch64/sha2/sha512-armv8.S
+++ b/sys/contrib/subrepo-openzfs/module/icp/asm-aarch64/sha2/sha512-armv8.S
@@ -73,6 +73,7 @@
 .type	zfs_sha512_block_armv7,%function
 .align	6
 zfs_sha512_block_armv7:
+	hint	#34					// bti c
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 
@@ -1040,6 +1041,7 @@ zfs_sha512_block_armv7:
 .type	zfs_sha512_block_armv8,%function
 .align	6
 zfs_sha512_block_armv8:
+	hint		#34				// bti c
 .Lv8_entry:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later
 	stp		x29,x30,[sp,#-16]!
diff --git a/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/kmod_core.c b/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/kmod_core.c
index dc9b3bba94bf..d0f161e01ce7 100644
--- a/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/kmod_core.c
+++ b/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/kmod_core.c
@@ -141,7 +141,7 @@ zfsdev_ioctl(struct cdev *dev, ulong_t zcmd, caddr_t arg, int flag,
 	if (len != sizeof (zfs_iocparm_t))
 		return (EINVAL);
 
-	uaddr = (void * __capability)zp->zfs_cmd;
+	uaddr = (void * __capability)(uintcap_t)zp->zfs_cmd;
 	zc = vmem_zalloc(sizeof (zfs_cmd_t), KM_SLEEP);
 #ifdef ZFS_LEGACY_SUPPORT
 	/*
diff --git a/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/sysctl_os.c b/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/sysctl_os.c
index ba9a95e4a66d..312d76c3e023 100644
--- a/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/sysctl_os.c
+++ b/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/sysctl_os.c
@@ -614,28 +614,6 @@ SYSCTL_UINT(_vfs_zfs_metaslab, OID_AUTO, df_free_pct,
 	" space map to continue allocations in a first-fit fashion");
 /* END CSTYLED */
 
-/*
- * Percentage of all cpus that can be used by the metaslab taskq.
- */
-extern int metaslab_load_pct;
-
-/* BEGIN CSTYLED */
-SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, load_pct,
-	CTLFLAG_RWTUN, &metaslab_load_pct, 0,
-	"Percentage of cpus that can be used by the metaslab taskq");
-/* END CSTYLED */
-
-/*
- * Max number of metaslabs per group to preload.
- */
-extern uint_t metaslab_preload_limit;
-
-/* BEGIN CSTYLED */
-SYSCTL_UINT(_vfs_zfs_metaslab, OID_AUTO, preload_limit,
-	CTLFLAG_RWTUN, &metaslab_preload_limit, 0,
-	"Max number of metaslabs per group to preload");
-/* END CSTYLED */
-
 /* mmp.c */
 
 int
diff --git a/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/zfs_vfsops.c
index 417f1b48d45c..017c2ff8a3f6 100644
--- a/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/zfs_vfsops.c
+++ b/sys/contrib/subrepo-openzfs/module/os/freebsd/zfs/zfs_vfsops.c
@@ -89,7 +89,7 @@ int zfs_debug_level;
 SYSCTL_INT(_vfs_zfs, OID_AUTO, debug, CTLFLAG_RWTUN, &zfs_debug_level, 0,
 	"Debug level");
 
-int zfs_bclone_enabled;
+int zfs_bclone_enabled = 1;
 SYSCTL_INT(_vfs_zfs, OID_AUTO, bclone_enabled, CTLFLAG_RWTUN,
 	&zfs_bclone_enabled, 0, "Enable block cloning");
 
diff --git a/sys/contrib/subrepo-openzfs/module/os/linux/zfs/zpl_file_range.c b/sys/contrib/subrepo-openzfs/module/os/linux/zfs/zpl_file_range.c
index 2abbf44df587..c47fe99dacff 100644
--- a/sys/contrib/subrepo-openzfs/module/os/linux/zfs/zpl_file_range.c
+++ b/sys/contrib/subrepo-openzfs/module/os/linux/zfs/zpl_file_range.c
@@ -202,8 +202,10 @@ zpl_ioctl_ficlone(struct file *dst_file, void *arg)
 	if (src_file == NULL)
 		return (-EBADF);
 
-	if (dst_file->f_op != src_file->f_op)
+	if (dst_file->f_op != src_file->f_op) {
+		fput(src_file);
 		return (-EXDEV);
+	}
 
 	size_t len = i_size_read(file_inode(src_file));
 
@@ -237,8 +239,10 @@ zpl_ioctl_ficlonerange(struct file *dst_file, void __user *arg)
 	if (src_file == NULL)
 		return (-EBADF);
 
-	if (dst_file->f_op != src_file->f_op)
+	if (dst_file->f_op != src_file->f_op) {
+		fput(src_file);
 		return (-EXDEV);
+	}
 
 	size_t len = fcr.fcr_src_length;
 	if (len == 0)
diff --git a/sys/contrib/subrepo-openzfs/module/os/linux/zfs/zvol_os.c b/sys/contrib/subrepo-openzfs/module/os/linux/zfs/zvol_os.c
index f94ce69fb9e2..e145a8c876b4 100644
--- a/sys/contrib/subrepo-openzfs/module/os/linux/zfs/zvol_os.c
+++ b/sys/contrib/subrepo-openzfs/module/os/linux/zfs/zvol_os.c
@@ -1626,18 +1626,6 @@ MODULE_PARM_DESC(zvol_prefetch_bytes, "Prefetch N bytes at zvol start+end");
 module_param(zvol_volmode, uint, 0644);
 MODULE_PARM_DESC(zvol_volmode, "Default volmode property value");
 
-#ifdef HAVE_BLK_MQ
-module_param(zvol_blk_mq_queue_depth, uint, 0644);
-MODULE_PARM_DESC(zvol_blk_mq_queue_depth, "Default blk-mq queue depth");
-
-module_param(zvol_use_blk_mq, uint, 0644);
-MODULE_PARM_DESC(zvol_use_blk_mq, "Use the blk-mq API for zvols");
-
-module_param(zvol_blk_mq_blocks_per_thread, uint, 0644);
-MODULE_PARM_DESC(zvol_blk_mq_blocks_per_thread,
-    "Process volblocksize blocks per thread");
-#endif
-
 #ifndef HAVE_BLKDEV_GET_ERESTARTSYS
 module_param(zvol_open_timeout_ms, uint, 0644);
 MODULE_PARM_DESC(zvol_open_timeout_ms, "Timeout for ZVOL open retries");
diff --git a/sys/contrib/subrepo-openzfs/module/zfs/arc.c b/sys/contrib/subrepo-openzfs/module/zfs/arc.c
index 22dc0ed5e3b6..b5946e7604c0 100644
--- a/sys/contrib/subrepo-openzfs/module/zfs/arc.c
+++ b/sys/contrib/subrepo-openzfs/module/zfs/arc.c
@@ -748,8 +748,7 @@ taskq_t *arc_prune_taskq;
  * Other sizes
  */
 
-#define	HDR_FULL_CRYPT_SIZE ((int64_t)sizeof (arc_buf_hdr_t))
-#define	HDR_FULL_SIZE ((int64_t)offsetof(arc_buf_hdr_t, b_crypt_hdr))
+#define	HDR_FULL_SIZE ((int64_t)sizeof (arc_buf_hdr_t))
 #define	HDR_L2ONLY_SIZE ((int64_t)offsetof(arc_buf_hdr_t, b_l1hdr))
 
 /*
@@ -1113,7 +1112,6 @@ buf_hash_remove(arc_buf_hdr_t *hdr)
  */
 
 static kmem_cache_t *hdr_full_cache;
-static kmem_cache_t *hdr_full_crypt_cache;
 static kmem_cache_t *hdr_l2only_cache;
 static kmem_cache_t *buf_cache;
 
@@ -1134,7 +1132,6 @@ buf_fini(void)
 	for (int i = 0; i < BUF_LOCKS; i++)
 		mutex_destroy(BUF_HASH_LOCK(i));
 	kmem_cache_destroy(hdr_full_cache);
-	kmem_cache_destroy(hdr_full_crypt_cache);
 	kmem_cache_destroy(hdr_l2only_cache);
 	kmem_cache_destroy(buf_cache);
 }
@@ -1151,7 +1148,6 @@ hdr_full_cons(void *vbuf, void *unused, int kmflag)
 
 	memset(hdr, 0, HDR_FULL_SIZE);
 	hdr->b_l1hdr.b_byteswap = DMU_BSWAP_NUMFUNCS;
-	cv_init(&hdr->b_l1hdr.b_cv, NULL, CV_DEFAULT, NULL);
 	zfs_refcount_create(&hdr->b_l1hdr.b_refcnt);
 #ifdef ZFS_DEBUG
 	mutex_init(&hdr->b_l1hdr.b_freeze_lock, NULL, MUTEX_DEFAULT, NULL);
@@ -1163,19 +1159,6 @@ hdr_full_cons(void *vbuf, void *unused, int kmflag)
 	return (0);
 }
 
-static int
-hdr_full_crypt_cons(void *vbuf, void *unused, int kmflag)
-{
-	(void) unused;
-	arc_buf_hdr_t *hdr = vbuf;
-
-	hdr_full_cons(vbuf, unused, kmflag);
-	memset(&hdr->b_crypt_hdr, 0, sizeof (hdr->b_crypt_hdr));
-	arc_space_consume(sizeof (hdr->b_crypt_hdr), ARC_SPACE_HDRS);
-
-	return (0);
-}
-
 static int
 hdr_l2only_cons(void *vbuf, void *unused, int kmflag)
 {
@@ -1211,7 +1194,6 @@ hdr_full_dest(void *vbuf, void *unused)
 	arc_buf_hdr_t *hdr = vbuf;
 
 	ASSERT(HDR_EMPTY(hdr));
-	cv_destroy(&hdr->b_l1hdr.b_cv);
 	zfs_refcount_destroy(&hdr->b_l1hdr.b_refcnt);
 #ifdef ZFS_DEBUG
 	mutex_destroy(&hdr->b_l1hdr.b_freeze_lock);
@@ -1220,16 +1202,6 @@ hdr_full_dest(void *vbuf, void *unused)
 	arc_space_return(HDR_FULL_SIZE, ARC_SPACE_HDRS);
 }
 
-static void
-hdr_full_crypt_dest(void *vbuf, void *unused)
-{
-	(void) vbuf, (void) unused;
-
-	hdr_full_dest(vbuf, unused);
-	arc_space_return(sizeof (((arc_buf_hdr_t *)NULL)->b_crypt_hdr),
-	    ARC_SPACE_HDRS);
-}
-
 static void
 hdr_l2only_dest(void *vbuf, void *unused)
 {
@@ -1285,9 +1257,6 @@ buf_init(void)
 
 	hdr_full_cache = kmem_cache_create("arc_buf_hdr_t_full", HDR_FULL_SIZE,
 	    0, hdr_full_cons, hdr_full_dest, NULL, NULL, NULL, 0);
-	hdr_full_crypt_cache = kmem_cache_create("arc_buf_hdr_t_full_crypt",
-	    HDR_FULL_CRYPT_SIZE, 0, hdr_full_crypt_cons, hdr_full_crypt_dest,
-	    NULL, NULL, NULL, 0);
 	hdr_l2only_cache = kmem_cache_create("arc_buf_hdr_t_l2only",
 	    HDR_L2ONLY_SIZE, 0, hdr_l2only_cons, hdr_l2only_dest, NULL,
 	    NULL, NULL, 0);
@@ -1995,7 +1964,6 @@ arc_buf_untransform_in_place(arc_buf_t *buf)
 	    arc_buf_size(buf));
 	buf->b_flags &= ~ARC_BUF_FLAG_ENCRYPTED;
 	buf->b_flags &= ~ARC_BUF_FLAG_COMPRESSED;
-	hdr->b_crypt_hdr.b_ebufcnt -= 1;
 }
 
 /*
@@ -2230,7 +2198,6 @@ arc_evictable_space_increment(arc_buf_hdr_t *hdr, arc_state_t *state)
 	ASSERT(HDR_HAS_L1HDR(hdr));
 
 	if (GHOST_STATE(state)) {
-		ASSERT0(hdr->b_l1hdr.b_bufcnt);
 		ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
 		ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
 		ASSERT(!HDR_HAS_RABD(hdr));
@@ -2270,7 +2237,6 @@ arc_evictable_space_decrement(arc_buf_hdr_t *hdr, arc_state_t *state)
 	ASSERT(HDR_HAS_L1HDR(hdr));
 
 	if (GHOST_STATE(state)) {
-		ASSERT0(hdr->b_l1hdr.b_bufcnt);
 		ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
 		ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
 		ASSERT(!HDR_HAS_RABD(hdr));
@@ -2386,7 +2352,9 @@ arc_buf_info(arc_buf_t *ab, arc_buf_info_t *abi, int state_index)
 		l2hdr = &hdr->b_l2hdr;
 
 	if (l1hdr) {
-		abi->abi_bufcnt = l1hdr->b_bufcnt;
+		abi->abi_bufcnt = 0;
+		for (arc_buf_t *buf = l1hdr->b_buf; buf; buf = buf->b_next)
+			abi->abi_bufcnt++;
 		abi->abi_access = l1hdr->b_arc_access;
 		abi->abi_mru_hits = l1hdr->b_mru_hits;
 		abi->abi_mru_ghost_hits = l1hdr->b_mru_ghost_hits;
@@ -2414,7 +2382,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 {
 	arc_state_t *old_state;
 	int64_t refcnt;
-	uint32_t bufcnt;
 	boolean_t update_old, update_new;
 	arc_buf_contents_t type = arc_buf_type(hdr);
 
@@ -2428,19 +2395,16 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 	if (HDR_HAS_L1HDR(hdr)) {
 		old_state = hdr->b_l1hdr.b_state;
 		refcnt = zfs_refcount_count(&hdr->b_l1hdr.b_refcnt);
-		bufcnt = hdr->b_l1hdr.b_bufcnt;
-		update_old = (bufcnt > 0 || hdr->b_l1hdr.b_pabd != NULL ||
-		    HDR_HAS_RABD(hdr));
+		update_old = (hdr->b_l1hdr.b_buf != NULL ||
+		    hdr->b_l1hdr.b_pabd != NULL || HDR_HAS_RABD(hdr));
 
-		IMPLY(GHOST_STATE(old_state), bufcnt == 0);
-		IMPLY(GHOST_STATE(new_state), bufcnt == 0);
 		IMPLY(GHOST_STATE(old_state), hdr->b_l1hdr.b_buf == NULL);
 		IMPLY(GHOST_STATE(new_state), hdr->b_l1hdr.b_buf == NULL);
-		IMPLY(old_state == arc_anon, bufcnt <= 1);
+		IMPLY(old_state == arc_anon, hdr->b_l1hdr.b_buf == NULL ||
+		    ARC_BUF_LAST(hdr->b_l1hdr.b_buf));
 	} else {
 		old_state = arc_l2c_only;
 		refcnt = 0;
-		bufcnt = 0;
 		update_old = B_FALSE;
 	}
 	update_new = update_old;
@@ -2488,14 +2452,12 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 	if (update_new && new_state != arc_l2c_only) {
 		ASSERT(HDR_HAS_L1HDR(hdr));
 		if (GHOST_STATE(new_state)) {
-			ASSERT0(bufcnt);
 
 			/*
 			 * When moving a header to a ghost state, we first
-			 * remove all arc buffers. Thus, we'll have a
-			 * bufcnt of zero, and no arc buffer to use for
-			 * the reference. As a result, we use the arc
-			 * header pointer for the reference.
+			 * remove all arc buffers. Thus, we'll have no arc
+			 * buffer to use for the reference. As a result, we
+			 * use the arc header pointer for the reference.
 			 */
 			(void) zfs_refcount_add_many(
 			    &new_state->arcs_size[type],
@@ -2503,7 +2465,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 			ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
 			ASSERT(!HDR_HAS_RABD(hdr));
 		} else {
-			uint32_t buffers = 0;
 
 			/*
 			 * Each individual buffer holds a unique reference,
@@ -2512,8 +2473,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 			 */
 			for (arc_buf_t *buf = hdr->b_l1hdr.b_buf; buf != NULL;
 			    buf = buf->b_next) {
-				ASSERT3U(bufcnt, !=, 0);
-				buffers++;
 
 				/*
 				 * When the arc_buf_t is sharing the data
@@ -2529,7 +2488,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 				    &new_state->arcs_size[type],
 				    arc_buf_size(buf), buf);
 			}
-			ASSERT3U(bufcnt, ==, buffers);
 
 			if (hdr->b_l1hdr.b_pabd != NULL) {
 				(void) zfs_refcount_add_many(
@@ -2548,7 +2506,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 	if (update_old && old_state != arc_l2c_only) {
 		ASSERT(HDR_HAS_L1HDR(hdr));
 		if (GHOST_STATE(old_state)) {
-			ASSERT0(bufcnt);
 			ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
 			ASSERT(!HDR_HAS_RABD(hdr));
 
@@ -2564,7 +2521,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 			    &old_state->arcs_size[type],
 			    HDR_GET_LSIZE(hdr), hdr);
 		} else {
-			uint32_t buffers = 0;
 
 			/*
 			 * Each individual buffer holds a unique reference,
@@ -2573,8 +2529,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 			 */
 			for (arc_buf_t *buf = hdr->b_l1hdr.b_buf; buf != NULL;
 			    buf = buf->b_next) {
-				ASSERT3U(bufcnt, !=, 0);
-				buffers++;
 
 				/*
 				 * When the arc_buf_t is sharing the data
@@ -2590,7 +2544,6 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr)
 				    &old_state->arcs_size[type],
 				    arc_buf_size(buf), buf);
 			}
-			ASSERT3U(bufcnt, ==, buffers);
 			ASSERT(hdr->b_l1hdr.b_pabd != NULL ||
 			    HDR_HAS_RABD(hdr));
 
@@ -2838,9 +2791,6 @@ arc_buf_alloc_impl(arc_buf_hdr_t *hdr, spa_t *spa, const zbookmark_phys_t *zb,
 	VERIFY3P(buf->b_data, !=, NULL);
 
 	hdr->b_l1hdr.b_buf = buf;
-	hdr->b_l1hdr.b_bufcnt += 1;
-	if (encrypted)
-		hdr->b_crypt_hdr.b_ebufcnt += 1;
 
 	/*
 	 * If the user wants the data from the hdr, we need to either copy or
@@ -3082,8 +3032,6 @@ arc_buf_remove(arc_buf_hdr_t *hdr, arc_buf_t *buf)
 	}
 	buf->b_next = NULL;
 	ASSERT3P(lastbuf, !=, buf);
-	IMPLY(hdr->b_l1hdr.b_bufcnt > 0, lastbuf != NULL);
-	IMPLY(hdr->b_l1hdr.b_bufcnt > 0, hdr->b_l1hdr.b_buf != NULL);
 	IMPLY(lastbuf != NULL, ARC_BUF_LAST(lastbuf));
 
 	return (lastbuf);
@@ -3122,22 +3070,20 @@ arc_buf_destroy_impl(arc_buf_t *buf)
 		}
 		buf->b_data = NULL;
 
-		ASSERT(hdr->b_l1hdr.b_bufcnt > 0);
-		hdr->b_l1hdr.b_bufcnt -= 1;
-
-		if (ARC_BUF_ENCRYPTED(buf)) {
-			hdr->b_crypt_hdr.b_ebufcnt -= 1;
-
-			/*
-			 * If we have no more encrypted buffers and we've
-			 * already gotten a copy of the decrypted data we can
-			 * free b_rabd to save some space.
-			 */
-			if (hdr->b_crypt_hdr.b_ebufcnt == 0 &&
-			    HDR_HAS_RABD(hdr) && hdr->b_l1hdr.b_pabd != NULL &&
-			    !HDR_IO_IN_PROGRESS(hdr)) {
-				arc_hdr_free_abd(hdr, B_TRUE);
+		/*
+		 * If we have no more encrypted buffers and we've already
+		 * gotten a copy of the decrypted data we can free b_rabd
+		 * to save some space.
+		 */
+		if (ARC_BUF_ENCRYPTED(buf) && HDR_HAS_RABD(hdr) &&
+		    hdr->b_l1hdr.b_pabd != NULL && !HDR_IO_IN_PROGRESS(hdr)) {
+			arc_buf_t *b;
+			for (b = hdr->b_l1hdr.b_buf; b; b = b->b_next) {
+				if (b != buf && ARC_BUF_ENCRYPTED(b))
+					break;
 			}
+			if (b == NULL)
+				arc_hdr_free_abd(hdr, B_TRUE);
 		}
 	}
 
@@ -3298,11 +3244,7 @@ arc_hdr_alloc(uint64_t spa, int32_t psize, int32_t lsize,
 	arc_buf_hdr_t *hdr;
 
 	VERIFY(type == ARC_BUFC_DATA || type == ARC_BUFC_METADATA);
-	if (protected) {
-		hdr = kmem_cache_alloc(hdr_full_crypt_cache, KM_PUSHPAGE);
-	} else {
-		hdr = kmem_cache_alloc(hdr_full_cache, KM_PUSHPAGE);
-	}
+	hdr = kmem_cache_alloc(hdr_full_cache, KM_PUSHPAGE);
 
 	ASSERT(HDR_EMPTY(hdr));
 #ifdef ZFS_DEBUG
@@ -3325,7 +3267,6 @@ arc_hdr_alloc(uint64_t spa, int32_t psize, int32_t lsize,
 	hdr->b_l1hdr.b_mru_ghost_hits = 0;
 	hdr->b_l1hdr.b_mfu_hits = 0;
 	hdr->b_l1hdr.b_mfu_ghost_hits = 0;
-	hdr->b_l1hdr.b_bufcnt = 0;
 	hdr->b_l1hdr.b_buf = NULL;
 
 	ASSERT(zfs_refcount_is_zero(&hdr->b_l1hdr.b_refcnt));
@@ -3351,16 +3292,6 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
 	ASSERT((old == hdr_full_cache && new == hdr_l2only_cache) ||
 	    (old == hdr_l2only_cache && new == hdr_full_cache));
 
-	/*
-	 * if the caller wanted a new full header and the header is to be
-	 * encrypted we will actually allocate the header from the full crypt
-	 * cache instead. The same applies to freeing from the old cache.
-	 */
-	if (HDR_PROTECTED(hdr) && new == hdr_full_cache)
-		new = hdr_full_crypt_cache;
-	if (HDR_PROTECTED(hdr) && old == hdr_full_cache)
-		old = hdr_full_crypt_cache;
-
 	nhdr = kmem_cache_alloc(new, KM_PUSHPAGE);
 
 	ASSERT(MUTEX_HELD(HDR_LOCK(hdr)));
@@ -3368,7 +3299,7 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
 
 	memcpy(nhdr, hdr, HDR_L2ONLY_SIZE);
 
-	if (new == hdr_full_cache || new == hdr_full_crypt_cache) {
+	if (new == hdr_full_cache) {
 		arc_hdr_set_flags(nhdr, ARC_FLAG_HAS_L1HDR);
 		/*
 		 * arc_access and arc_change_state need to be aware that a
@@ -3382,7 +3313,6 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
 		ASSERT(!HDR_HAS_RABD(hdr));
 	} else {
 		ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
-		ASSERT0(hdr->b_l1hdr.b_bufcnt);
 #ifdef ZFS_DEBUG
 		ASSERT3P(hdr->b_l1hdr.b_freeze_cksum, ==, NULL);
 #endif
@@ -3448,126 +3378,6 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
 	return (nhdr);
 }
 
-/*
- * This function allows an L1 header to be reallocated as a crypt
- * header and vice versa. If we are going to a crypt header, the
- * new fields will be zeroed out.
- */
-static arc_buf_hdr_t *
-arc_hdr_realloc_crypt(arc_buf_hdr_t *hdr, boolean_t need_crypt)
-{
-	arc_buf_hdr_t *nhdr;
-	arc_buf_t *buf;
-	kmem_cache_t *ncache, *ocache;
-
-	/*
-	 * This function requires that hdr is in the arc_anon state.
-	 * Therefore it won't have any L2ARC data for us to worry
-	 * about copying.
-	 */
-	ASSERT(HDR_HAS_L1HDR(hdr));
-	ASSERT(!HDR_HAS_L2HDR(hdr));
-	ASSERT3U(!!HDR_PROTECTED(hdr), !=, need_crypt);
-	ASSERT3P(hdr->b_l1hdr.b_state, ==, arc_anon);
-	ASSERT(!multilist_link_active(&hdr->b_l1hdr.b_arc_node));
-	ASSERT(!list_link_active(&hdr->b_l2hdr.b_l2node));
-	ASSERT3P(hdr->b_hash_next, ==, NULL);
-
-	if (need_crypt) {
-		ncache = hdr_full_crypt_cache;
-		ocache = hdr_full_cache;
-	} else {
-		ncache = hdr_full_cache;
-		ocache = hdr_full_crypt_cache;
-	}
-
-	nhdr = kmem_cache_alloc(ncache, KM_PUSHPAGE);
-
-	/*
-	 * Copy all members that aren't locks or condvars to the new header.
-	 * No lists are pointing to us (as we asserted above), so we don't
-	 * need to worry about the list nodes.
-	 */
-	nhdr->b_dva = hdr->b_dva;
-	nhdr->b_birth = hdr->b_birth;
-	nhdr->b_type = hdr->b_type;
-	nhdr->b_flags = hdr->b_flags;
-	nhdr->b_psize = hdr->b_psize;
-	nhdr->b_lsize = hdr->b_lsize;
-	nhdr->b_spa = hdr->b_spa;
-#ifdef ZFS_DEBUG
-	nhdr->b_l1hdr.b_freeze_cksum = hdr->b_l1hdr.b_freeze_cksum;
-#endif
-	nhdr->b_l1hdr.b_bufcnt = hdr->b_l1hdr.b_bufcnt;
-	nhdr->b_l1hdr.b_byteswap = hdr->b_l1hdr.b_byteswap;
-	nhdr->b_l1hdr.b_state = hdr->b_l1hdr.b_state;
-	nhdr->b_l1hdr.b_arc_access = hdr->b_l1hdr.b_arc_access;
-	nhdr->b_l1hdr.b_mru_hits = hdr->b_l1hdr.b_mru_hits;
-	nhdr->b_l1hdr.b_mru_ghost_hits = hdr->b_l1hdr.b_mru_ghost_hits;
-	nhdr->b_l1hdr.b_mfu_hits = hdr->b_l1hdr.b_mfu_hits;
-	nhdr->b_l1hdr.b_mfu_ghost_hits = hdr->b_l1hdr.b_mfu_ghost_hits;
-	nhdr->b_l1hdr.b_acb = hdr->b_l1hdr.b_acb;
-	nhdr->b_l1hdr.b_pabd = hdr->b_l1hdr.b_pabd;
-
-	/*
-	 * This zfs_refcount_add() exists only to ensure that the individual
-	 * arc buffers always point to a header that is referenced, avoiding
-	 * a small race condition that could trigger ASSERTs.
-	 */
-	(void) zfs_refcount_add(&nhdr->b_l1hdr.b_refcnt, FTAG);
-	nhdr->b_l1hdr.b_buf = hdr->b_l1hdr.b_buf;
-	for (buf = nhdr->b_l1hdr.b_buf; buf != NULL; buf = buf->b_next)
-		buf->b_hdr = nhdr;
-
-	zfs_refcount_transfer(&nhdr->b_l1hdr.b_refcnt, &hdr->b_l1hdr.b_refcnt);
-	(void) zfs_refcount_remove(&nhdr->b_l1hdr.b_refcnt, FTAG);
-	ASSERT0(zfs_refcount_count(&hdr->b_l1hdr.b_refcnt));
-
-	if (need_crypt) {
-		arc_hdr_set_flags(nhdr, ARC_FLAG_PROTECTED);
-	} else {
-		arc_hdr_clear_flags(nhdr, ARC_FLAG_PROTECTED);
-	}
-
-	/* unset all members of the original hdr */
-	memset(&hdr->b_dva, 0, sizeof (dva_t));
-	hdr->b_birth = 0;
-	hdr->b_type = 0;
-	hdr->b_flags = 0;
-	hdr->b_psize = 0;
-	hdr->b_lsize = 0;
-	hdr->b_spa = 0;
-#ifdef ZFS_DEBUG
-	hdr->b_l1hdr.b_freeze_cksum = NULL;
-#endif
-	hdr->b_l1hdr.b_buf = NULL;
-	hdr->b_l1hdr.b_bufcnt = 0;
-	hdr->b_l1hdr.b_byteswap = 0;
-	hdr->b_l1hdr.b_state = NULL;
-	hdr->b_l1hdr.b_arc_access = 0;
-	hdr->b_l1hdr.b_mru_hits = 0;
-	hdr->b_l1hdr.b_mru_ghost_hits = 0;
-	hdr->b_l1hdr.b_mfu_hits = 0;
-	hdr->b_l1hdr.b_mfu_ghost_hits = 0;
-	hdr->b_l1hdr.b_acb = NULL;
-	hdr->b_l1hdr.b_pabd = NULL;
-
-	if (ocache == hdr_full_crypt_cache) {
-		ASSERT(!HDR_HAS_RABD(hdr));
-		hdr->b_crypt_hdr.b_ot = DMU_OT_NONE;
-		hdr->b_crypt_hdr.b_ebufcnt = 0;
-		hdr->b_crypt_hdr.b_dsobj = 0;
-		memset(hdr->b_crypt_hdr.b_salt, 0, ZIO_DATA_SALT_LEN);
-		memset(hdr->b_crypt_hdr.b_iv, 0, ZIO_DATA_IV_LEN);
-		memset(hdr->b_crypt_hdr.b_mac, 0, ZIO_DATA_MAC_LEN);
-	}
-
-	buf_discard_identity(hdr);
-	kmem_cache_free(ocache, hdr);
-
-	return (nhdr);
-}
-
 /*
  * This function is used by the send / receive code to convert a newly
  * allocated arc_buf_t to one that is suitable for a raw encrypted write. It
@@ -3587,8 +3397,7 @@ arc_convert_to_raw(arc_buf_t *buf, uint64_t dsobj, boolean_t byteorder,
 	ASSERT3P(hdr->b_l1hdr.b_state, ==, arc_anon);
 
 	buf->b_flags |= (ARC_BUF_FLAG_COMPRESSED | ARC_BUF_FLAG_ENCRYPTED);
-	if (!HDR_PROTECTED(hdr))
-		hdr = arc_hdr_realloc_crypt(hdr, B_TRUE);
+	arc_hdr_set_flags(hdr, ARC_FLAG_PROTECTED);
 	hdr->b_crypt_hdr.b_dsobj = dsobj;
 	hdr->b_crypt_hdr.b_ot = ot;
 	hdr->b_l1hdr.b_byteswap = (byteorder == ZFS_HOST_BYTEORDER) ?
@@ -3789,8 +3598,6 @@ static void
 arc_hdr_destroy(arc_buf_hdr_t *hdr)
 {
 	if (HDR_HAS_L1HDR(hdr)) {
-		ASSERT(hdr->b_l1hdr.b_buf == NULL ||
-		    hdr->b_l1hdr.b_bufcnt > 0);
 		ASSERT(zfs_refcount_is_zero(&hdr->b_l1hdr.b_refcnt));
 		ASSERT3P(hdr->b_l1hdr.b_state, ==, arc_anon);
 	}
@@ -3854,12 +3661,7 @@ arc_hdr_destroy(arc_buf_hdr_t *hdr)
 #ifdef ZFS_DEBUG
 		ASSERT3P(hdr->b_l1hdr.b_freeze_cksum, ==, NULL);
 #endif
-
-		if (!HDR_PROTECTED(hdr)) {
-			kmem_cache_free(hdr_full_cache, hdr);
-		} else {
-			kmem_cache_free(hdr_full_crypt_cache, hdr);
-		}
+		kmem_cache_free(hdr_full_cache, hdr);
 	} else {
 		kmem_cache_free(hdr_l2only_cache, hdr);
 	}
@@ -3871,7 +3673,8 @@ arc_buf_destroy(arc_buf_t *buf, const void *tag)
 	arc_buf_hdr_t *hdr = buf->b_hdr;
 
 	if (hdr->b_l1hdr.b_state == arc_anon) {
-		ASSERT3U(hdr->b_l1hdr.b_bufcnt, ==, 1);
+		ASSERT3P(hdr->b_l1hdr.b_buf, ==, buf);
+		ASSERT(ARC_BUF_LAST(buf));
 		ASSERT(!HDR_IO_IN_PROGRESS(hdr));
 		VERIFY0(remove_reference(hdr, tag));
 		return;
@@ -3881,7 +3684,7 @@ arc_buf_destroy(arc_buf_t *buf, const void *tag)
 	mutex_enter(hash_lock);
 
 	ASSERT3P(hdr, ==, buf->b_hdr);
-	ASSERT(hdr->b_l1hdr.b_bufcnt > 0);
+	ASSERT3P(hdr->b_l1hdr.b_buf, !=, NULL);
 	ASSERT3P(hash_lock, ==, HDR_LOCK(hdr));
 	ASSERT3P(hdr->b_l1hdr.b_state, !=, arc_anon);
 	ASSERT3P(buf->b_data, !=, NULL);
@@ -3924,7 +3727,6 @@ arc_evict_hdr(arc_buf_hdr_t *hdr, uint64_t *real_evicted)
 	ASSERT(MUTEX_HELD(HDR_LOCK(hdr)));
 	ASSERT(HDR_HAS_L1HDR(hdr));
 	ASSERT(!HDR_IO_IN_PROGRESS(hdr));
-	ASSERT0(hdr->b_l1hdr.b_bufcnt);
 	ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
 	ASSERT0(zfs_refcount_count(&hdr->b_l1hdr.b_refcnt));
 
@@ -5586,13 +5388,6 @@ arc_read_done(zio_t *zio)
 			buf_hash_remove(hdr);
 	}
 
-	/*
-	 * Broadcast before we drop the hash_lock to avoid the possibility
-	 * that the hdr (and hence the cv) might be freed before we get to
-	 * the cv_broadcast().
-	 */
-	cv_broadcast(&hdr->b_l1hdr.b_cv);
-
 	arc_hdr_clear_flags(hdr, ARC_FLAG_IO_IN_PROGRESS);
 	(void) remove_reference(hdr, hdr);
 
@@ -5787,8 +5582,7 @@ arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
 				}
 				acb->acb_zio_head = head_zio;
 				acb->acb_next = hdr->b_l1hdr.b_acb;
-				if (hdr->b_l1hdr.b_acb)
-					hdr->b_l1hdr.b_acb->acb_prev = acb;
+				hdr->b_l1hdr.b_acb->acb_prev = acb;
 				hdr->b_l1hdr.b_acb = acb;
 			}
 			mutex_exit(hash_lock);
@@ -5928,8 +5722,28 @@ arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
 				 * and so the performance impact shouldn't
 				 * matter.
 				 */
-				cv_wait(&hdr->b_l1hdr.b_cv, hash_lock);
+				arc_callback_t *acb = kmem_zalloc(
+				    sizeof (arc_callback_t), KM_SLEEP);
+				acb->acb_wait = B_TRUE;
+				mutex_init(&acb->acb_wait_lock, NULL,
+				    MUTEX_DEFAULT, NULL);
+				cv_init(&acb->acb_wait_cv, NULL, CV_DEFAULT,
+				    NULL);
+				acb->acb_zio_head =
+				    hdr->b_l1hdr.b_acb->acb_zio_head;
+				acb->acb_next = hdr->b_l1hdr.b_acb;
+				hdr->b_l1hdr.b_acb->acb_prev = acb;
+				hdr->b_l1hdr.b_acb = acb;
 				mutex_exit(hash_lock);
+				mutex_enter(&acb->acb_wait_lock);
+				while (acb->acb_wait) {
+					cv_wait(&acb->acb_wait_cv,
+					    &acb->acb_wait_lock);
+				}
+				mutex_exit(&acb->acb_wait_lock);
+				mutex_destroy(&acb->acb_wait_lock);
+				cv_destroy(&acb->acb_wait_cv);
+				kmem_free(acb, sizeof (arc_callback_t));
 				goto top;
 			}
 		}
@@ -6310,7 +6124,8 @@ arc_release(arc_buf_t *buf, const void *tag)
 		ASSERT(!HDR_IN_HASH_TABLE(hdr));
 		ASSERT(!HDR_HAS_L2HDR(hdr));
 
-		ASSERT3U(hdr->b_l1hdr.b_bufcnt, ==, 1);
+		ASSERT3P(hdr->b_l1hdr.b_buf, ==, buf);
+		ASSERT(ARC_BUF_LAST(buf));
 		ASSERT3S(zfs_refcount_count(&hdr->b_l1hdr.b_refcnt), ==, 1);
 		ASSERT(!multilist_link_active(&hdr->b_l1hdr.b_arc_node));
 
@@ -6361,7 +6176,7 @@ arc_release(arc_buf_t *buf, const void *tag)
 	/*
 	 * Do we have more than one buf?
 	 */
-	if (hdr->b_l1hdr.b_bufcnt > 1) {
+	if (hdr->b_l1hdr.b_buf != buf || !ARC_BUF_LAST(buf)) {
 		arc_buf_hdr_t *nhdr;
 		uint64_t spa = hdr->b_spa;
 		uint64_t psize = HDR_GET_PSIZE(hdr);
@@ -6442,10 +6257,6 @@ arc_release(arc_buf_t *buf, const void *tag)
 			    arc_buf_size(buf), buf);
 		}
 
-		hdr->b_l1hdr.b_bufcnt -= 1;
-		if (ARC_BUF_ENCRYPTED(buf))
-			hdr->b_crypt_hdr.b_ebufcnt -= 1;
-
 		arc_cksum_verify(buf);
 		arc_buf_unwatch(buf);
 
@@ -6458,15 +6269,11 @@ arc_release(arc_buf_t *buf, const void *tag)
 		nhdr = arc_hdr_alloc(spa, psize, lsize, protected,
 		    compress, hdr->b_complevel, type);
 		ASSERT3P(nhdr->b_l1hdr.b_buf, ==, NULL);
-		ASSERT0(nhdr->b_l1hdr.b_bufcnt);
 		ASSERT0(zfs_refcount_count(&nhdr->b_l1hdr.b_refcnt));
 		VERIFY3U(nhdr->b_type, ==, type);
 		ASSERT(!HDR_SHARED_DATA(nhdr));
 
 		nhdr->b_l1hdr.b_buf = buf;
-		nhdr->b_l1hdr.b_bufcnt = 1;
-		if (ARC_BUF_ENCRYPTED(buf))
-			nhdr->b_crypt_hdr.b_ebufcnt = 1;
 		(void) zfs_refcount_add(&nhdr->b_l1hdr.b_refcnt, tag);
 		buf->b_hdr = nhdr;
 
@@ -6517,7 +6324,7 @@ arc_write_ready(zio_t *zio)
 
 	ASSERT(HDR_HAS_L1HDR(hdr));
 	ASSERT(!zfs_refcount_is_zero(&buf->b_hdr->b_l1hdr.b_refcnt));
-	ASSERT(hdr->b_l1hdr.b_bufcnt > 0);
+	ASSERT3P(hdr->b_l1hdr.b_buf, !=, NULL);
 
 	/*
 	 * If we're reexecuting this zio because the pool suspended, then
@@ -6552,13 +6359,9 @@ arc_write_ready(zio_t *zio)
 		add_reference(hdr, hdr); /* For IO_IN_PROGRESS. */
 	}
 
-	if (BP_IS_PROTECTED(bp) != !!HDR_PROTECTED(hdr))
-		hdr = arc_hdr_realloc_crypt(hdr, BP_IS_PROTECTED(bp));
-
 	if (BP_IS_PROTECTED(bp)) {
 		/* ZIL blocks are written through zio_rewrite */
 		ASSERT3U(BP_GET_TYPE(bp), !=, DMU_OT_INTENT_LOG);
-		ASSERT(HDR_PROTECTED(hdr));
 
 		if (BP_SHOULD_BYTESWAP(bp)) {
 			if (BP_GET_LEVEL(bp) > 0) {
@@ -6571,11 +6374,14 @@ arc_write_ready(zio_t *zio)
 			hdr->b_l1hdr.b_byteswap = DMU_BSWAP_NUMFUNCS;
 		}
 
+		arc_hdr_set_flags(hdr, ARC_FLAG_PROTECTED);
 		hdr->b_crypt_hdr.b_ot = BP_GET_TYPE(bp);
 		hdr->b_crypt_hdr.b_dsobj = zio->io_bookmark.zb_objset;
 		zio_crypt_decode_params_bp(bp, hdr->b_crypt_hdr.b_salt,
 		    hdr->b_crypt_hdr.b_iv);
 		zio_crypt_decode_mac_bp(bp, hdr->b_crypt_hdr.b_mac);
+	} else {
+		arc_hdr_clear_flags(hdr, ARC_FLAG_PROTECTED);
 	}
 
 	/*
@@ -6656,7 +6462,8 @@ arc_write_ready(zio_t *zio)
 	} else {
 		ASSERT3P(buf->b_data, ==, abd_to_buf(zio->io_orig_abd));
 		ASSERT3U(zio->io_orig_size, ==, arc_buf_size(buf));
-		ASSERT3U(hdr->b_l1hdr.b_bufcnt, ==, 1);
+		ASSERT3P(hdr->b_l1hdr.b_buf, ==, buf);
+		ASSERT(ARC_BUF_LAST(buf));
 
 		arc_share_buf(hdr, buf);
 	}
@@ -6737,7 +6544,8 @@ arc_write_done(zio_t *zio)
 					    (void *)hdr, (void *)exists);
 			} else {
 				/* Dedup */
-				ASSERT(hdr->b_l1hdr.b_bufcnt == 1);
+				ASSERT3P(hdr->b_l1hdr.b_buf, !=, NULL);
+				ASSERT(ARC_BUF_LAST(hdr->b_l1hdr.b_buf));
 				ASSERT(hdr->b_l1hdr.b_state == arc_anon);
 				ASSERT(BP_GET_DEDUP(zio->io_bp));
 				ASSERT(BP_GET_LEVEL(zio->io_bp) == 0);
@@ -6778,7 +6586,7 @@ arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
 	ASSERT(!HDR_IO_ERROR(hdr));
 	ASSERT(!HDR_IO_IN_PROGRESS(hdr));
 	ASSERT3P(hdr->b_l1hdr.b_acb, ==, NULL);
-	ASSERT3U(hdr->b_l1hdr.b_bufcnt, >, 0);
+	ASSERT3P(hdr->b_l1hdr.b_buf, !=, NULL);
 	if (uncached)
 		arc_hdr_set_flags(hdr, ARC_FLAG_UNCACHED);
 	else if (l2arc)
diff --git a/sys/contrib/subrepo-openzfs/module/zfs/dmu_tx.c b/sys/contrib/subrepo-openzfs/module/zfs/dmu_tx.c
index 0eb8c17e331a..8451b5082e86 100644
--- a/sys/contrib/subrepo-openzfs/module/zfs/dmu_tx.c
+++ b/sys/contrib/subrepo-openzfs/module/zfs/dmu_tx.c
@@ -210,10 +210,12 @@ dmu_tx_check_ioerr(zio_t *zio, dnode_t *dn, int level, uint64_t blkid)
 	dmu_buf_impl_t *db;
 
 	rw_enter(&dn->dn_struct_rwlock, RW_READER);
-	db = dbuf_hold_level(dn, level, blkid, FTAG);
+	err = dbuf_hold_impl(dn, level, blkid, TRUE, FALSE, FTAG, &db);
 	rw_exit(&dn->dn_struct_rwlock);
-	if (db == NULL)
-		return (SET_ERROR(EIO));
+	if (err == ENOENT)
+		return (0);
+	if (err != 0)
+		return (err);
 	/*
 	 * PARTIAL_FIRST allows caching for uncacheable blocks.  It will
 	 * be cleared after dmu_buf_will_dirty() call dbuf_read() again.
diff --git a/sys/contrib/subrepo-openzfs/module/zfs/metaslab.c b/sys/contrib/subrepo-openzfs/module/zfs/metaslab.c
index 8635403d6ad4..e0d4a6a63508 100644
--- a/sys/contrib/subrepo-openzfs/module/zfs/metaslab.c
+++ b/sys/contrib/subrepo-openzfs/module/zfs/metaslab.c
@@ -205,11 +205,6 @@ static const uint32_t metaslab_min_search_count = 100;
  */
 static int metaslab_df_use_largest_segment = B_FALSE;
 
-/*
- * Percentage of all cpus that can be used by the metaslab taskq.
- */
-int metaslab_load_pct = 50;
-
 /*
  * These tunables control how long a metaslab will remain loaded after the
  * last allocation from it.  A metaslab can't be unloaded until at least
@@ -854,9 +849,6 @@ metaslab_group_create(metaslab_class_t *mc, vdev_t *vd, int allocators)
 		zfs_refcount_create_tracked(&mga->mga_alloc_queue_depth);
 	}
 
-	mg->mg_taskq = taskq_create("metaslab_group_taskq", metaslab_load_pct,
-	    maxclsyspri, 10, INT_MAX, TASKQ_THREADS_CPU_PCT | TASKQ_DYNAMIC);
-
 	return (mg);
 }
 
@@ -872,7 +864,6 @@ metaslab_group_destroy(metaslab_group_t *mg)
 	 */
 	ASSERT(mg->mg_activation_count <= 0);
 
-	taskq_destroy(mg->mg_taskq);
 	avl_destroy(&mg->mg_metaslab_tree);
 	mutex_destroy(&mg->mg_lock);
 	mutex_destroy(&mg->mg_ms_disabled_lock);
@@ -963,7 +954,7 @@ metaslab_group_passivate(metaslab_group_t *mg)
 	 * allocations from taking place and any changes to the vdev tree.
 	 */
 	spa_config_exit(spa, locks & ~(SCL_ZIO - 1), spa);
-	taskq_wait_outstanding(mg->mg_taskq, 0);
+	taskq_wait_outstanding(spa->spa_metaslab_taskq, 0);
 	spa_config_enter(spa, locks & ~(SCL_ZIO - 1), spa, RW_WRITER);
 	metaslab_group_alloc_update(mg);
 	for (int i = 0; i < mg->mg_allocators; i++) {
@@ -3571,10 +3562,8 @@ metaslab_group_preload(metaslab_group_t *mg)
 	avl_tree_t *t = &mg->mg_metaslab_tree;
 	int m = 0;
 
-	if (spa_shutting_down(spa) || !metaslab_preload_enabled) {
-		taskq_wait_outstanding(mg->mg_taskq, 0);
+	if (spa_shutting_down(spa) || !metaslab_preload_enabled)
 		return;
-	}
 
 	mutex_enter(&mg->mg_lock);
 
@@ -3594,8 +3583,9 @@ metaslab_group_preload(metaslab_group_t *mg)
 			continue;
 		}
 
-		VERIFY(taskq_dispatch(mg->mg_taskq, metaslab_preload,
-		    msp, TQ_SLEEP) != TASKQID_INVALID);
+		VERIFY(taskq_dispatch(spa->spa_metaslab_taskq, metaslab_preload,
+		    msp, TQ_SLEEP | (m <= mg->mg_allocators ? TQ_FRONT : 0))
+		    != TASKQID_INVALID);
 	}
 	mutex_exit(&mg->mg_lock);
 }
@@ -6224,6 +6214,9 @@ ZFS_MODULE_PARAM(zfs_metaslab, metaslab_, debug_unload, INT, ZMOD_RW,
 ZFS_MODULE_PARAM(zfs_metaslab, metaslab_, preload_enabled, INT, ZMOD_RW,
 	"Preload potential metaslabs during reassessment");
 
+ZFS_MODULE_PARAM(zfs_metaslab, metaslab_, preload_limit, UINT, ZMOD_RW,
+	"Max number of metaslabs per group to preload");
+
 ZFS_MODULE_PARAM(zfs_metaslab, metaslab_, unload_delay, UINT, ZMOD_RW,
 	"Delay in txgs after metaslab was last used before unloading");
 
diff --git a/sys/contrib/subrepo-openzfs/module/zfs/spa.c b/sys/contrib/subrepo-openzfs/module/zfs/spa.c
index cda62f939c1e..0b69568e2aad 100644
--- a/sys/contrib/subrepo-openzfs/module/zfs/spa.c
+++ b/sys/contrib/subrepo-openzfs/module/zfs/spa.c
@@ -169,6 +169,11 @@ static int spa_load_impl(spa_t *spa, spa_import_type_t type,
     const char **ereport);
 static void spa_vdev_resilver_done(spa_t *spa);
 
+/*
+ * Percentage of all CPUs that can be used by the metaslab preload taskq.
+ */
+static uint_t metaslab_preload_pct = 50;
+
 static uint_t	zio_taskq_batch_pct = 80;	  /* 1 thread per cpu in pset */
 static uint_t	zio_taskq_batch_tpq;		  /* threads per taskq */
 static const boolean_t	zio_taskq_sysdc = B_TRUE; /* use SDC scheduling class */
@@ -1399,6 +1404,13 @@ spa_activate(spa_t *spa, spa_mode_t mode)
 	spa->spa_zvol_taskq = taskq_create("z_zvol", 1, defclsyspri,
 	    1, INT_MAX, 0);
 
+	/*
+	 * The taskq to preload metaslabs.
+	 */
+	spa->spa_metaslab_taskq = taskq_create("z_metaslab",
+	    metaslab_preload_pct, maxclsyspri, 1, INT_MAX,
+	    TASKQ_DYNAMIC | TASKQ_THREADS_CPU_PCT);
+
 	/*
 	 * Taskq dedicated to prefetcher threads: this is used to prevent the
 	 * pool traverse code from monopolizing the global (and limited)
@@ -1434,6 +1446,11 @@ spa_deactivate(spa_t *spa)
 		spa->spa_zvol_taskq = NULL;
 	}
 
+	if (spa->spa_metaslab_taskq) {
+		taskq_destroy(spa->spa_metaslab_taskq);
+		spa->spa_metaslab_taskq = NULL;
+	}
+
 	if (spa->spa_prefetch_taskq) {
 		taskq_destroy(spa->spa_prefetch_taskq);
 		spa->spa_prefetch_taskq = NULL;
@@ -1706,13 +1723,7 @@ spa_unload(spa_t *spa)
 	 * This ensures that there is no async metaslab prefetching
 	 * while we attempt to unload the spa.
 	 */
-	if (spa->spa_root_vdev != NULL) {
-		for (int c = 0; c < spa->spa_root_vdev->vdev_children; c++) {
-			vdev_t *vc = spa->spa_root_vdev->vdev_child[c];
-			if (vc->vdev_mg != NULL)
-				taskq_wait(vc->vdev_mg->mg_taskq);
-		}
-	}
+	taskq_wait(spa->spa_metaslab_taskq);
 
 	if (spa->spa_mmp.mmp_thread)
 		mmp_thread_stop(spa);
@@ -3922,6 +3933,24 @@ spa_ld_trusted_config(spa_t *spa, spa_import_type_t type,
 	rvd = mrvd;
 	spa_config_exit(spa, SCL_ALL, FTAG);
 
+	/*
+	 * If 'zpool import' used a cached config, then the on-disk hostid and
+	 * hostname may be different to the cached config in ways that should
+	 * prevent import.  Userspace can't discover this without a scan, but
+	 * we know, so we add these values to LOAD_INFO so the caller can know
+	 * the difference.
+	 *
+	 * Note that we have to do this before the config is regenerated,
+	 * because the new config will have the hostid and hostname for this
+	 * host, in readiness for import.
+	 */
+	if (nvlist_exists(mos_config, ZPOOL_CONFIG_HOSTID))
+		fnvlist_add_uint64(spa->spa_load_info, ZPOOL_CONFIG_HOSTID,
+		    fnvlist_lookup_uint64(mos_config, ZPOOL_CONFIG_HOSTID));
+	if (nvlist_exists(mos_config, ZPOOL_CONFIG_HOSTNAME))
+		fnvlist_add_string(spa->spa_load_info, ZPOOL_CONFIG_HOSTNAME,
+		    fnvlist_lookup_string(mos_config, ZPOOL_CONFIG_HOSTNAME));
+
 	/*
 	 * We will use spa_config if we decide to reload the spa or if spa_load
 	 * fails and we rewind. We must thus regenerate the config using the
@@ -10134,6 +10163,9 @@ EXPORT_SYMBOL(spa_prop_clear_bootfs);
 /* asynchronous event notification */
 EXPORT_SYMBOL(spa_event_notify);
 
+ZFS_MODULE_PARAM(zfs_metaslab, metaslab_, preload_pct, UINT, ZMOD_RW,
+	"Percentage of CPUs to run a metaslab preload taskq");
+
 /* BEGIN CSTYLED */
 ZFS_MODULE_PARAM(zfs_spa, spa_, load_verify_shift, UINT, ZMOD_RW,
 	"log2 fraction of arc that can be used by inflight I/Os when "
diff --git a/sys/contrib/subrepo-openzfs/module/zfs/vdev_label.c b/sys/contrib/subrepo-openzfs/module/zfs/vdev_label.c
index a5c76808f2d2..a2e5524a8391 100644
--- a/sys/contrib/subrepo-openzfs/module/zfs/vdev_label.c
+++ b/sys/contrib/subrepo-openzfs/module/zfs/vdev_label.c
@@ -1138,6 +1138,16 @@ vdev_label_init(vdev_t *vd, uint64_t crtxg, vdev_labeltype_t reason)
 		    POOL_STATE_L2CACHE) == 0);
 		VERIFY(nvlist_add_uint64(label, ZPOOL_CONFIG_GUID,
 		    vd->vdev_guid) == 0);
+
+		/*
+		 * This is merely to facilitate reporting the ashift of the
+		 * cache device through zdb. The actual retrieval of the
+		 * ashift (in vdev_alloc()) uses the nvlist
+		 * spa->spa_l2cache->sav_config (populated in
+		 * spa_ld_open_aux_vdevs()).
+		 */
+		VERIFY(nvlist_add_uint64(label, ZPOOL_CONFIG_ASHIFT,
+		    vd->vdev_ashift) == 0);
 	} else {
 		uint64_t txg = 0ULL;
 
diff --git a/sys/contrib/subrepo-openzfs/module/zfs/vdev_trim.c b/sys/contrib/subrepo-openzfs/module/zfs/vdev_trim.c
index 0d71b9434342..03e17db024ea 100644
--- a/sys/contrib/subrepo-openzfs/module/zfs/vdev_trim.c
+++ b/sys/contrib/subrepo-openzfs/module/zfs/vdev_trim.c
@@ -23,6 +23,7 @@
  * Copyright (c) 2016 by Delphix. All rights reserved.
  * Copyright (c) 2019 by Lawrence Livermore National Security, LLC.
  * Copyright (c) 2021 Hewlett Packard Enterprise Development LP
+ * Copyright 2023 RackTop Systems, Inc.
  */
 
 #include <sys/spa.h>
@@ -591,6 +592,7 @@ vdev_trim_ranges(trim_args_t *ta)
 	uint64_t extent_bytes_max = ta->trim_extent_bytes_max;
 	uint64_t extent_bytes_min = ta->trim_extent_bytes_min;
 	spa_t *spa = vd->vdev_spa;
+	int error = 0;
 
 	ta->trim_start_time = gethrtime();
 	ta->trim_bytes_done = 0;
@@ -610,19 +612,32 @@ vdev_trim_ranges(trim_args_t *ta)
 		uint64_t writes_required = ((size - 1) / extent_bytes_max) + 1;
 
 		for (uint64_t w = 0; w < writes_required; w++) {
-			int error;
-
 			error = vdev_trim_range(ta, VDEV_LABEL_START_SIZE +
 			    rs_get_start(rs, ta->trim_tree) +
 			    (w *extent_bytes_max), MIN(size -
 			    (w * extent_bytes_max), extent_bytes_max));
 			if (error != 0) {
-				return (error);
+				goto done;
 			}
 		}
 	}
 
-	return (0);
+done:
+	/*
+	 * Make sure all TRIMs for this metaslab have completed before
+	 * returning. TRIM zios have lower priority over regular or syncing
+	 * zios, so all TRIM zios for this metaslab must complete before the
+	 * metaslab is re-enabled. Otherwise it's possible write zios to
+	 * this metaslab could cut ahead of still queued TRIM zios for this
+	 * metaslab causing corruption if the ranges overlap.
+	 */
+	mutex_enter(&vd->vdev_trim_io_lock);
+	while (vd->vdev_trim_inflight[0] > 0) {
+		cv_wait(&vd->vdev_trim_io_cv, &vd->vdev_trim_io_lock);
+	}
+	mutex_exit(&vd->vdev_trim_io_lock);
+
+	return (error);
 }
 
 static void
@@ -941,11 +956,6 @@ vdev_trim_thread(void *arg)
 	}
 
 	spa_config_exit(spa, SCL_CONFIG, FTAG);
-	mutex_enter(&vd->vdev_trim_io_lock);
-	while (vd->vdev_trim_inflight[0] > 0) {
-		cv_wait(&vd->vdev_trim_io_cv, &vd->vdev_trim_io_lock);
-	}
-	mutex_exit(&vd->vdev_trim_io_lock);
 
 	range_tree_destroy(ta.trim_tree);
 
diff --git a/sys/contrib/subrepo-openzfs/module/zfs/zil.c b/sys/contrib/subrepo-openzfs/module/zfs/zil.c
index 9e9c9c22549d..18c6cbf028b3 100644
--- a/sys/contrib/subrepo-openzfs/module/zfs/zil.c
+++ b/sys/contrib/subrepo-openzfs/module/zfs/zil.c
@@ -1958,26 +1958,28 @@ zil_max_log_data(zilog_t *zilog, size_t hdrsize)
 
 /*
  * Maximum amount of log space we agree to waste to reduce number of
- * WR_NEED_COPY chunks to reduce zl_get_data() overhead (~12%).
+ * WR_NEED_COPY chunks to reduce zl_get_data() overhead (~6%).
  */
 static inline uint64_t
 zil_max_waste_space(zilog_t *zilog)
 {
-	return (zil_max_log_data(zilog, sizeof (lr_write_t)) / 8);
+	return (zil_max_log_data(zilog, sizeof (lr_write_t)) / 16);
 }
 
 /*
  * Maximum amount of write data for WR_COPIED.  For correctness, consumers
  * must fall back to WR_NEED_COPY if we can't fit the entire record into one
  * maximum sized log block, because each WR_COPIED record must fit in a
- * single log block.  For space efficiency, we want to fit two records into a
- * max-sized log block.
+ * single log block.  Below that it is a tradeoff of additional memory copy
+ * and possibly worse log space efficiency vs additional range lock/unlock.
  */
+static uint_t zil_maxcopied = 7680;
+
 uint64_t
 zil_max_copied_data(zilog_t *zilog)
 {
-	return ((zilog->zl_max_block_size - sizeof (zil_chain_t)) / 2 -
-	    sizeof (lr_write_t));
+	uint64_t max_data = zil_max_log_data(zilog, sizeof (lr_write_t));
+	return (MIN(max_data, zil_maxcopied));
 }
 
 /*
@@ -4226,3 +4228,6 @@ ZFS_MODULE_PARAM(zfs_zil, zil_, slog_bulk, U64, ZMOD_RW,
 
 ZFS_MODULE_PARAM(zfs_zil, zil_, maxblocksize, UINT, ZMOD_RW,
 	"Limit in bytes of ZIL log block size");
+
+ZFS_MODULE_PARAM(zfs_zil, zil_, maxcopied, UINT, ZMOD_RW,
+	"Limit in bytes WR_COPIED size");
diff --git a/sys/contrib/subrepo-openzfs/rpm/generic/zfs.spec.in b/sys/contrib/subrepo-openzfs/rpm/generic/zfs.spec.in
index 8c538a00d203..2e89abd0edfd 100644
--- a/sys/contrib/subrepo-openzfs/rpm/generic/zfs.spec.in
+++ b/sys/contrib/subrepo-openzfs/rpm/generic/zfs.spec.in
@@ -19,6 +19,15 @@
 %endif
 %endif
 
+# Set the default _bashcompletiondir directory based on distribution.
+%if %{undefined _bashcompletiondir}
+%if 0%{?rhel}%{?fedora}%{?centos}%{?suse_version}%{?openEuler}
+%global _bashcompletiondir    /etc/bash_completion.d
+%else
+%global _bashcompletiondir    /usr/share/bash-completion
+%endif
+%endif
+
 # Set the default dracut directory based on distribution.
 %if %{undefined _dracutdir}
 %if 0%{?rhel}%{?fedora}%{?centos}%{?suse_version}%{?openEuler}
@@ -522,7 +531,7 @@ systemctl --system daemon-reload >/dev/null || true
 %config(noreplace) %{_sysconfdir}/%{name}/vdev_id.conf.*.example
 %attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/*
 
-%config(noreplace) %{_sysconfdir}/bash_completion.d/zfs
+%config(noreplace) %{_bashcompletiondir}/zfs
 
 %files -n libzpool5
 %{_libdir}/libzpool.so.*
diff --git a/sys/contrib/subrepo-openzfs/scripts/Makefile.am b/sys/contrib/subrepo-openzfs/scripts/Makefile.am
index 075434566437..b43bf97dbdf4 100644
--- a/sys/contrib/subrepo-openzfs/scripts/Makefile.am
+++ b/sys/contrib/subrepo-openzfs/scripts/Makefile.am
@@ -29,6 +29,7 @@ endif
 dist_noinst_DATA += \
 	%D%/cstyle.pl \
 	%D%/enum-extract.pl \
+	%D%/update_authors.pl \
 	%D%/zfs2zol-patch.sed \
 	%D%/zol2zfs-patch.sed
 
diff --git a/sys/contrib/subrepo-openzfs/scripts/update_authors.pl b/sys/contrib/subrepo-openzfs/scripts/update_authors.pl
new file mode 100755
index 000000000000..8dd49b5fb38d
--- /dev/null
+++ b/sys/contrib/subrepo-openzfs/scripts/update_authors.pl
@@ -0,0 +1,322 @@
+#!/usr/bin/env perl
+
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2023, Rob Norris <robn@despairlabs.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+
+# This program will update the AUTHORS file to include commit authors that are
+# in the git history but are not yet credited.
+#
+# The CONTRIBUTORS section of the AUTHORS file attempts to be a list of
+# individual contributors to OpenZFS, with one name, address and line per
+# person. This is good for readability, but does not really leave room for the
+# that names and emails on commits from the same individual can be different,
+# for all kinds of reasons, not limited to:
+#
+# - a person might change organisations, and so their email address changes
+#
+# - a person might be paid to work on OpenZFS for their employer, and then hack
+#   on personal projects in the evening, so commits legitimately come from
+#   different addresses
+#
+# - names change for all kinds of reasons
+#
+# To try and account for this, this program will try to find all the possible
+# names and emails for a single contributor, and then select the "best" one to
+# add to the AUTHORS file.
+#
+# The CONTRIBUTORS section of the AUTHORS file is considered the source of
+# truth. Once an individual committer is listed in there, that line will not be
+# removed regardless of what is discovered in the commit history. However, it
+# can't just be _anything_. The name or email still has to match something seen
+# in the commit history, so that we're able to undertand that its the same
+# contributor.
+#
+# The bulk of the work is in running `git log` to fetch commit author names and
+# emails. For each value, we generate a "slug" to use as an internal id for
+# that value, which is mostly just the lowercase of the value with whitespace
+# and punctuation removed. Two values with subtle differences can produce the
+# same slug, so at this point we also try to keep the "best" pre-slug value as
+# the display version. We use this slug to update two maps, one of email->name,
+# the other of name->email.
+#
+# Once collected, we then walk all the emails we've seen and get all the names
+# associated with every instance. Then for each of those names, we get all the
+# emails associated, and so on until we've seen all the connected names and
+# emails. This collection is every possible name and email for an individual
+# contributor.
+#
+# Finaly, we consider these groups, and select the "best" name and email for
+# the contributor, and add them to the author tables if they aren't there
+# already. Once we've done everyone, we write out a new AUTHORS file, and
+# that's the whole job.
+#
+# This is imperfect! Its necessary for the user to examine the diff and make
+# sure its sensible. If it hasn't hooked up right, it may necessary to adjust
+# the input data (via .mailmap) or improve the heuristics in this program. It
+# took a long time to get into good shape when first written (355 new names
+# added to AUTHORS!) but hopefully in the future we'll be running this
+# regularly so it doesn't fall so far behind.
+
+
+use 5.010;
+use warnings;
+use strict;
+
+# Storage for the "best looking" version of name or email, keyed on slug.
+my %display_name;
+my %display_email;
+
+# First, we load the existing AUTHORS file. We save everything before
+# CONTRIBUTORS: line as-is so we can write it back out to the new file. Then
+# we extract name,email pairs from the remainder and store them in a pair of
+# hashtables, keyed on slug.
+my %authors_name;
+my %authors_email;
+
+my @authors_header;
+
+for my $line (do { local (@ARGV) = ('AUTHORS'); <> }) {
+	chomp $line;
+	state $in_header = 1;
+	if ($in_header) {
+		push @authors_header, $line;
+		$in_header = 0 if $line =~ m/^CONTRIBUTORS:/;
+	} else {
+		my ($name, $email) = $line =~ m/^\s+(.+)(?= <) <([^>]+)/;
+		next unless $name;
+
+		my $semail = email_slug($email);
+		my $sname = name_slug($name);
+
+		$authors_name{$semail} = $sname;
+		$authors_email{$sname} = $semail;
+
+		# The name/email in AUTHORS is already the "best looking"
+		# version, by definition.
+		$display_name{$sname} = $name;
+		$display_email{$semail} = $email;
+	}
+}
+
+# Next, we load all the commit authors. and form name<->email mappings, keyed
+# on slug. Note that this format is getting the .mailmap-converted form. This
+# lets us control the input to some extent by making changes there.
+my %git_names;
+my %git_emails;
+
+for my $line (reverse qx(git log --pretty=tformat:'%aN:::%aE')) {
+	chomp $line;
+	my ($name, $email) = $line =~ m/^(.*):::(.*)/;
+	next unless $name && $email;
+
+	my $semail = email_slug($email);
+	my $sname = name_slug($name);
+
+	$git_names{$semail}{$sname} = 1;
+	$git_emails{$sname}{$semail} = 1;
+
+	# Update the "best looking" display value, but only if we don't already
+	# have something from the AUTHORS file. If we do, we must not change it.
+	if (!$authors_name{email_slug($email)}) {
+		update_display_email($email);
+	}
+
+	if (!$authors_email{name_slug($name)}) {
+		update_display_name($name);
+	}
+}
+
+# Now collect unique committers by all names+emails we've ever seen for them.
+# We start with emails and resolve all possible names, then we resolve the
+# emails for those names, and round and round until there's nothing left.
+my @committers;
+for my $start_email (sort keys %git_names) {
+	# it might have been deleted already through a cross-reference
+	next unless $git_names{$start_email};
+
+	my %emails;
+	my %names;
+
+	my @check_emails = ($start_email);
+	my @check_names;
+	while (@check_emails || @check_names) {
+		while (my $email = shift @check_emails) {
+			next if $emails{$email}++;
+			push @check_names,
+			    sort keys %{delete $git_names{$email}};
+		}
+		while (my $name = shift @check_names) {
+			next if $names{$name}++;
+			push @check_emails,
+			    sort keys %{delete $git_emails{$name}};
+		}
+	}
+
+	# A "committer" is the collection of connected names and emails.
+	push @committers, [[sort keys %emails], [sort keys %names]];
+}
+
+# Now we have our committers, we can work out what to add to AUTHORS.
+for my $committer (@committers) {
+	my ($emails, $names) = @$committer;
+
+	# If this commiter is already in AUTHORS, we must not touch.
+	next if grep { $authors_name{$_} } @$emails;
+	next if grep { $authors_email{$_} } @$names;
+
+	# Decide on the "best" name and email to use
+	my $email = best_email(@$emails);
+	my $name = best_name(@$names);
+
+	$authors_email{$name} = $email;
+	$authors_name{$email} = $name;
+}
+
+# Now output the new AUTHORS file
+open my $fh, '>', 'AUTHORS' or die "E: couldn't open AUTHORS for write: $!\n";
+#my $fh = \*STDOUT;
+say $fh join("\n", @authors_header, "");
+for my $name (sort keys %authors_email) {
+	my $cname = $display_name{$name};
+	my $cemail = $display_email{email_slug($authors_email{$name})};
+	say $fh "    $cname <$cemail>";
+}
+
+exit 0;
+
+# "Slugs" are used at the hashtable key for names and emails. They are used to
+# making two variants of a value be the "same" for matching. Mostly this is
+# to make upper and lower-case versions of a name or email compare the same,
+# but we do a little bit of munging to handle some common cases.
+#
+# Note that these are only used for matching internally; for display, the
+# slug will be used to look up the display form.
+sub name_slug {
+	my ($name) = @_;
+
+	# Remove spaces and dots, to handle differences in initials.
+	$name =~ s/[\s\.]//g;
+
+	return lc $name;
+}
+sub email_slug {
+	my ($email) = @_;
+
+	# Remove everything up to and including the first space, and the last
+	# space and everything after it.
+	$email =~ s/^(.*\s+)|(\s+.*)$//g;
+
+	# Remove the leading userid+ on Github noreply addresses. They're
+	# optional and we want to treat them as the same thing.
+	$email =~ s/^[^\+]*\+//g if $email =~ m/\.noreply\.github\.com$/;
+
+	return lc $email;
+}
+
+sub update_display_name {
+	my ($name) = @_;
+	my $sname = name_slug($name);
+
+	# For names, "more specific" means "has more non-lower-case characters"
+	# (in ASCII), guessing that if a person has gone to some effort to
+	# specialise their name in a later commit, they presumably care more
+	# about it. If this is wrong, its probably better to add a .mailmap
+	# entry.
+
+	my $cname = $display_name{$sname};
+	if (!$cname ||
+	    ($name =~ tr/a-z //) < ($cname =~ tr/a-z //)) {
+		$display_name{$sname} = $name;
+	}
+}
+sub update_display_email {
+	my ($email) = @_;
+	my $semail = email_slug($email);
+
+	# Like names, we prefer uppercase when possible. We also remove any
+	# leading "plus address" for Github noreply addresses.
+	$email =~ s/^[^\+]*\+//g if $email =~ m/\.noreply\.github\.com$/;
+
+	my $cemail = $display_email{$semail};
+	if (!$cemail ||
+	    ($email =~ tr/a-z //) < ($cemail =~ tr/a-z //)) {
+		$display_email{$semail} = $email;
+	}
+}
+
+sub best_name {
+	my @names = sort {
+		my $cmp;
+		my ($aa) = $display_name{$a};
+		my ($bb) = $display_name{$b};
+
+		# The "best" name is very subjective, and a simple sort
+		# produced good-enough results, so I didn't try harder. Use of
+		# accented characters, punctuation and caps are probably an
+		# indicator of "better", but possibly we should also take into
+		# account the most recent name we saw, in case the committer
+		# has changed their name or nickname or similar.
+		#
+		# Really, .mailmap is the place to control this.
+
+		return ($aa cmp $bb);
+	} @_;
+
+	return shift @names;
+}
+sub best_email {
+	state $internal_re = qr/\.(?:internal|local|\(none\))$/;
+	state $noreply_re  = qr/\.noreply\.github\.com$/;
+	state $freemail_re = qr/\@(?:gmail|hotmail)\.com$/;
+
+	my @emails = sort {
+		my $cmp;
+
+		# prefer address with a single @ over those without
+		$cmp = (($b =~ tr/@//) == 1) <=> (($a =~ tr/@//) == 1);
+		return $cmp unless $cmp == 0;
+
+		# prefer any address over internal/local addresses
+		$cmp = (($a =~ $internal_re) <=> ($b =~ $internal_re));
+		return $cmp unless $cmp == 0;
+
+		# prefer any address over github noreply aliases
+		$cmp = (($a =~ $noreply_re) <=> ($b =~ $noreply_re));
+		return $cmp unless $cmp == 0;
+
+		# prefer any address over freemail providers
+		$cmp = (($a =~ $freemail_re) <=> ($b =~ $freemail_re));
+		return $cmp unless $cmp == 0;
+
+		# alphabetical by domain
+		my ($alocal, $adom) = split /\@/, $a;
+		my ($blocal, $bdom) = split /\@/, $b;
+		$cmp = ($adom cmp $bdom);
+		return $cmp unless $cmp == 0;
+
+		# alphabetical by local part
+		return ($alocal cmp $blocal);
+	} @_;
+
+	return shift @emails;
+}
diff --git a/sys/contrib/subrepo-openzfs/tests/runfiles/common.run b/sys/contrib/subrepo-openzfs/tests/runfiles/common.run
index 229ef37d6c69..3a9f9159faa9 100644
--- a/sys/contrib/subrepo-openzfs/tests/runfiles/common.run
+++ b/sys/contrib/subrepo-openzfs/tests/runfiles/common.run
@@ -281,7 +281,7 @@ tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos',
     'user_property_004_pos', 'version_001_neg', 'zfs_set_001_neg',
     'zfs_set_002_neg', 'zfs_set_003_neg', 'property_alias_001_pos',
     'mountpoint_003_pos', 'ro_props_001_pos', 'zfs_set_keylocation',
-    'zfs_set_feature_activation']
+    'zfs_set_feature_activation', 'zfs_set_nomount']
 tags = ['functional', 'cli_root', 'zfs_set']
 
 [tests/functional/cli_root/zfs_share]
diff --git a/sys/contrib/subrepo-openzfs/tests/runfiles/linux.run b/sys/contrib/subrepo-openzfs/tests/runfiles/linux.run
index 2c8d5cb0ecbb..2252e46df3a8 100644
--- a/sys/contrib/subrepo-openzfs/tests/runfiles/linux.run
+++ b/sys/contrib/subrepo-openzfs/tests/runfiles/linux.run
@@ -82,6 +82,13 @@ tests = ['zpool_expand_001_pos', 'zpool_expand_002_pos',
     'zpool_expand_003_neg', 'zpool_expand_004_pos', 'zpool_expand_005_pos']
 tags = ['functional', 'cli_root', 'zpool_expand']
 
+[tests/functional/cli_root/zpool_import:Linux]
+tests = ['zpool_import_hostid_changed',
+    'zpool_import_hostid_changed_unclean_export',
+    'zpool_import_hostid_changed_cachefile',
+    'zpool_import_hostid_changed_cachefile_unclean_export']
+tags = ['functional', 'cli_root', 'zpool_import']
+
 [tests/functional/cli_root/zpool_reopen:Linux]
 tests = ['zpool_reopen_001_pos', 'zpool_reopen_002_pos',
     'zpool_reopen_003_pos', 'zpool_reopen_004_pos', 'zpool_reopen_005_pos',
diff --git a/sys/contrib/subrepo-openzfs/tests/runfiles/sanity.run b/sys/contrib/subrepo-openzfs/tests/runfiles/sanity.run
index 6cd28f2c09c6..428a8a3941bd 100644
--- a/sys/contrib/subrepo-openzfs/tests/runfiles/sanity.run
+++ b/sys/contrib/subrepo-openzfs/tests/runfiles/sanity.run
@@ -212,7 +212,7 @@ tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos',
     'user_property_001_pos', 'user_property_003_neg', 'readonly_001_pos',
     'user_property_004_pos', 'version_001_neg',
     'zfs_set_003_neg', 'property_alias_001_pos',
-    'zfs_set_keylocation', 'zfs_set_feature_activation']
+    'zfs_set_keylocation', 'zfs_set_feature_activation', 'zfs_set_nomount']
 tags = ['functional', 'cli_root', 'zfs_set']
 
 [tests/functional/cli_root/zfs_snapshot]
diff --git a/sys/contrib/subrepo-openzfs/tests/test-runner/bin/zts-report.py.in b/sys/contrib/subrepo-openzfs/tests/test-runner/bin/zts-report.py.in
index 558e4b57279d..5d1360380de5 100755
--- a/sys/contrib/subrepo-openzfs/tests/test-runner/bin/zts-report.py.in
+++ b/sys/contrib/subrepo-openzfs/tests/test-runner/bin/zts-report.py.in
@@ -262,7 +262,6 @@ if sys.platform.startswith('freebsd'):
         'cli_root/zfs_inherit/zfs_inherit_001_neg': ['FAIL', known_reason],
         'cli_root/zpool_import/zpool_import_012_pos': ['FAIL', known_reason],
         'delegate/zfs_allow_003_pos': ['FAIL', known_reason],
-        'delegate/zfs_allow_010_pos': ['FAIL', known_reason],
         'inheritance/inherit_001_pos': ['FAIL', 11829],
         'resilver/resilver_restart_001': ['FAIL', known_reason],
         'pool_checkpoint/checkpoint_big_rewind': ['FAIL', 12622],
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/include/tunables.cfg b/sys/contrib/subrepo-openzfs/tests/zfs-tests/include/tunables.cfg
index 80e7bcb3bd09..8010a9451597 100644
--- a/sys/contrib/subrepo-openzfs/tests/zfs-tests/include/tunables.cfg
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/include/tunables.cfg
@@ -89,7 +89,7 @@ VDEV_VALIDATE_SKIP		vdev.validate_skip		vdev_validate_skip
 VOL_INHIBIT_DEV			UNSUPPORTED			zvol_inhibit_dev
 VOL_MODE			vol.mode			zvol_volmode
 VOL_RECURSIVE			vol.recursive			UNSUPPORTED
-VOL_USE_BLK_MQ			UNSUPPORTED			zvol_use_blk_mq
+VOL_USE_BLK_MQ			UNSUPPORTED			UNSUPPORTED
 XATTR_COMPAT			xattr_compat			zfs_xattr_compat
 ZEVENT_LEN_MAX			zevent.len_max			zfs_zevent_len_max
 ZEVENT_RETAIN_MAX		zevent.retain_max		zfs_zevent_retain_max
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/Makefile.am b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/Makefile.am
index 70ebb818a9b1..49462c8bc4bf 100644
--- a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/Makefile.am
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/Makefile.am
@@ -942,6 +942,7 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
 	functional/cli_root/zfs_set/zfs_set_003_neg.ksh \
 	functional/cli_root/zfs_set/zfs_set_feature_activation.ksh \
 	functional/cli_root/zfs_set/zfs_set_keylocation.ksh \
+	functional/cli_root/zfs_set/zfs_set_nomount.ksh \
 	functional/cli_root/zfs_share/cleanup.ksh \
 	functional/cli_root/zfs_share/setup.ksh \
 	functional/cli_root/zfs_share/zfs_share_001_pos.ksh \
@@ -1175,6 +1176,10 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
 	functional/cli_root/zpool_import/zpool_import_features_001_pos.ksh \
 	functional/cli_root/zpool_import/zpool_import_features_002_neg.ksh \
 	functional/cli_root/zpool_import/zpool_import_features_003_pos.ksh \
+	functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh \
+	functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh \
+	functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh \
+	functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh \
 	functional/cli_root/zpool_import/zpool_import_missing_001_pos.ksh \
 	functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh \
 	functional/cli_root/zpool_import/zpool_import_missing_003_pos.ksh \
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh
index 2cd2f4763a73..e52b34ec8a51 100755
--- a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh
@@ -52,6 +52,8 @@ log_must set_tunable64 TXG_TIMEOUT 5000
 
 log_must zpool create -o feature@block_cloning=enabled $TESTPOOL $DISKS
 
+log_must sync_pool $TESTPOOL true
+
 log_must dd if=/dev/urandom of=/$TESTPOOL/file bs=128K count=4
 log_must clonefile -f /$TESTPOOL/file /$TESTPOOL/clone 0 0 524288
 
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_nomount.ksh b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_nomount.ksh
new file mode 100755
index 000000000000..ebf08711423c
--- /dev/null
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_nomount.ksh
@@ -0,0 +1,103 @@
+#!/bin/ksh -p
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or https://opensource.org/licenses/CDDL-1.0.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2023 by iXsystems, Inc. All rights reserved.
+#
+
+. $STF_SUITE/include/libtest.shlib
+. $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
+
+#
+# DESCRIPTION:
+# 'zfs set -u' should update the mountpoint, sharenfs and sharesmb
+# properties without mounting and sharing the dataset. Validate the
+# bevaior while dataset is mounted and unmounted.
+#
+# STRATEGY:
+# 1. Confirm dataset is currently mounted
+# 2. Update the mountpoint with -u flag
+# 3. Confirm mountpoint property is updated with new value
+# 4. Confirm dataset is still mounted at previous mountpoint
+# 5. Unmount the dataset
+# 6. Confirm dataset is unmounted
+# 7. Mount the dataset
+# 8. Confirm dataset is mounted at new mountpoint, that was set with -u flag.
+# 9. Update and mount the dataset at previous mountpoint.
+# 10. Unmount the dataset
+# 11. Update mountpoint property with zfs set -u
+# 12. Confirm dataset is not mounted
+# 13. Update sharenfs property with zfs set -u
+# 14. Confirm dataset is not mounted
+# 15. Update sharesmb property with zfs set -u
+# 16. Confirm dataset is not mounted
+# 17. Mount the dataset and confirm dataset is mounted at new mountpoint
+#
+
+verify_runnable "both"
+
+function cleanup
+{
+	log_must zfs set sharenfs=off $TESTPOOL/$TESTFS
+	if is_linux; then
+		log_must zfs set sharesmb=off $TESTPOOL/$TESTFS
+	fi
+	rm -r $newmpt
+}
+
+log_assert "'zfs set -u' sets the mountpoint and share properties without " \
+	"mounting the dataset"
+log_onexit cleanup
+
+oldmpt=$(get_prop mountpoint $TESTPOOL/$TESTFS)
+newmpt=$TEST_BASE_DIR/abc
+
+# Test while dataset is mounted
+log_must ismounted $TESTPOOL/$TESTFS
+log_must zfs set -u mountpoint=$newmpt $TESTPOOL/$TESTFS
+log_must check_user_prop $TESTPOOL/$TESTFS mountpoint $newmpt
+log_must eval "[[ "$(mount | grep $TESTPOOL/$TESTFS | awk '{print $3}')" == $oldmpt ]]"
+log_must zfs unmount $TESTPOOL/$TESTFS
+log_mustnot ismounted $TESTPOOL/$TESTFS
+log_must zfs mount $TESTPOOL/$TESTFS
+log_must eval "[[ "$(mount | grep $TESTPOOL/$TESTFS | awk '{print $3}')" == $newmpt ]]"
+
+# Test while dataset is unmounted
+log_must zfs set mountpoint=$oldmpt $TESTPOOL/$TESTFS
+log_must ismounted $TESTPOOL/$TESTFS
+log_must zfs unmount $TESTPOOL/$TESTFS
+log_must zfs set -u mountpoint=$newmpt $TESTPOOL/$TESTFS
+log_mustnot ismounted $TESTPOOL/$TESTFS
+log_must zfs set -u sharenfs=on $TESTPOOL/$TESTFS
+log_mustnot ismounted $TESTPOOL/$TESTFS
+if is_linux; then
+	log_must zfs set -u sharesmb=on $TESTPOOL/$TESTFS
+	log_mustnot ismounted $TESTPOOL/$TESTFS
+fi
+log_must zfs mount $TESTPOOL/$TESTFS
+log_must check_user_prop $TESTPOOL/$TESTFS mountpoint $newmpt
+log_must eval "[[ "$(mount | grep $TESTPOOL/$TESTFS | awk '{print $3}')" == $newmpt ]]"
+
+log_must zfs set mountpoint=$oldmpt $TESTPOOL/$TESTFS
+log_must ismounted $TESTPOOL/$TESTFS
+
+log_pass "'zfs set -u' functions correctly"
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_concurrent_shares.ksh b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_concurrent_shares.ksh
index c226f56e3dcb..d779689f83bd 100755
--- a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_concurrent_shares.ksh
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_concurrent_shares.ksh
@@ -98,11 +98,26 @@ function test_share # filesystem
 
 	zfs set sharenfs=on $filesystem || \
 	    sub_fail "zfs set sharenfs=on $filesystem failed."
-	is_shared $mntp || \
-	    sub_fail "File system $filesystem is not shared (set sharenfs)."
 
 	#
-	# Verify 'zfs share' works as well.
+	# Verify 'zfs share' results in a shared mount.  We check this
+	# multiple times because of Fedora 37+ it's been observed in
+	# the CI that the share may not be immediately reported.
+	#
+	for retry in $(seq 1 10); do
+		is_shared $mntp && break
+
+		log_note "Wait $retry / 10 for is_shared $mntp (set sharenfs)"
+
+		if [[ $retry -eq 10 ]]; then
+			sub_fail "File system $filesystem is not shared (set sharenfs)."
+		fi
+
+		sleep 1
+	done
+
+	#
+	# Verify 'zfs unshare' works as well.
 	#
 	zfs unshare $filesystem || \
 	    sub_fail "zfs unshare $filesystem failed."
@@ -112,9 +127,23 @@ function test_share # filesystem
 
 	zfs share $filesystem || \
 	    sub_fail "zfs share $filesystem failed."
-	is_shared $mntp || \
-	    sub_fail "file system $filesystem is not shared (zfs share)."
 
+	#
+	# Verify 'zfs share' results in a shared mount.  We check this
+	# multiple times because of Fedora 37+ it's been observed in
+	# the CI that the share may not be immediately reported.
+	#
+	for retry in $(seq 1 10); do
+		is_shared $mntp && break
+
+		log_note "Wait $retry / 10 for is_shared $mntp (zfs share)"
+
+		if [[ $retry -eq 10 ]]; then
+			sub_fail "File system $filesystem is not shared (zfs share)."
+		fi
+
+		sleep 1
+	done
 
 	#log_note "Sharing a shared file system fails."
 	zfs share $filesystem && \
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.cfg b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.cfg
index 4a9fb5e7489a..cf9c6a8499af 100644
--- a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.cfg
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.cfg
@@ -26,6 +26,7 @@
 
 #
 # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -63,3 +64,7 @@ export VDEV4=$DEVICE_DIR/${DEVICE_FILE}4
 export VDEV5=$DEVICE_DIR/${DEVICE_FILE}5
 
 export ALTER_ROOT=/alter_import-test
+
+export HOSTID_FILE="/etc/hostid"
+export HOSTID1=01234567
+export HOSTID2=89abcdef
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib
index 559810ff0e30..50157fa80578 100644
--- a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib
@@ -11,6 +11,7 @@
 
 #
 # Copyright (c) 2016 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
 #
 
 . $STF_SUITE/include/libtest.shlib
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh
new file mode 100755
index 000000000000..bc82b7cc1ee8
--- /dev/null
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh
@@ -0,0 +1,59 @@
+#!/bin/ksh -p
+
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2021 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
+#
+
+. $STF_SUITE/tests/functional/cli_root/zpool_import/zpool_import.kshlib
+
+#
+# DESCRIPTION:
+# A pool that was cleanly exported should be importable without force even if
+# the local hostid doesn't match the on-disk hostid.
+#
+# STRATEGY:
+#	1. Set a hostid.
+#	2. Create a pool.
+#	3. Export the pool.
+#	4. Change the hostid.
+#	5. Verify that importing the pool without force succeeds.
+#
+
+verify_runnable "global"
+
+function custom_cleanup
+{
+	rm -f $HOSTID_FILE
+	cleanup
+}
+
+log_onexit custom_cleanup
+
+# 1. Set a hostid.
+log_must zgenhostid -f $HOSTID1
+
+# 2. Create a pool.
+log_must zpool create $TESTPOOL1 $VDEV0
+
+# 3. Export the pool.
+log_must zpool export $TESTPOOL1
+
+# 4. Change the hostid.
+log_must zgenhostid -f $HOSTID2
+
+# 5. Verify that importing the pool without force succeeds.
+log_must zpool import -d $DEVICE_DIR $TESTPOOL1
+
+log_pass "zpool import can import cleanly exported pool when hostid changes."
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh
new file mode 100755
index 000000000000..07c43482d68f
--- /dev/null
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh
@@ -0,0 +1,65 @@
+#!/bin/ksh -p
+
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2021 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
+#
+
+. $STF_SUITE/tests/functional/cli_root/zpool_import/zpool_import.kshlib
+
+#
+# DESCRIPTION:
+# A pool that was cleanly exported should be importable from a cachefile
+# without force even if the local hostid doesn't match the on-disk hostid.
+#
+# STRATEGY:
+#	1. Set a hostid.
+#	2. Create a pool with a cachefile.
+#	3. Backup the cachfile.
+#	4. Export the pool.
+#	5. Change the hostid.
+#	6. Verify that importing the pool from the cachefile succeeds
+#	   without force.
+#
+
+verify_runnable "global"
+
+function custom_cleanup
+{
+	rm -f $HOSTID_FILE $CPATH $CPATHBKP
+	cleanup
+}
+
+log_onexit custom_cleanup
+
+# 1. Set a hostid.
+log_must zgenhostid -f $HOSTID1
+
+# 2. Create a pool.
+log_must zpool create -o cachefile=$CPATH $TESTPOOL1 $VDEV0
+
+# 3. Backup the cachfile.
+log_must cp $CPATH $CPATHBKP
+
+# 4. Export the pool.
+log_must zpool export $TESTPOOL1
+
+# 5. Change the hostid.
+log_must zgenhostid -f $HOSTID2
+
+# 6. Verify that importing the pool from the cachefile succeeds without force.
+log_must zpool import -c $CPATHBKP $TESTPOOL1
+
+log_pass "zpool import can import cleanly exported pool from cachefile " \
+  "when hostid changes."
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh
new file mode 100755
index 000000000000..dcb1ac1ab69f
--- /dev/null
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh
@@ -0,0 +1,75 @@
+#!/bin/ksh -p
+
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2021 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
+#
+
+. $STF_SUITE/tests/functional/cli_root/zpool_import/zpool_import.kshlib
+
+#
+# DESCRIPTION:
+# A pool that wasn't cleanly exported should not be importable from a cachefile
+# without force if the local hostid doesn't match the on-disk hostid.
+#
+# STRATEGY:
+#	1. Set a hostid.
+#	2. Create a pool.
+#	3. Backup the cachefile.
+#	4. Simulate the pool being torn down without export:
+#	4.1. Copy the underlying device state.
+#	4.2. Export the pool.
+#	4.3. Restore the device state from the copy.
+#	5. Change the hostid.
+#	6. Verify that importing the pool from the cachefile fails.
+#	7. Verify that importing the pool from the cachefile with force
+#	   succeeds.
+#
+
+verify_runnable "global"
+
+function custom_cleanup
+{
+	rm -f $HOSTID_FILE $CPATH $CPATHBKP $VDEV0.bak
+	cleanup
+}
+
+log_onexit custom_cleanup
+
+# 1. Set a hostid.
+log_must zgenhostid -f $HOSTID1
+
+# 2. Create a pool.
+log_must zpool create -o cachefile=$CPATH $TESTPOOL1 $VDEV0
+
+# 3. Backup the cachfile.
+log_must cp $CPATH $CPATHBKP
+
+# 4. Simulate the pool being torn down without export.
+log_must cp $VDEV0 $VDEV0.bak
+log_must zpool export $TESTPOOL1
+log_must cp -f $VDEV0.bak $VDEV0
+log_must rm -f $VDEV0.bak
+
+# 5. Change the hostid.
+log_must zgenhostid -f $HOSTID2
+
+# 6. Verify that importing the pool from the cachefile fails.
+log_mustnot zpool import -c $CPATHBKP $TESTPOOL1
+
+# 7. Verify that importing the pool from the cachefile with force succeeds.
+log_must zpool import -f -c $CPATHBKP $TESTPOOL1
+
+log_pass "zpool import from cachefile requires force if not cleanly " \
+    "exported and hostid changes."
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh
new file mode 100755
index 000000000000..ad8cca642dbc
--- /dev/null
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh
@@ -0,0 +1,70 @@
+#!/bin/ksh -p
+
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2021 by Delphix. All rights reserved.
+# Copyright (c) 2023 by Klara, Inc.
+#
+
+. $STF_SUITE/tests/functional/cli_root/zpool_import/zpool_import.kshlib
+
+#
+# DESCRIPTION:
+# A pool that wasn't cleanly exported should not be importable without force if
+# the local hostid doesn't match the on-disk hostid.
+#
+# STRATEGY:
+#	1. Set a hostid.
+#	2. Create a pool.
+#	3. Simulate the pool being torn down without export:
+#	3.1. Copy the underlying device state.
+#	3.2. Export the pool.
+#	3.3. Restore the device state from the copy.
+#	4. Change the hostid.
+#	5. Verify that importing the pool fails.
+#	6. Verify that importing the pool with force succeeds.
+#
+
+verify_runnable "global"
+
+function custom_cleanup
+{
+	rm -f $HOSTID_FILE $VDEV0.bak
+	cleanup
+}
+
+log_onexit custom_cleanup
+
+# 1. Set a hostid.
+log_must zgenhostid -f $HOSTID1
+
+# 2. Create a pool.
+log_must zpool create $TESTPOOL1 $VDEV0
+
+# 3. Simulate the pool being torn down without export.
+log_must cp $VDEV0 $VDEV0.bak
+log_must zpool export $TESTPOOL1
+log_must cp -f $VDEV0.bak $VDEV0
+log_must rm -f $VDEV0.bak
+
+# 4. Change the hostid.
+log_must zgenhostid -f $HOSTID2
+
+# 5. Verify that importing the pool fails.
+log_mustnot zpool import -d $DEVICE_DIR $TESTPOOL1
+
+# 6. Verify that importing the pool with force succeeds.
+log_must zpool import -d $DEVICE_DIR -f $TESTPOOL1
+
+log_pass "zpool import requires force if not cleanly exported " \
+    "and hostid changed."
diff --git a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
index 3f2f089e8171..5ddb6ca2ddc8 100644
--- a/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
+++ b/sys/contrib/subrepo-openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
@@ -861,7 +861,7 @@ function verify_fs_mount
 	fi
 
 	if ! ismounted $fs ; then
-		log_must zfs set mountpoint=$newmntpt $fs
+		log_must zfs set -u mountpoint=$newmntpt $fs
 		log_must rm -rf $newmntpt
 		log_must mkdir $newmntpt
 
@@ -878,7 +878,7 @@ function verify_fs_mount
 		fi
 		log_must zfs umount $fs
 		log_must rm -rf $newmntpt
-		log_must zfs set mountpoint=$mntpt $fs
+		log_must zfs set -u mountpoint=$mntpt $fs
 	fi
 
 	return 0
diff --git a/sys/crypto/openssl/aarch64/aes-gcm-armv8_64.S b/sys/crypto/openssl/aarch64/aes-gcm-armv8_64.S
index eb85dbc9f996..55856548fa6f 100644
--- a/sys/crypto/openssl/aarch64/aes-gcm-armv8_64.S
+++ b/sys/crypto/openssl/aarch64/aes-gcm-armv8_64.S
@@ -8,6 +8,7 @@
 .type	aes_gcm_enc_128_kernel,%function
 .align	4
 aes_gcm_enc_128_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz	x1, .L128_enc_ret
 	stp	x19, x20, [sp, #-112]!
 	mov	x16, x4
@@ -990,6 +991,7 @@ aes_gcm_enc_128_kernel:
 .type	aes_gcm_dec_128_kernel,%function
 .align	4
 aes_gcm_dec_128_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz	x1, .L128_dec_ret
 	stp	x19, x20, [sp, #-112]!
 	mov	x16, x4
@@ -1982,6 +1984,7 @@ aes_gcm_dec_128_kernel:
 .type	aes_gcm_enc_192_kernel,%function
 .align	4
 aes_gcm_enc_192_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz	x1, .L192_enc_ret
 	stp	x19, x20, [sp, #-112]!
 	mov	x16, x4
@@ -3039,6 +3042,7 @@ aes_gcm_enc_192_kernel:
 .type	aes_gcm_dec_192_kernel,%function
 .align	4
 aes_gcm_dec_192_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz	x1, .L192_dec_ret
 	stp	x19, x20, [sp, #-112]!
 	mov	x16, x4
@@ -4106,6 +4110,7 @@ aes_gcm_dec_192_kernel:
 .type	aes_gcm_enc_256_kernel,%function
 .align	4
 aes_gcm_enc_256_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz	x1, .L256_enc_ret
 	stp	x19, x20, [sp, #-112]!
 	mov	x16, x4
@@ -5230,6 +5235,7 @@ aes_gcm_enc_256_kernel:
 .type	aes_gcm_dec_256_kernel,%function
 .align	4
 aes_gcm_dec_256_kernel:
+	AARCH64_VALID_CALL_TARGET
 	cbz	x1, .L256_dec_ret
 	stp	x19, x20, [sp, #-112]!
 	mov	x16, x4
diff --git a/sys/crypto/openssl/aarch64/aesv8-armx.S b/sys/crypto/openssl/aarch64/aesv8-armx.S
index d92a1d60c65c..6c6dd095fb84 100644
--- a/sys/crypto/openssl/aarch64/aesv8-armx.S
+++ b/sys/crypto/openssl/aarch64/aesv8-armx.S
@@ -15,6 +15,8 @@
 .align	5
 aes_v8_set_encrypt_key:
 .Lenc_key:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	mov	x3,#-1
@@ -186,7 +188,7 @@ aes_v8_set_encrypt_key:
 .type	aes_v8_set_decrypt_key,%function
 .align	5
 aes_v8_set_decrypt_key:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	bl	.Lenc_key
@@ -220,13 +222,14 @@ aes_v8_set_decrypt_key:
 	eor	x0,x0,x0		// return value
 .Ldec_key_abort:
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	aes_v8_set_decrypt_key,.-aes_v8_set_decrypt_key
 .globl	aes_v8_encrypt
 .type	aes_v8_encrypt,%function
 .align	5
 aes_v8_encrypt:
+	AARCH64_VALID_CALL_TARGET
 	ldr	w3,[x2,#240]
 	ld1	{v0.4s},[x2],#16
 	ld1	{v2.16b},[x0]
@@ -256,6 +259,7 @@ aes_v8_encrypt:
 .type	aes_v8_decrypt,%function
 .align	5
 aes_v8_decrypt:
+	AARCH64_VALID_CALL_TARGET
 	ldr	w3,[x2,#240]
 	ld1	{v0.4s},[x2],#16
 	ld1	{v2.16b},[x0]
@@ -285,6 +289,7 @@ aes_v8_decrypt:
 .type	aes_v8_ecb_encrypt,%function
 .align	5
 aes_v8_ecb_encrypt:
+	AARCH64_VALID_CALL_TARGET
 	subs	x2,x2,#16
 	// Original input data size bigger than 16, jump to big size processing.
 	b.ne	.Lecb_big_size
@@ -1031,6 +1036,8 @@ aes_v8_ecb_encrypt:
 .type	aes_v8_cbc_encrypt,%function
 .align	5
 aes_v8_cbc_encrypt:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	subs	x2,x2,#16
@@ -1506,6 +1513,8 @@ aes_v8_cbc_encrypt:
 .type	aes_v8_ctr32_encrypt_blocks,%function
 .align	5
 aes_v8_ctr32_encrypt_blocks:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	ldr	w5,[x3,#240]
@@ -1855,6 +1864,7 @@ aes_v8_ctr32_encrypt_blocks:
 .type	aes_v8_xts_encrypt,%function
 .align	5
 aes_v8_xts_encrypt:
+	AARCH64_VALID_CALL_TARGET
 	cmp	x2,#16
 	// Original input data size bigger than 16, jump to big size processing.
 	b.ne	.Lxts_enc_big_size
@@ -2496,6 +2506,7 @@ aes_v8_xts_encrypt:
 .type	aes_v8_xts_decrypt,%function
 .align	5
 aes_v8_xts_decrypt:
+	AARCH64_VALID_CALL_TARGET
 	cmp	x2,#16
 	// Original input data size bigger than 16, jump to big size processing.
 	b.ne	.Lxts_dec_big_size
diff --git a/sys/crypto/openssl/aarch64/arm64cpuid.S b/sys/crypto/openssl/aarch64/arm64cpuid.S
index 5ee467c7f129..52c6ee5b65d3 100644
--- a/sys/crypto/openssl/aarch64/arm64cpuid.S
+++ b/sys/crypto/openssl/aarch64/arm64cpuid.S
@@ -8,6 +8,7 @@
 .globl	_armv7_neon_probe
 .type	_armv7_neon_probe,%function
 _armv7_neon_probe:
+	AARCH64_VALID_CALL_TARGET
 	orr	v15.16b, v15.16b, v15.16b
 	ret
 .size	_armv7_neon_probe,.-_armv7_neon_probe
@@ -15,6 +16,7 @@ _armv7_neon_probe:
 .globl	_armv7_tick
 .type	_armv7_tick,%function
 _armv7_tick:
+	AARCH64_VALID_CALL_TARGET
 #ifdef	__APPLE__
 	mrs	x0, CNTPCT_EL0
 #else
@@ -26,6 +28,7 @@ _armv7_tick:
 .globl	_armv8_aes_probe
 .type	_armv8_aes_probe,%function
 _armv8_aes_probe:
+	AARCH64_VALID_CALL_TARGET
 	aese	v0.16b, v0.16b
 	ret
 .size	_armv8_aes_probe,.-_armv8_aes_probe
@@ -33,6 +36,7 @@ _armv8_aes_probe:
 .globl	_armv8_sha1_probe
 .type	_armv8_sha1_probe,%function
 _armv8_sha1_probe:
+	AARCH64_VALID_CALL_TARGET
 	sha1h	s0, s0
 	ret
 .size	_armv8_sha1_probe,.-_armv8_sha1_probe
@@ -40,6 +44,7 @@ _armv8_sha1_probe:
 .globl	_armv8_sha256_probe
 .type	_armv8_sha256_probe,%function
 _armv8_sha256_probe:
+	AARCH64_VALID_CALL_TARGET
 	sha256su0	v0.4s, v0.4s
 	ret
 .size	_armv8_sha256_probe,.-_armv8_sha256_probe
@@ -47,6 +52,7 @@ _armv8_sha256_probe:
 .globl	_armv8_pmull_probe
 .type	_armv8_pmull_probe,%function
 _armv8_pmull_probe:
+	AARCH64_VALID_CALL_TARGET
 	pmull	v0.1q, v0.1d, v0.1d
 	ret
 .size	_armv8_pmull_probe,.-_armv8_pmull_probe
@@ -54,6 +60,7 @@ _armv8_pmull_probe:
 .globl	_armv8_sha512_probe
 .type	_armv8_sha512_probe,%function
 _armv8_sha512_probe:
+	AARCH64_VALID_CALL_TARGET
 .long	0xcec08000	// sha512su0	v0.2d,v0.2d
 	ret
 .size	_armv8_sha512_probe,.-_armv8_sha512_probe
@@ -61,6 +68,7 @@ _armv8_sha512_probe:
 .globl	_armv8_cpuid_probe
 .type	_armv8_cpuid_probe,%function
 _armv8_cpuid_probe:
+	AARCH64_VALID_CALL_TARGET
 	mrs	x0, midr_el1
 	ret
 .size	_armv8_cpuid_probe,.-_armv8_cpuid_probe
@@ -69,6 +77,7 @@ _armv8_cpuid_probe:
 .type	OPENSSL_cleanse,%function
 .align	5
 OPENSSL_cleanse:
+	AARCH64_VALID_CALL_TARGET
 	cbz	x1,.Lret	// len==0?
 	cmp	x1,#15
 	b.hi	.Lot		// len>15
@@ -100,6 +109,7 @@ OPENSSL_cleanse:
 .type	CRYPTO_memcmp,%function
 .align	4
 CRYPTO_memcmp:
+	AARCH64_VALID_CALL_TARGET
 	eor	w3,w3,w3
 	cbz	x2,.Lno_data	// len==0?
 	cmp	x2,#16
diff --git a/sys/crypto/openssl/aarch64/arm_arch.h b/sys/crypto/openssl/aarch64/arm_arch.h
index 45d7e1556475..a815a5c72b7f 100644
--- a/sys/crypto/openssl/aarch64/arm_arch.h
+++ b/sys/crypto/openssl/aarch64/arm_arch.h
@@ -126,4 +126,62 @@ extern unsigned int OPENSSL_armv8_rsa_neonized;
 
 # define MIDR_IS_CPU_MODEL(midr, imp, partnum) \
            (((midr) & MIDR_CPU_MODEL_MASK) == MIDR_CPU_MODEL(imp, partnum))
+
+#if defined(__ASSEMBLER__)
+
+   /*
+    * Support macros for
+    *   - Armv8.3-A Pointer Authentication and
+    *   - Armv8.5-A Branch Target Identification
+    * features which require emitting a .note.gnu.property section with the
+    * appropriate architecture-dependent feature bits set.
+    * Read more: "ELF for the Arm® 64-bit Architecture"
+    */
+
+#  if defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1
+#   define GNU_PROPERTY_AARCH64_BTI (1 << 0)   /* Has Branch Target Identification */
+#   define AARCH64_VALID_CALL_TARGET hint #34  /* BTI 'c' */
+#  else
+#   define GNU_PROPERTY_AARCH64_BTI 0  /* No Branch Target Identification */
+#   define AARCH64_VALID_CALL_TARGET
+#  endif
+
+#  if defined(__ARM_FEATURE_PAC_DEFAULT) && \
+       (__ARM_FEATURE_PAC_DEFAULT & 1) == 1  /* Signed with A-key */
+#   define GNU_PROPERTY_AARCH64_POINTER_AUTH \
+     (1 << 1)                                       /* Has Pointer Authentication */
+#   define AARCH64_SIGN_LINK_REGISTER hint #25      /* PACIASP */
+#   define AARCH64_VALIDATE_LINK_REGISTER hint #29  /* AUTIASP */
+#  elif defined(__ARM_FEATURE_PAC_DEFAULT) && \
+       (__ARM_FEATURE_PAC_DEFAULT & 2) == 2  /* Signed with B-key */
+#   define GNU_PROPERTY_AARCH64_POINTER_AUTH \
+     (1 << 1)                                       /* Has Pointer Authentication */
+#   define AARCH64_SIGN_LINK_REGISTER hint #27      /* PACIBSP */
+#   define AARCH64_VALIDATE_LINK_REGISTER hint #31  /* AUTIBSP */
+#  else
+#   define GNU_PROPERTY_AARCH64_POINTER_AUTH 0  /* No Pointer Authentication */
+#   if GNU_PROPERTY_AARCH64_BTI != 0
+#    define AARCH64_SIGN_LINK_REGISTER AARCH64_VALID_CALL_TARGET
+#   else
+#    define AARCH64_SIGN_LINK_REGISTER
+#   endif
+#   define AARCH64_VALIDATE_LINK_REGISTER
+#  endif
+
+#  if GNU_PROPERTY_AARCH64_POINTER_AUTH != 0 || GNU_PROPERTY_AARCH64_BTI != 0
+    .pushsection .note.gnu.property, "a";
+    .balign 8;
+    .long 4;
+    .long 0x10;
+    .long 0x5;
+    .asciz "GNU";
+    .long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
+    .long 4;
+    .long (GNU_PROPERTY_AARCH64_POINTER_AUTH | GNU_PROPERTY_AARCH64_BTI);
+    .long 0;
+    .popsection;
+#  endif
+
+# endif  /* defined __ASSEMBLER__ */
+
 #endif
diff --git a/sys/crypto/openssl/aarch64/armv8-mont.S b/sys/crypto/openssl/aarch64/armv8-mont.S
index 4bdba95f80f8..8b85fb080aba 100644
--- a/sys/crypto/openssl/aarch64/armv8-mont.S
+++ b/sys/crypto/openssl/aarch64/armv8-mont.S
@@ -1,6 +1,6 @@
 /* Do not modify. This file is auto-generated from armv8-mont.pl. */
+#include "arm_arch.h"
 #ifndef	__KERNEL__
-# include "arm_arch.h"
 
 .hidden	OPENSSL_armv8_rsa_neonized
 #endif
@@ -10,6 +10,7 @@
 .type	bn_mul_mont,%function
 .align	5
 bn_mul_mont:
+	AARCH64_SIGN_LINK_REGISTER
 .Lbn_mul_mont:
 	tst	x5,#3
 	b.ne	.Lmul_mont
@@ -220,11 +221,14 @@ bn_mul_mont:
 	mov	x0,#1
 	ldp	x23,x24,[x29,#48]
 	ldr	x29,[sp],#64
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	bn_mul_mont,.-bn_mul_mont
 .type	bn_mul8x_mont_neon,%function
 .align	5
 bn_mul8x_mont_neon:
+	// Not adding AARCH64_SIGN_LINK_REGISTER here because bn_mul8x_mont_neon is jumped to
+	// only from bn_mul_mont which has already signed the return address.
 	stp	x29,x30,[sp,#-80]!
 	mov	x16,sp
 	stp	d8,d9,[sp,#16]
@@ -917,6 +921,7 @@ bn_mul8x_mont_neon:
 	ldp	d10,d11,[sp,#32]
 	ldp	d8,d9,[sp,#16]
 	ldr	x29,[sp],#80
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret	// bx lr
 
 .size	bn_mul8x_mont_neon,.-bn_mul8x_mont_neon
@@ -926,7 +931,8 @@ __bn_sqr8x_mont:
 	cmp	x1,x2
 	b.ne	__bn_mul4x_mont
 .Lsqr8x_mont:
-.inst	0xd503233f		// paciasp
+	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_sqr8x_mont is jumped to
+	// only from bn_mul_mont which has already signed the return address.
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -1677,13 +1683,15 @@ __bn_sqr8x_mont:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
-.inst	0xd50323bf		// autiasp
+	// x30 is loaded earlier
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	__bn_sqr8x_mont,.-__bn_sqr8x_mont
 .type	__bn_mul4x_mont,%function
 .align	5
 __bn_mul4x_mont:
-.inst	0xd503233f		// paciasp
+	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_mul4x_mont is jumped to
+	// only from bn_mul_mont (or __bn_sqr8x_mont from bn_mul_mont) which has already signed the return address.
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -2117,7 +2125,8 @@ __bn_mul4x_mont:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
-.inst	0xd50323bf		// autiasp
+	// x30 loaded earlier
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	__bn_mul4x_mont,.-__bn_mul4x_mont
 .byte	77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/sys/crypto/openssl/aarch64/chacha-armv8.S b/sys/crypto/openssl/aarch64/chacha-armv8.S
index 609e34f422a2..4f9d6bd372f7 100644
--- a/sys/crypto/openssl/aarch64/chacha-armv8.S
+++ b/sys/crypto/openssl/aarch64/chacha-armv8.S
@@ -1,6 +1,6 @@
 /* Do not modify. This file is auto-generated from chacha-armv8.pl. */
+#include "arm_arch.h"
 #ifndef	__KERNEL__
-# include "arm_arch.h"
 
 .hidden	OPENSSL_armcap_P
 #endif
@@ -21,6 +21,7 @@
 .type	ChaCha20_ctr32,%function
 .align	5
 ChaCha20_ctr32:
+	AARCH64_SIGN_LINK_REGISTER
 	cbz	x2,.Labort
 	cmp	x2,#192
 	b.lo	.Lshort
@@ -33,7 +34,6 @@ ChaCha20_ctr32:
 #endif
 
 .Lshort:
-.inst	0xd503233f			// paciasp
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -245,8 +245,8 @@ ChaCha20_ctr32:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-.inst	0xd50323bf			// autiasp
 .Labort:
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 .align	4
@@ -302,7 +302,7 @@ ChaCha20_ctr32:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_ctr32,.-ChaCha20_ctr32
 
@@ -312,8 +312,8 @@ ChaCha20_ctr32:
 .type	ChaCha20_neon,%function
 .align	5
 ChaCha20_neon:
+	AARCH64_SIGN_LINK_REGISTER
 .LChaCha20_neon:
-.inst	0xd503233f			// paciasp
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -748,7 +748,7 @@ ChaCha20_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 
 .align	4
@@ -880,13 +880,13 @@ ChaCha20_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_neon,.-ChaCha20_neon
 .type	ChaCha20_512_neon,%function
 .align	5
 ChaCha20_512_neon:
-.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 
@@ -2030,6 +2030,6 @@ ChaCha20_512_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_512_neon,.-ChaCha20_512_neon
diff --git a/sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S b/sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S
index d297ac15605c..73c367bcf1fc 100644
--- a/sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S
+++ b/sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S
@@ -2396,7 +2396,7 @@ ecp_nistz256_precomputed:
 .type	ecp_nistz256_to_mont,%function
 .align	6
 ecp_nistz256_to_mont:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-32]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -2412,7 +2412,7 @@ ecp_nistz256_to_mont:
 
 	ldp	x19,x20,[sp,#16]
 	ldp	x29,x30,[sp],#32
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_to_mont,.-ecp_nistz256_to_mont
 
@@ -2421,7 +2421,7 @@ ecp_nistz256_to_mont:
 .type	ecp_nistz256_from_mont,%function
 .align	4
 ecp_nistz256_from_mont:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-32]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -2437,7 +2437,7 @@ ecp_nistz256_from_mont:
 
 	ldp	x19,x20,[sp,#16]
 	ldp	x29,x30,[sp],#32
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_from_mont,.-ecp_nistz256_from_mont
 
@@ -2447,7 +2447,7 @@ ecp_nistz256_from_mont:
 .type	ecp_nistz256_mul_mont,%function
 .align	4
 ecp_nistz256_mul_mont:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-32]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -2462,7 +2462,7 @@ ecp_nistz256_mul_mont:
 
 	ldp	x19,x20,[sp,#16]
 	ldp	x29,x30,[sp],#32
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_mul_mont,.-ecp_nistz256_mul_mont
 
@@ -2471,7 +2471,7 @@ ecp_nistz256_mul_mont:
 .type	ecp_nistz256_sqr_mont,%function
 .align	4
 ecp_nistz256_sqr_mont:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-32]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -2485,7 +2485,7 @@ ecp_nistz256_sqr_mont:
 
 	ldp	x19,x20,[sp,#16]
 	ldp	x29,x30,[sp],#32
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_sqr_mont,.-ecp_nistz256_sqr_mont
 
@@ -2495,7 +2495,7 @@ ecp_nistz256_sqr_mont:
 .type	ecp_nistz256_add,%function
 .align	4
 ecp_nistz256_add:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -2509,7 +2509,7 @@ ecp_nistz256_add:
 	bl	__ecp_nistz256_add
 
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_add,.-ecp_nistz256_add
 
@@ -2518,7 +2518,7 @@ ecp_nistz256_add:
 .type	ecp_nistz256_div_by_2,%function
 .align	4
 ecp_nistz256_div_by_2:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -2530,7 +2530,7 @@ ecp_nistz256_div_by_2:
 	bl	__ecp_nistz256_div_by_2
 
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		//  autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_div_by_2,.-ecp_nistz256_div_by_2
 
@@ -2539,7 +2539,7 @@ ecp_nistz256_div_by_2:
 .type	ecp_nistz256_mul_by_2,%function
 .align	4
 ecp_nistz256_mul_by_2:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -2555,7 +2555,7 @@ ecp_nistz256_mul_by_2:
 	bl	__ecp_nistz256_add	// ret = a+a	// 2*a
 
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_mul_by_2,.-ecp_nistz256_mul_by_2
 
@@ -2564,7 +2564,7 @@ ecp_nistz256_mul_by_2:
 .type	ecp_nistz256_mul_by_3,%function
 .align	4
 ecp_nistz256_mul_by_3:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -2591,7 +2591,7 @@ ecp_nistz256_mul_by_3:
 	bl	__ecp_nistz256_add	// ret += a	// 2*a+a=3*a
 
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_mul_by_3,.-ecp_nistz256_mul_by_3
 
@@ -2601,7 +2601,7 @@ ecp_nistz256_mul_by_3:
 .type	ecp_nistz256_sub,%function
 .align	4
 ecp_nistz256_sub:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -2613,7 +2613,7 @@ ecp_nistz256_sub:
 	bl	__ecp_nistz256_sub_from
 
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_sub,.-ecp_nistz256_sub
 
@@ -2622,7 +2622,7 @@ ecp_nistz256_sub:
 .type	ecp_nistz256_neg,%function
 .align	4
 ecp_nistz256_neg:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -2637,7 +2637,7 @@ ecp_nistz256_neg:
 	bl	__ecp_nistz256_sub_from
 
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_neg,.-ecp_nistz256_neg
 
@@ -3015,7 +3015,7 @@ __ecp_nistz256_div_by_2:
 .type	ecp_nistz256_point_double,%function
 .align	5
 ecp_nistz256_point_double:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -3150,14 +3150,14 @@ ecp_nistz256_point_double:
 	ldp	x19,x20,[x29,#16]
 	ldp	x21,x22,[x29,#32]
 	ldp	x29,x30,[sp],#96
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_point_double,.-ecp_nistz256_point_double
 .globl	ecp_nistz256_point_add
 .type	ecp_nistz256_point_add,%function
 .align	5
 ecp_nistz256_point_add:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -3404,14 +3404,14 @@ ecp_nistz256_point_add:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_point_add,.-ecp_nistz256_point_add
 .globl	ecp_nistz256_point_add_affine
 .type	ecp_nistz256_point_add_affine,%function
 .align	5
 ecp_nistz256_point_add_affine:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-80]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -3610,7 +3610,7 @@ ecp_nistz256_point_add_affine:
 	ldp	x23,x24,[x29,#48]
 	ldp	x25,x26,[x29,#64]
 	ldp	x29,x30,[sp],#80
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ecp_nistz256_point_add_affine,.-ecp_nistz256_point_add_affine
 ////////////////////////////////////////////////////////////////////////
@@ -3620,6 +3620,8 @@ ecp_nistz256_point_add_affine:
 .type	ecp_nistz256_ord_mul_mont,%function
 .align	4
 ecp_nistz256_ord_mul_mont:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-64]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -3828,6 +3830,8 @@ ecp_nistz256_ord_mul_mont:
 .type	ecp_nistz256_ord_sqr_mont,%function
 .align	4
 ecp_nistz256_ord_sqr_mont:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-64]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -4016,6 +4020,8 @@ ecp_nistz256_ord_sqr_mont:
 .type	ecp_nistz256_scatter_w5,%function
 .align	4
 ecp_nistz256_scatter_w5:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -4078,6 +4084,8 @@ ecp_nistz256_scatter_w5:
 .type	ecp_nistz256_gather_w5,%function
 .align	4
 ecp_nistz256_gather_w5:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -4155,6 +4163,8 @@ ecp_nistz256_gather_w5:
 .type	ecp_nistz256_scatter_w7,%function
 .align	4
 ecp_nistz256_scatter_w7:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -4199,6 +4209,8 @@ ecp_nistz256_scatter_w7:
 .type	ecp_nistz256_gather_w7,%function
 .align	4
 ecp_nistz256_gather_w7:
+	AARCH64_VALID_CALL_TARGET
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
diff --git a/sys/crypto/openssl/aarch64/ghashv8-armx.S b/sys/crypto/openssl/aarch64/ghashv8-armx.S
index fe5cd49a25aa..9dec85cd4679 100644
--- a/sys/crypto/openssl/aarch64/ghashv8-armx.S
+++ b/sys/crypto/openssl/aarch64/ghashv8-armx.S
@@ -8,6 +8,7 @@
 .type	gcm_init_v8,%function
 .align	4
 gcm_init_v8:
+	AARCH64_VALID_CALL_TARGET
 	ld1	{v17.2d},[x1]		//load input H
 	movi	v19.16b,#0xe1
 	shl	v19.2d,v19.2d,#57		//0xc2.0
@@ -98,6 +99,7 @@ gcm_init_v8:
 .type	gcm_gmult_v8,%function
 .align	4
 gcm_gmult_v8:
+	AARCH64_VALID_CALL_TARGET
 	ld1	{v17.2d},[x0]		//load Xi
 	movi	v19.16b,#0xe1
 	ld1	{v20.2d,v21.2d},[x1]	//load twisted H, ...
@@ -139,6 +141,7 @@ gcm_gmult_v8:
 .type	gcm_ghash_v8,%function
 .align	4
 gcm_ghash_v8:
+	AARCH64_VALID_CALL_TARGET
 	cmp	x3,#64
 	b.hs	.Lgcm_ghash_v8_4x
 	ld1	{v0.2d},[x0]		//load [rotated] Xi
diff --git a/sys/crypto/openssl/aarch64/keccak1600-armv8.S b/sys/crypto/openssl/aarch64/keccak1600-armv8.S
index cf63318a8d08..08b3cc351213 100644
--- a/sys/crypto/openssl/aarch64/keccak1600-armv8.S
+++ b/sys/crypto/openssl/aarch64/keccak1600-armv8.S
@@ -1,4 +1,6 @@
 /* Do not modify. This file is auto-generated from keccak1600-armv8.pl. */
+#include "arm_arch.h"
+
 .text
 
 .align	8	// strategic alignment and padding that allows to use
@@ -34,8 +36,8 @@ iotas:
 .type	KeccakF1600_int,%function
 .align	5
 KeccakF1600_int:
+	AARCH64_SIGN_LINK_REGISTER
 	adr	x28,iotas
-.inst	0xd503233f			// paciasp
 	stp	x28,x30,[sp,#16]		// 32 bytes on top are mine
 	b	.Loop
 .align	4
@@ -199,14 +201,14 @@ KeccakF1600_int:
 	bne	.Loop
 
 	ldr	x30,[sp,#24]
-.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	KeccakF1600_int,.-KeccakF1600_int
 
 .type	KeccakF1600,%function
 .align	5
 KeccakF1600:
-.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -256,7 +258,7 @@ KeccakF1600:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
-.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	KeccakF1600,.-KeccakF1600
 
@@ -264,7 +266,7 @@ KeccakF1600:
 .type	SHA3_absorb,%function
 .align	5
 SHA3_absorb:
-.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -498,14 +500,14 @@ SHA3_absorb:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
-.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	SHA3_absorb,.-SHA3_absorb
 .globl	SHA3_squeeze
 .type	SHA3_squeeze,%function
 .align	5
 SHA3_squeeze:
-.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-48]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -568,7 +570,7 @@ SHA3_squeeze:
 	ldp	x19,x20,[sp,#16]
 	ldp	x21,x22,[sp,#32]
 	ldp	x29,x30,[sp],#48
-.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	SHA3_squeeze,.-SHA3_squeeze
 .type	KeccakF1600_ce,%function
@@ -676,7 +678,7 @@ KeccakF1600_ce:
 .type	KeccakF1600_cext,%function
 .align	5
 KeccakF1600_cext:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-80]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#16]		// per ABI requirement
@@ -717,14 +719,14 @@ KeccakF1600_cext:
 	ldp	d12,d13,[sp,#48]
 	ldp	d14,d15,[sp,#64]
 	ldr	x29,[sp],#80
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	KeccakF1600_cext,.-KeccakF1600_cext
 .globl	SHA3_absorb_cext
 .type	SHA3_absorb_cext,%function
 .align	5
 SHA3_absorb_cext:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-80]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#16]		// per ABI requirement
@@ -940,14 +942,14 @@ SHA3_absorb_cext:
 	ldp	d12,d13,[sp,#48]
 	ldp	d14,d15,[sp,#64]
 	ldp	x29,x30,[sp],#80
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	SHA3_absorb_cext,.-SHA3_absorb_cext
 .globl	SHA3_squeeze_cext
 .type	SHA3_squeeze_cext,%function
 .align	5
 SHA3_squeeze_cext:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	mov	x9,x0
@@ -1003,7 +1005,7 @@ SHA3_squeeze_cext:
 
 .Lsqueeze_done_ce:
 	ldr	x29,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	SHA3_squeeze_cext,.-SHA3_squeeze_cext
 .byte	75,101,99,99,97,107,45,49,54,48,48,32,97,98,115,111,114,98,32,97,110,100,32,115,113,117,101,101,122,101,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/sys/crypto/openssl/aarch64/poly1305-armv8.S b/sys/crypto/openssl/aarch64/poly1305-armv8.S
index 101e4fb40552..35de669f7398 100644
--- a/sys/crypto/openssl/aarch64/poly1305-armv8.S
+++ b/sys/crypto/openssl/aarch64/poly1305-armv8.S
@@ -16,6 +16,7 @@
 .type	poly1305_init,%function
 .align	5
 poly1305_init:
+	AARCH64_VALID_CALL_TARGET
 	cmp	x1,xzr
 	stp	xzr,xzr,[x0]		// zero hash value
 	stp	xzr,xzr,[x0,#16]	// [along with is_base2_26]
@@ -63,6 +64,9 @@ poly1305_init:
 .align	5
 poly1305_blocks:
 .Lpoly1305_blocks:
+	// The symbol .Lpoly1305_blocks is not a .globl symbol
+	// but a pointer to it is returned by poly1305_init
+	AARCH64_VALID_CALL_TARGET
 	ands	x2,x2,#-16
 	b.eq	.Lno_data
 
@@ -128,6 +132,9 @@ poly1305_blocks:
 .align	5
 poly1305_emit:
 .Lpoly1305_emit:
+	// The symbol .poly1305_emit is not a .globl symbol
+	// but a pointer to it is returned by poly1305_init
+	AARCH64_VALID_CALL_TARGET
 	ldp	x4,x5,[x0]		// load hash base 2^64
 	ldr	x6,[x0,#16]
 	ldp	x10,x11,[x2]	// load nonce
@@ -223,13 +230,16 @@ poly1305_splat:
 .align	5
 poly1305_blocks_neon:
 .Lpoly1305_blocks_neon:
+	// The symbol .Lpoly1305_blocks_neon is not a .globl symbol
+	// but a pointer to it is returned by poly1305_init
+	AARCH64_VALID_CALL_TARGET
 	ldr	x17,[x0,#24]
 	cmp	x2,#128
 	b.hs	.Lblocks_neon
 	cbz	x17,.Lpoly1305_blocks
 
 .Lblocks_neon:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-80]!
 	add	x29,sp,#0
 
@@ -799,7 +809,7 @@ poly1305_blocks_neon:
 
 .Lno_data_neon:
 	ldr	x29,[sp],#80
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	poly1305_blocks_neon,.-poly1305_blocks_neon
 
@@ -807,6 +817,9 @@ poly1305_blocks_neon:
 .align	5
 poly1305_emit_neon:
 .Lpoly1305_emit_neon:
+	// The symbol .Lpoly1305_emit_neon is not a .globl symbol
+	// but a pointer to it is returned by poly1305_init
+	AARCH64_VALID_CALL_TARGET
 	ldr	x17,[x0,#24]
 	cbz	x17,poly1305_emit
 
diff --git a/sys/crypto/openssl/aarch64/sha1-armv8.S b/sys/crypto/openssl/aarch64/sha1-armv8.S
index a9e1d81d5817..9e2d86072394 100644
--- a/sys/crypto/openssl/aarch64/sha1-armv8.S
+++ b/sys/crypto/openssl/aarch64/sha1-armv8.S
@@ -1,6 +1,6 @@
 /* Do not modify. This file is auto-generated from sha1-armv8.pl. */
+#include "arm_arch.h"
 #ifndef	__KERNEL__
-# include "arm_arch.h"
 
 .hidden	OPENSSL_armcap_P
 #endif
@@ -11,11 +11,13 @@
 .type	sha1_block_data_order,%function
 .align	6
 sha1_block_data_order:
+	AARCH64_VALID_CALL_TARGET
 	adrp	x16,OPENSSL_armcap_P
 	ldr	w16,[x16,#:lo12:OPENSSL_armcap_P]
 	tst	w16,#ARMV8_SHA1
 	b.ne	.Lv8_entry
 
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@@ -1075,6 +1077,7 @@ sha1_block_data_order:
 .align	6
 sha1_block_armv8:
 .Lv8_entry:
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
diff --git a/sys/crypto/openssl/aarch64/sha256-armv8.S b/sys/crypto/openssl/aarch64/sha256-armv8.S
index f0c4a14610b8..4f3934a4890c 100644
--- a/sys/crypto/openssl/aarch64/sha256-armv8.S
+++ b/sys/crypto/openssl/aarch64/sha256-armv8.S
@@ -56,8 +56,8 @@
 
 // $output is the last argument if it looks like a file (it has an extension)
 // $flavour is the first argument if it doesn't look like a file
+#include "arm_arch.h"
 #ifndef	__KERNEL__
-# include "arm_arch.h"
 
 .hidden	OPENSSL_armcap_P
 #endif
@@ -68,6 +68,7 @@
 .type	sha256_block_data_order,%function
 .align	6
 sha256_block_data_order:
+	AARCH64_VALID_CALL_TARGET
 #ifndef	__KERNEL__
 	adrp	x16,OPENSSL_armcap_P
 	ldr	w16,[x16,#:lo12:OPENSSL_armcap_P]
@@ -76,7 +77,7 @@ sha256_block_data_order:
 	tst	w16,#ARMV7_NEON
 	b.ne	.Lneon_entry
 #endif
-.inst	0xd503233f				// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 
@@ -1036,7 +1037,7 @@ sha256_block_data_order:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
-.inst	0xd50323bf				// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	sha256_block_data_order,.-sha256_block_data_order
 
@@ -1069,6 +1070,7 @@ sha256_block_data_order:
 .align	6
 sha256_block_armv8:
 .Lv8_entry:
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -1210,7 +1212,9 @@ sha256_block_armv8:
 .type	sha256_block_neon,%function
 .align	4
 sha256_block_neon:
+	AARCH64_VALID_CALL_TARGET
 .Lneon_entry:
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later
 	stp	x29, x30, [sp, #-16]!
 	mov	x29, sp
 	sub	sp,sp,#16*4
diff --git a/sys/crypto/openssl/aarch64/sha512-armv8.S b/sys/crypto/openssl/aarch64/sha512-armv8.S
index ded34d2a96b0..c119d9cf5c95 100644
--- a/sys/crypto/openssl/aarch64/sha512-armv8.S
+++ b/sys/crypto/openssl/aarch64/sha512-armv8.S
@@ -56,8 +56,8 @@
 
 // $output is the last argument if it looks like a file (it has an extension)
 // $flavour is the first argument if it doesn't look like a file
+#include "arm_arch.h"
 #ifndef	__KERNEL__
-# include "arm_arch.h"
 
 .hidden	OPENSSL_armcap_P
 #endif
@@ -68,13 +68,14 @@
 .type	sha512_block_data_order,%function
 .align	6
 sha512_block_data_order:
+	AARCH64_VALID_CALL_TARGET
 #ifndef	__KERNEL__
 	adrp	x16,OPENSSL_armcap_P
 	ldr	w16,[x16,#:lo12:OPENSSL_armcap_P]
 	tst	w16,#ARMV8_SHA512
 	b.ne	.Lv8_entry
 #endif
-.inst	0xd503233f				// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 
@@ -1034,7 +1035,7 @@ sha512_block_data_order:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
-.inst	0xd50323bf				// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	sha512_block_data_order,.-sha512_block_data_order
 
@@ -1091,6 +1092,7 @@ sha512_block_data_order:
 .align	6
 sha512_block_armv8:
 .Lv8_entry:
+	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
diff --git a/sys/crypto/openssl/aarch64/vpaes-armv8.S b/sys/crypto/openssl/aarch64/vpaes-armv8.S
index 07c08bfe7daa..c6338b00d5f6 100644
--- a/sys/crypto/openssl/aarch64/vpaes-armv8.S
+++ b/sys/crypto/openssl/aarch64/vpaes-armv8.S
@@ -1,4 +1,6 @@
 /* Do not modify. This file is auto-generated from vpaes-armv8.pl. */
+#include "arm_arch.h"
+
 .text
 
 .type	_vpaes_consts,%object
@@ -196,7 +198,7 @@ _vpaes_encrypt_core:
 .type	vpaes_encrypt,%function
 .align	4
 vpaes_encrypt:
-.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -206,7 +208,7 @@ vpaes_encrypt:
 	st1	{v0.16b}, [x1]
 
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_encrypt,.-vpaes_encrypt
 
@@ -429,7 +431,7 @@ _vpaes_decrypt_core:
 .type	vpaes_decrypt,%function
 .align	4
 vpaes_decrypt:
-.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -439,7 +441,7 @@ vpaes_decrypt:
 	st1	{v0.16b}, [x1]
 
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_decrypt,.-vpaes_decrypt
 
@@ -603,7 +605,7 @@ _vpaes_key_preheat:
 .type	_vpaes_schedule_core,%function
 .align	4
 _vpaes_schedule_core:
-.inst	0xd503233f			// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29, x30, [sp,#-16]!
 	add	x29,sp,#0
 
@@ -768,7 +770,7 @@ _vpaes_schedule_core:
 	eor	v6.16b, v6.16b, v6.16b		// vpxor	%xmm6,	%xmm6,	%xmm6
 	eor	v7.16b, v7.16b, v7.16b		// vpxor	%xmm7,	%xmm7,	%xmm7
 	ldp	x29, x30, [sp],#16
-.inst	0xd50323bf			// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	_vpaes_schedule_core,.-_vpaes_schedule_core
 
@@ -981,7 +983,7 @@ _vpaes_schedule_mangle:
 .type	vpaes_set_encrypt_key,%function
 .align	4
 vpaes_set_encrypt_key:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -997,7 +999,7 @@ vpaes_set_encrypt_key:
 
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_set_encrypt_key,.-vpaes_set_encrypt_key
 
@@ -1005,7 +1007,7 @@ vpaes_set_encrypt_key:
 .type	vpaes_set_decrypt_key,%function
 .align	4
 vpaes_set_decrypt_key:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1025,18 +1027,18 @@ vpaes_set_decrypt_key:
 
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_set_decrypt_key,.-vpaes_set_decrypt_key
 .globl	vpaes_cbc_encrypt
 .type	vpaes_cbc_encrypt,%function
 .align	4
 vpaes_cbc_encrypt:
+	AARCH64_SIGN_LINK_REGISTER
 	cbz	x2, .Lcbc_abort
 	cmp	w5, #0			// check direction
 	b.eq	vpaes_cbc_decrypt
 
-.inst	0xd503233f		// paciasp
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 
@@ -1059,15 +1061,16 @@ vpaes_cbc_encrypt:
 	st1	{v0.16b}, [x4]	// write ivec
 
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
 .Lcbc_abort:
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_cbc_encrypt,.-vpaes_cbc_encrypt
 
 .type	vpaes_cbc_decrypt,%function
 .align	4
 vpaes_cbc_decrypt:
-.inst	0xd503233f		// paciasp
+	// Not adding AARCH64_SIGN_LINK_REGISTER here because vpaes_cbc_decrypt is jumped to
+	// only from vpaes_cbc_encrypt which has already signed the return address.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1109,14 +1112,14 @@ vpaes_cbc_decrypt:
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_cbc_decrypt,.-vpaes_cbc_decrypt
 .globl	vpaes_ecb_encrypt
 .type	vpaes_ecb_encrypt,%function
 .align	4
 vpaes_ecb_encrypt:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1150,7 +1153,7 @@ vpaes_ecb_encrypt:
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_ecb_encrypt,.-vpaes_ecb_encrypt
 
@@ -1158,7 +1161,7 @@ vpaes_ecb_encrypt:
 .type	vpaes_ecb_decrypt,%function
 .align	4
 vpaes_ecb_decrypt:
-.inst	0xd503233f		// paciasp
+	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@@ -1192,6 +1195,6 @@ vpaes_ecb_decrypt:
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
-.inst	0xd50323bf		// autiasp
+	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_ecb_decrypt,.-vpaes_ecb_decrypt
diff --git a/sys/ddb/db_capture.c b/sys/ddb/db_capture.c
index 98c6e806187a..b4e598bf45cc 100644
--- a/sys/ddb/db_capture.c
+++ b/sys/ddb/db_capture.c
@@ -165,8 +165,8 @@ sysctl_debug_ddb_capture_bufsize(SYSCTL_HANDLER_ARGS)
 	return (0);
 }
 SYSCTL_PROC(_debug_ddb_capture, OID_AUTO, bufsize,
-    CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0,
-    sysctl_debug_ddb_capture_bufsize, "IU",
+    CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE,
+    0, 0, sysctl_debug_ddb_capture_bufsize, "IU",
     "Size of DDB capture buffer");
 
 /*
diff --git a/sys/dev/acpica/acpi_ged.c b/sys/dev/acpica/acpi_ged.c
index e7dcc1ffb0ac..23e125f277c5 100644
--- a/sys/dev/acpica/acpi_ged.c
+++ b/sys/dev/acpica/acpi_ged.c
@@ -81,6 +81,11 @@ static driver_t acpi_ged_driver = {
 DRIVER_MODULE(acpi_ged, acpi, acpi_ged_driver, 0, 0);
 MODULE_DEPEND(acpi_ged, acpi, 1, 1, 1);
 
+static int acpi_ged_defer;
+SYSCTL_INT(_debug_acpi, OID_AUTO, ged_defer, CTLFLAG_RWTUN,
+    &acpi_ged_defer, 0,
+    "Handle ACPI GED via a task, rather than in the ISR");
+
 static void
 acpi_ged_evt(void *arg)
 {
@@ -92,7 +97,12 @@ acpi_ged_evt(void *arg)
 static void
 acpi_ged_intr(void *arg)
 {
-	AcpiOsExecute(OSL_GPE_HANDLER, acpi_ged_evt, arg);
+	struct acpi_ged_event *evt = arg;
+
+	if (acpi_ged_defer)
+		AcpiOsExecute(OSL_GPE_HANDLER, acpi_ged_evt, arg);
+	else
+		AcpiEvaluateObject(evt->ah, NULL, &evt->args, NULL);
 }
 static int
 acpi_ged_probe(device_t dev)
diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c
index 1fd3adef738e..69d0b5c00848 100644
--- a/sys/dev/ath/if_ath_tx.c
+++ b/sys/dev/ath/if_ath_tx.c
@@ -288,7 +288,7 @@ ath_txfrag_setup(struct ath_softc *sc, ath_bufhead *frags,
 			ath_txfrag_cleanup(sc, frags, ni);
 			break;
 		}
-		ieee80211_node_incref(ni);
+		(void) ieee80211_ref_node(ni);
 		TAILQ_INSERT_TAIL(frags, bf, bf_list);
 	}
 	ATH_TXBUF_UNLOCK(sc);
diff --git a/sys/dev/clk/xilinx/zynqmp_reset.c b/sys/dev/clk/xilinx/zynqmp_reset.c
index f1d847acdaa4..52074d4c62af 100644
--- a/sys/dev/clk/xilinx/zynqmp_reset.c
+++ b/sys/dev/clk/xilinx/zynqmp_reset.c
@@ -183,7 +183,6 @@ zynqmp_reset_assert(device_t dev, intptr_t id, bool reset)
 	if (id > ZYNQMP_RESET_MAX)
 		return (EINVAL);
 	sc = device_get_softc(dev);
-	device_printf(dev, "%s called for id = %ld, reset =%d\n", __func__, (long)id, reset);
 	rv = ZYNQMP_FIRMWARE_RESET_ASSERT(sc->parent, id, reset);
 	return (rv);
 }
@@ -197,7 +196,6 @@ zynqmp_reset_is_asserted(device_t dev, intptr_t id, bool *reset)
 	if (id > ZYNQMP_RESET_MAX)
 		return (EINVAL);
 	sc = device_get_softc(dev);
-	device_printf(dev, "%s called for id = %ld\n", __func__, (long)id);
 	rv = ZYNQMP_FIRMWARE_RESET_GET_STATUS(sc->parent, id, reset);
 
 	return (rv);
diff --git a/sys/dev/cpuctl/cpuctl.c b/sys/dev/cpuctl/cpuctl.c
index 9c56db1ad19a..1fa655342121 100644
--- a/sys/dev/cpuctl/cpuctl.c
+++ b/sys/dev/cpuctl/cpuctl.c
@@ -546,6 +546,7 @@ cpuctl_do_eval_cpu_features(int cpu, struct thread *td)
 	hw_mds_recalculate();
 	x86_taa_recalculate();
 	x86_rngds_mitg_recalculate(true);
+	zenbleed_check_and_apply(true);
 	printcpuinfo();
 	return (0);
 }
diff --git a/sys/dev/dwc/dwc1000_core.c b/sys/dev/dwc/dwc1000_core.c
new file mode 100644
index 000000000000..872d1a488454
--- /dev/null
+++ b/sys/dev/dwc/dwc1000_core.c
@@ -0,0 +1,448 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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.
+ */
+
+/*
+ * Ethernet media access controller (EMAC)
+ * Chapter 17, Altera Cyclone V Device Handbook (CV-5V2 2014.07.22)
+ *
+ * EMAC is an instance of the Synopsys DesignWare 3504-0
+ * Universal 10/100/1000 Ethernet MAC (DWC_gmac).
+ */
+
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/rman.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+
+#include <machine/bus.h>
+
+#include <dev/extres/clk/clk.h>
+#include <dev/extres/hwreset/hwreset.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/mii/mii_fdt.h>
+
+#include <dev/dwc/if_dwcvar.h>
+#include <dev/dwc/dwc1000_reg.h>
+#include <dev/dwc/dwc1000_core.h>
+#include <dev/dwc/dwc1000_dma.h>
+
+#include "if_dwc_if.h"
+
+struct dwc_hash_maddr_ctx {
+	struct dwc_softc *sc;
+	uint32_t hash[8];
+};
+
+#define	STATS_HARVEST_INTERVAL	2
+
+/* Pause time field in the transmitted control frame */
+static int dwc_pause_time = 0xffff;
+TUNABLE_INT("hw.dwc.pause_time", &dwc_pause_time);
+
+/*
+ * MIIBUS functions
+ */
+
+int
+dwc1000_miibus_read_reg(device_t dev, int phy, int reg)
+{
+	struct dwc_softc *sc;
+	uint16_t mii;
+	size_t cnt;
+	int rv = 0;
+
+	sc = device_get_softc(dev);
+
+	mii = ((phy & GMII_ADDRESS_PA_MASK) << GMII_ADDRESS_PA_SHIFT)
+	    | ((reg & GMII_ADDRESS_GR_MASK) << GMII_ADDRESS_GR_SHIFT)
+	    | (sc->mii_clk << GMII_ADDRESS_CR_SHIFT)
+	    | GMII_ADDRESS_GB; /* Busy flag */
+
+	WRITE4(sc, GMII_ADDRESS, mii);
+
+	for (cnt = 0; cnt < 1000; cnt++) {
+		if (!(READ4(sc, GMII_ADDRESS) & GMII_ADDRESS_GB)) {
+			rv = READ4(sc, GMII_DATA);
+			break;
+		}
+		DELAY(10);
+	}
+
+	return rv;
+}
+
+int
+dwc1000_miibus_write_reg(device_t dev, int phy, int reg, int val)
+{
+	struct dwc_softc *sc;
+	uint16_t mii;
+	size_t cnt;
+
+	sc = device_get_softc(dev);
+
+	mii = ((phy & GMII_ADDRESS_PA_MASK) << GMII_ADDRESS_PA_SHIFT)
+	    | ((reg & GMII_ADDRESS_GR_MASK) << GMII_ADDRESS_GR_SHIFT)
+	    | (sc->mii_clk << GMII_ADDRESS_CR_SHIFT)
+	    | GMII_ADDRESS_GB | GMII_ADDRESS_GW;
+
+	WRITE4(sc, GMII_DATA, val);
+	WRITE4(sc, GMII_ADDRESS, mii);
+
+	for (cnt = 0; cnt < 1000; cnt++) {
+		if (!(READ4(sc, GMII_ADDRESS) & GMII_ADDRESS_GB)) {
+			break;
+                }
+		DELAY(10);
+	}
+
+	return (0);
+}
+
+void
+dwc1000_miibus_statchg(device_t dev)
+{
+	struct dwc_softc *sc;
+	struct mii_data *mii;
+	uint32_t reg;
+
+	/*
+	 * Called by the MII bus driver when the PHY establishes
+	 * link to set the MAC interface registers.
+	 */
+
+	sc = device_get_softc(dev);
+
+	DWC_ASSERT_LOCKED(sc);
+
+	mii = sc->mii_softc;
+
+	if (mii->mii_media_status & IFM_ACTIVE)
+		sc->link_is_up = true;
+	else
+		sc->link_is_up = false;
+
+	reg = READ4(sc, MAC_CONFIGURATION);
+	switch (IFM_SUBTYPE(mii->mii_media_active)) {
+	case IFM_1000_T:
+	case IFM_1000_SX:
+		reg &= ~(CONF_FES | CONF_PS);
+		break;
+	case IFM_100_TX:
+		reg |= (CONF_FES | CONF_PS);
+		break;
+	case IFM_10_T:
+		reg &= ~(CONF_FES);
+		reg |= (CONF_PS);
+		break;
+	case IFM_NONE:
+		sc->link_is_up = false;
+		return;
+	default:
+		sc->link_is_up = false;
+		device_printf(dev, "Unsupported media %u\n",
+		    IFM_SUBTYPE(mii->mii_media_active));
+		return;
+	}
+	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0)
+		reg |= (CONF_DM);
+	else
+		reg &= ~(CONF_DM);
+	WRITE4(sc, MAC_CONFIGURATION, reg);
+
+	reg = FLOW_CONTROL_UP;
+	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_TXPAUSE) != 0)
+		reg |= FLOW_CONTROL_TX;
+	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_RXPAUSE) != 0)
+		reg |= FLOW_CONTROL_RX;
+	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0)
+		reg |= dwc_pause_time << FLOW_CONTROL_PT_SHIFT;
+	WRITE4(sc, FLOW_CONTROL, reg);
+
+	IF_DWC_SET_SPEED(dev, IFM_SUBTYPE(mii->mii_media_active));
+
+}
+
+void
+dwc1000_core_setup(struct dwc_softc *sc)
+{
+	uint32_t reg;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	/* Enable core */
+	reg = READ4(sc, MAC_CONFIGURATION);
+	reg |= (CONF_JD | CONF_ACS | CONF_BE);
+	WRITE4(sc, MAC_CONFIGURATION, reg);
+}
+
+void
+dwc1000_enable_mac(struct dwc_softc *sc, bool enable)
+{
+	uint32_t reg;
+
+	DWC_ASSERT_LOCKED(sc);
+	reg = READ4(sc, MAC_CONFIGURATION);
+	if (enable)
+		reg |= CONF_TE | CONF_RE;
+	else
+		reg &= ~(CONF_TE | CONF_RE);
+	WRITE4(sc, MAC_CONFIGURATION, reg);
+}
+
+void
+dwc1000_enable_csum_offload(struct dwc_softc *sc)
+{
+	uint32_t reg;
+
+	DWC_ASSERT_LOCKED(sc);
+	reg = READ4(sc, MAC_CONFIGURATION);
+	if ((if_getcapenable(sc->ifp) & IFCAP_RXCSUM) != 0)
+		reg |= CONF_IPC;
+	else
+		reg &= ~CONF_IPC;
+	WRITE4(sc, MAC_CONFIGURATION, reg);
+}
+
+static const uint8_t nibbletab[] = {
+	/* 0x0 0000 -> 0000 */  0x0,
+	/* 0x1 0001 -> 1000 */  0x8,
+	/* 0x2 0010 -> 0100 */  0x4,
+	/* 0x3 0011 -> 1100 */  0xc,
+	/* 0x4 0100 -> 0010 */  0x2,
+	/* 0x5 0101 -> 1010 */  0xa,
+	/* 0x6 0110 -> 0110 */  0x6,
+	/* 0x7 0111 -> 1110 */  0xe,
+	/* 0x8 1000 -> 0001 */  0x1,
+	/* 0x9 1001 -> 1001 */  0x9,
+	/* 0xa 1010 -> 0101 */  0x5,
+	/* 0xb 1011 -> 1101 */  0xd,
+	/* 0xc 1100 -> 0011 */  0x3,
+	/* 0xd 1101 -> 1011 */  0xb,
+	/* 0xe 1110 -> 0111 */  0x7,
+	/* 0xf 1111 -> 1111 */  0xf, };
+
+static uint8_t
+bitreverse(uint8_t x)
+{
+
+	return (nibbletab[x & 0xf] << 4) | nibbletab[x >> 4];
+}
+
+static u_int
+dwc_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt)
+{
+	struct dwc_hash_maddr_ctx *ctx = arg;
+	uint32_t crc, hashbit, hashreg;
+	uint8_t val;
+
+	crc = ether_crc32_le(LLADDR(sdl), ETHER_ADDR_LEN);
+	/* Take lower 8 bits and reverse it */
+	val = bitreverse(~crc & 0xff);
+	/*
+	 * TODO: There is probably a HW_FEATURES bit which isn't
+	 * related to the extended descriptors that describe this
+	 */
+	if (!ctx->sc->dma_ext_desc)
+		val >>= 2; /* Only need lower 6 bits */
+	hashreg = (val >> 5);
+	hashbit = (val & 31);
+	ctx->hash[hashreg] |= (1 << hashbit);
+
+	return (1);
+}
+
+void
+dwc1000_setup_rxfilter(struct dwc_softc *sc)
+{
+	struct dwc_hash_maddr_ctx ctx;
+	if_t ifp;
+	uint8_t *eaddr;
+	uint32_t ffval, hi, lo;
+	int nhash, i;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	ifp = sc->ifp;
+	/*
+	 * TODO: There is probably a HW_FEATURES bit which isn't
+	 * related to the extended descriptors that describe this
+	 */
+	nhash = sc->dma_ext_desc == false ? 2 : 8;
+
+	/*
+	 * Set the multicast (group) filter hash.
+	 */
+	if ((if_getflags(ifp) & IFF_ALLMULTI) != 0) {
+		ffval = (FRAME_FILTER_PM);
+		for (i = 0; i < nhash; i++)
+			ctx.hash[i] = ~0;
+	} else {
+		ffval = (FRAME_FILTER_HMC);
+		for (i = 0; i < nhash; i++)
+			ctx.hash[i] = 0;
+		ctx.sc = sc;
+		if_foreach_llmaddr(ifp, dwc_hash_maddr, &ctx);
+	}
+
+	/*
+	 * Set the individual address filter hash.
+	 */
+	if ((if_getflags(ifp) & IFF_PROMISC) != 0)
+		ffval |= (FRAME_FILTER_PR);
+
+	/*
+	 * Set the primary address.
+	 */
+	eaddr = if_getlladdr(ifp);
+	lo = eaddr[0] | (eaddr[1] << 8) | (eaddr[2] << 16) |
+	    (eaddr[3] << 24);
+	hi = eaddr[4] | (eaddr[5] << 8);
+	WRITE4(sc, MAC_ADDRESS_LOW(0), lo);
+	WRITE4(sc, MAC_ADDRESS_HIGH(0), hi);
+	WRITE4(sc, MAC_FRAME_FILTER, ffval);
+	if (!sc->dma_ext_desc) {
+		WRITE4(sc, GMAC_MAC_HTLOW, ctx.hash[0]);
+		WRITE4(sc, GMAC_MAC_HTHIGH, ctx.hash[1]);
+	} else {
+		for (i = 0; i < nhash; i++)
+			WRITE4(sc, HASH_TABLE_REG(i), ctx.hash[i]);
+	}
+}
+
+void
+dwc1000_get_hwaddr(struct dwc_softc *sc, uint8_t *hwaddr)
+{
+	uint32_t hi, lo, rnd;
+
+	/*
+	 * Try to recover a MAC address from the running hardware. If there's
+	 * something non-zero there, assume the bootloader did the right thing
+	 * and just use it.
+	 *
+	 * Otherwise, set the address to a convenient locally assigned address,
+	 * 'bsd' + random 24 low-order bits.  'b' is 0x62, which has the locally
+	 * assigned bit set, and the broadcast/multicast bit clear.
+	 */
+	lo = READ4(sc, MAC_ADDRESS_LOW(0));
+	hi = READ4(sc, MAC_ADDRESS_HIGH(0)) & 0xffff;
+	if ((lo != 0xffffffff) || (hi != 0xffff)) {
+		hwaddr[0] = (lo >>  0) & 0xff;
+		hwaddr[1] = (lo >>  8) & 0xff;
+		hwaddr[2] = (lo >> 16) & 0xff;
+		hwaddr[3] = (lo >> 24) & 0xff;
+		hwaddr[4] = (hi >>  0) & 0xff;
+		hwaddr[5] = (hi >>  8) & 0xff;
+	} else {
+		rnd = arc4random() & 0x00ffffff;
+		hwaddr[0] = 'b';
+		hwaddr[1] = 's';
+		hwaddr[2] = 'd';
+		hwaddr[3] = rnd >> 16;
+		hwaddr[4] = rnd >>  8;
+		hwaddr[5] = rnd >>  0;
+	}
+}
+
+/*
+ * Stats
+ */
+
+static void
+dwc1000_clear_stats(struct dwc_softc *sc)
+{
+	uint32_t reg;
+
+	reg = READ4(sc, MMC_CONTROL);
+	reg |= (MMC_CONTROL_CNTRST);
+	WRITE4(sc, MMC_CONTROL, reg);
+}
+
+void
+dwc1000_harvest_stats(struct dwc_softc *sc)
+{
+	if_t ifp;
+
+	/* We don't need to harvest too often. */
+	if (++sc->stats_harvest_count < STATS_HARVEST_INTERVAL)
+		return;
+
+	sc->stats_harvest_count = 0;
+	ifp = sc->ifp;
+
+	if_inc_counter(ifp, IFCOUNTER_IERRORS,
+	    READ4(sc, RXOVERSIZE_G) + READ4(sc, RXUNDERSIZE_G) +
+	    READ4(sc, RXCRCERROR) + READ4(sc, RXALIGNMENTERROR) +
+	    READ4(sc, RXRUNTERROR) + READ4(sc, RXJABBERERROR) +
+	    READ4(sc, RXLENGTHERROR));
+
+	if_inc_counter(ifp, IFCOUNTER_OERRORS,
+	    READ4(sc, TXOVERSIZE_G) + READ4(sc, TXEXCESSDEF) +
+	    READ4(sc, TXCARRIERERR) + READ4(sc, TXUNDERFLOWERROR));
+
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+	    READ4(sc, TXEXESSCOL) + READ4(sc, TXLATECOL));
+
+	dwc1000_clear_stats(sc);
+}
+
+void
+dwc1000_intr(struct dwc_softc *sc)
+{
+	uint32_t reg;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	reg = READ4(sc, INTERRUPT_STATUS);
+	if (reg)
+		READ4(sc, SGMII_RGMII_SMII_CTRL_STATUS);
+}
+
+void
+dwc1000_intr_disable(struct dwc_softc *sc)
+{
+
+	WRITE4(sc, INTERRUPT_ENABLE, 0);
+}
diff --git a/sys/dev/dwc/dwc1000_core.h b/sys/dev/dwc/dwc1000_core.h
new file mode 100644
index 000000000000..ade5270e25b1
--- /dev/null
+++ b/sys/dev/dwc/dwc1000_core.h
@@ -0,0 +1,46 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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.
+ */
+
+#ifndef	__DWC1000_CORE_H__
+#define	 __DWC1000_CORE_H__
+
+int dwc1000_miibus_read_reg(device_t dev, int phy, int reg);
+int dwc1000_miibus_write_reg(device_t dev, int phy, int reg, int val);
+void dwc1000_miibus_statchg(device_t dev);
+void dwc1000_core_setup(struct dwc_softc *sc);
+int dwc1000_core_reset(struct dwc_softc *sc);
+void dwc1000_enable_mac(struct dwc_softc *sc, bool enable);
+void dwc1000_enable_csum_offload(struct dwc_softc *sc);
+void dwc1000_setup_rxfilter(struct dwc_softc *sc);
+void dwc1000_get_hwaddr(struct dwc_softc *sc, uint8_t *hwaddr);
+void dwc1000_harvest_stats(struct dwc_softc *sc);
+void dwc1000_intr(struct dwc_softc *softc);
+void dwc1000_intr_disable(struct dwc_softc *sc);
+
+#endif	/* __DWC1000_CORE_H__ */
diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c
new file mode 100644
index 000000000000..c91036f5a714
--- /dev/null
+++ b/sys/dev/dwc/dwc1000_dma.c
@@ -0,0 +1,887 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/rman.h>
+#include <sys/socket.h>
+
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+#include <net/if_var.h>
+
+#include <machine/bus.h>
+
+#include <dev/extres/clk/clk.h>
+#include <dev/extres/hwreset/hwreset.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/dwc/if_dwcvar.h>
+#include <dev/dwc/dwc1000_reg.h>
+#include <dev/dwc/dwc1000_dma.h>
+
+#define	WATCHDOG_TIMEOUT_SECS	5
+#define	DMA_RESET_TIMEOUT	100
+
+/* TX descriptors - TDESC0 is almost unified */
+#define	TDESC0_OWN		(1U << 31)
+#define	TDESC0_IHE		(1U << 16)	/* IP Header Error */
+#define	TDESC0_ES		(1U << 15)	/* Error Summary */
+#define	TDESC0_JT		(1U << 14)	/* Jabber Timeout */
+#define	TDESC0_FF		(1U << 13)	/* Frame Flushed */
+#define	TDESC0_PCE		(1U << 12)	/* Payload Checksum Error */
+#define	TDESC0_LOC		(1U << 11)	/* Loss of Carrier */
+#define	TDESC0_NC		(1U << 10)	/* No Carrier */
+#define	TDESC0_LC		(1U <<  9)	/* Late Collision */
+#define	TDESC0_EC		(1U <<  8)	/* Excessive Collision */
+#define	TDESC0_VF		(1U <<  7)	/* VLAN Frame */
+#define	TDESC0_CC_MASK		0xf
+#define	TDESC0_CC_SHIFT		3		/* Collision Count */
+#define	TDESC0_ED		(1U <<  2)	/* Excessive Deferral */
+#define	TDESC0_UF		(1U <<  1)	/* Underflow Error */
+#define	TDESC0_DB		(1U <<  0)	/* Deferred Bit */
+/* TX descriptors - TDESC0 extended format only */
+#define	ETDESC0_IC		(1U << 30)	/* Interrupt on Completion */
+#define	ETDESC0_LS		(1U << 29)	/* Last Segment */
+#define	ETDESC0_FS		(1U << 28)	/* First Segment */
+#define	ETDESC0_DC		(1U << 27)	/* Disable CRC */
+#define	ETDESC0_DP		(1U << 26)	/* Disable Padding */
+#define	ETDESC0_CIC_NONE	(0U << 22)	/* Checksum Insertion Control */
+#define	ETDESC0_CIC_HDR		(1U << 22)
+#define	ETDESC0_CIC_SEG 	(2U << 22)
+#define	ETDESC0_CIC_FULL	(3U << 22)
+#define	ETDESC0_TER		(1U << 21)	/* Transmit End of Ring */
+#define	ETDESC0_TCH		(1U << 20)	/* Second Address Chained */
+
+/* TX descriptors - TDESC1 normal format */
+#define	NTDESC1_IC		(1U << 31)	/* Interrupt on Completion */
+#define	NTDESC1_LS		(1U << 30)	/* Last Segment */
+#define	NTDESC1_FS		(1U << 29)	/* First Segment */
+#define	NTDESC1_CIC_NONE	(0U << 27)	/* Checksum Insertion Control */
+#define	NTDESC1_CIC_HDR		(1U << 27)
+#define	NTDESC1_CIC_SEG 	(2U << 27)
+#define	NTDESC1_CIC_FULL	(3U << 27)
+#define	NTDESC1_DC		(1U << 26)	/* Disable CRC */
+#define	NTDESC1_TER		(1U << 25)	/* Transmit End of Ring */
+#define	NTDESC1_TCH		(1U << 24)	/* Second Address Chained */
+/* TX descriptors - TDESC1 extended format */
+#define	ETDESC1_DP		(1U << 23)	/* Disable Padding */
+#define	ETDESC1_TBS2_MASK	0x7ff
+#define	ETDESC1_TBS2_SHIFT	11		/* Receive Buffer 2 Size */
+#define	ETDESC1_TBS1_MASK	0x7ff
+#define	ETDESC1_TBS1_SHIFT	0		/* Receive Buffer 1 Size */
+
+/* RX descriptor - RDESC0 is unified */
+#define	RDESC0_OWN		(1U << 31)
+#define	RDESC0_AFM		(1U << 30)	/* Dest. Address Filter Fail */
+#define	RDESC0_FL_MASK		0x3fff
+#define	RDESC0_FL_SHIFT		16		/* Frame Length */
+#define	RDESC0_ES		(1U << 15)	/* Error Summary */
+#define	RDESC0_DE		(1U << 14)	/* Descriptor Error */
+#define	RDESC0_SAF		(1U << 13)	/* Source Address Filter Fail */
+#define	RDESC0_LE		(1U << 12)	/* Length Error */
+#define	RDESC0_OE		(1U << 11)	/* Overflow Error */
+#define	RDESC0_VLAN		(1U << 10)	/* VLAN Tag */
+#define	RDESC0_FS		(1U <<  9)	/* First Descriptor */
+#define	RDESC0_LS		(1U <<  8)	/* Last Descriptor */
+#define	RDESC0_ICE		(1U <<  7)	/* IPC Checksum Error */
+#define	RDESC0_LC		(1U <<  6)	/* Late Collision */
+#define	RDESC0_FT		(1U <<  5)	/* Frame Type */
+#define	RDESC0_RWT		(1U <<  4)	/* Receive Watchdog Timeout */
+#define	RDESC0_RE		(1U <<  3)	/* Receive Error */
+#define	RDESC0_DBE		(1U <<  2)	/* Dribble Bit Error */
+#define	RDESC0_CE		(1U <<  1)	/* CRC Error */
+#define	RDESC0_PCE		(1U <<  0)	/* Payload Checksum Error */
+#define	RDESC0_RXMA		(1U <<  0)	/* Rx MAC Address */
+
+/* RX descriptors - RDESC1 normal format */
+#define	NRDESC1_DIC		(1U << 31)	/* Disable Intr on Completion */
+#define	NRDESC1_RER		(1U << 25)	/* Receive End of Ring */
+#define	NRDESC1_RCH		(1U << 24)	/* Second Address Chained */
+#define	NRDESC1_RBS2_MASK	0x7ff
+#define	NRDESC1_RBS2_SHIFT	11		/* Receive Buffer 2 Size */
+#define	NRDESC1_RBS1_MASK	0x7ff
+#define	NRDESC1_RBS1_SHIFT	0		/* Receive Buffer 1 Size */
+
+/* RX descriptors - RDESC1 enhanced format */
+#define	ERDESC1_DIC		(1U << 31)	/* Disable Intr on Completion */
+#define	ERDESC1_RBS2_MASK	0x7ffff
+#define	ERDESC1_RBS2_SHIFT	16		/* Receive Buffer 2 Size */
+#define	ERDESC1_RER		(1U << 15)	/* Receive End of Ring */
+#define	ERDESC1_RCH		(1U << 14)	/* Second Address Chained */
+#define	ERDESC1_RBS1_MASK	0x7ffff
+#define	ERDESC1_RBS1_SHIFT	0		/* Receive Buffer 1 Size */
+
+/*
+ * The hardware imposes alignment restrictions on various objects involved in
+ * DMA transfers.  These values are expressed in bytes (not bits).
+ */
+#define	DWC_DESC_RING_ALIGN	2048
+
+static inline uint32_t
+next_txidx(struct dwc_softc *sc, uint32_t curidx)
+{
+
+	return ((curidx + 1) % TX_DESC_COUNT);
+}
+
+static inline uint32_t
+next_rxidx(struct dwc_softc *sc, uint32_t curidx)
+{
+
+	return ((curidx + 1) % RX_DESC_COUNT);
+}
+
+static void
+dwc_get1paddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
+{
+
+	if (error != 0)
+		return;
+	*(bus_addr_t *)arg = segs[0].ds_addr;
+}
+
+inline static void
+txdesc_clear(struct dwc_softc *sc, int idx)
+{
+
+	sc->tx_desccount--;
+	sc->txdesc_ring[idx].addr1 = (uint32_t)(0);
+	sc->txdesc_ring[idx].desc0 = 0;
+	sc->txdesc_ring[idx].desc1 = 0;
+}
+
+inline static void
+txdesc_setup(struct dwc_softc *sc, int idx, bus_addr_t paddr,
+  uint32_t len, uint32_t flags, bool first, bool last)
+{
+	uint32_t desc0, desc1;
+
+	if (!sc->dma_ext_desc) {
+		desc0 = 0;
+		desc1 = NTDESC1_TCH | len | flags;
+		if (first)
+			desc1 |=  NTDESC1_FS;
+		if (last)
+			desc1 |= NTDESC1_LS | NTDESC1_IC;
+	} else {
+		desc0 = ETDESC0_TCH | flags;
+		if (first)
+			desc0 |= ETDESC0_FS;
+		if (last)
+			desc0 |= ETDESC0_LS | ETDESC0_IC;
+		desc1 = len;
+	}
+	++sc->tx_desccount;
+	sc->txdesc_ring[idx].addr1 = (uint32_t)(paddr);
+	sc->txdesc_ring[idx].desc0 = desc0;
+	sc->txdesc_ring[idx].desc1 = desc1;
+	wmb();
+	sc->txdesc_ring[idx].desc0 |= TDESC0_OWN;
+}
+
+inline static uint32_t
+rxdesc_setup(struct dwc_softc *sc, int idx, bus_addr_t paddr)
+{
+	uint32_t nidx;
+
+	sc->rxdesc_ring[idx].addr1 = (uint32_t)paddr;
+	nidx = next_rxidx(sc, idx);
+	sc->rxdesc_ring[idx].addr2 = sc->rxdesc_ring_paddr +
+	    (nidx * sizeof(struct dwc_hwdesc));
+	if (!sc->dma_ext_desc)
+		sc->rxdesc_ring[idx].desc1 = NRDESC1_RCH |
+		    MIN(MCLBYTES, NRDESC1_RBS1_MASK);
+	else
+		sc->rxdesc_ring[idx].desc1 = ERDESC1_RCH |
+		    MIN(MCLBYTES, ERDESC1_RBS1_MASK);
+
+	wmb();
+	sc->rxdesc_ring[idx].desc0 = RDESC0_OWN;
+	return (nidx);
+}
+
+int
+dma1000_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp)
+{
+	struct bus_dma_segment segs[TX_MAP_MAX_SEGS];
+	int error, nsegs;
+	struct mbuf * m;
+	uint32_t flags = 0;
+	int i;
+	int last;
+
+	error = bus_dmamap_load_mbuf_sg(sc->txbuf_tag, sc->txbuf_map[idx].map,
+	    *mp, segs, &nsegs, 0);
+	if (error == EFBIG) {
+		/*
+		 * The map may be partially mapped from the first call.
+		 * Make sure to reset it.
+		 */
+		bus_dmamap_unload(sc->txbuf_tag, sc->txbuf_map[idx].map);
+		if ((m = m_defrag(*mp, M_NOWAIT)) == NULL)
+			return (ENOMEM);
+		*mp = m;
+		error = bus_dmamap_load_mbuf_sg(sc->txbuf_tag, sc->txbuf_map[idx].map,
+		    *mp, segs, &nsegs, 0);
+	}
+	if (error != 0)
+		return (ENOMEM);
+
+	if (sc->tx_desccount + nsegs > TX_DESC_COUNT) {
+		bus_dmamap_unload(sc->txbuf_tag, sc->txbuf_map[idx].map);
+		return (ENOMEM);
+	}
+
+	m = *mp;
+
+	if ((m->m_pkthdr.csum_flags & CSUM_IP) != 0) {
+		if ((m->m_pkthdr.csum_flags & (CSUM_TCP|CSUM_UDP)) != 0) {
+			if (!sc->dma_ext_desc)
+				flags = NTDESC1_CIC_FULL;
+			else
+				flags = ETDESC0_CIC_FULL;
+		} else {
+			if (!sc->dma_ext_desc)
+				flags = NTDESC1_CIC_HDR;
+			else
+				flags = ETDESC0_CIC_HDR;
+		}
+	}
+
+	bus_dmamap_sync(sc->txbuf_tag, sc->txbuf_map[idx].map,
+	    BUS_DMASYNC_PREWRITE);
+
+	sc->txbuf_map[idx].mbuf = m;
+
+	for (i = 0; i < nsegs; i++) {
+		txdesc_setup(sc, sc->tx_desc_head,
+		    segs[i].ds_addr, segs[i].ds_len,
+		    (i == 0) ? flags : 0, /* only first desc needs flags */
+		    (i == 0),
+		    (i == nsegs - 1));
+		last = sc->tx_desc_head;
+		sc->tx_desc_head = next_txidx(sc, sc->tx_desc_head);
+	}
+
+	sc->txbuf_map[idx].last_desc_idx = last;
+
+	return (0);
+}
+
+static int
+dma1000_setup_rxbuf(struct dwc_softc *sc, int idx, struct mbuf *m)
+{
+	struct bus_dma_segment seg;
+	int error, nsegs;
+
+	m_adj(m, ETHER_ALIGN);
+
+	error = bus_dmamap_load_mbuf_sg(sc->rxbuf_tag, sc->rxbuf_map[idx].map,
+	    m, &seg, &nsegs, 0);
+	if (error != 0)
+		return (error);
+
+	KASSERT(nsegs == 1, ("%s: %d segments returned!", __func__, nsegs));
+
+	bus_dmamap_sync(sc->rxbuf_tag, sc->rxbuf_map[idx].map,
+	    BUS_DMASYNC_PREREAD);
+
+	sc->rxbuf_map[idx].mbuf = m;
+	rxdesc_setup(sc, idx, seg.ds_addr);
+
+	return (0);
+}
+
+static struct mbuf *
+dwc_alloc_mbufcl(struct dwc_softc *sc)
+{
+	struct mbuf *m;
+
+	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+	if (m != NULL)
+		m->m_pkthdr.len = m->m_len = m->m_ext.ext_size;
+
+	return (m);
+}
+
+static struct mbuf *
+dwc_rxfinish_one(struct dwc_softc *sc, struct dwc_hwdesc *desc,
+    struct dwc_bufmap *map)
+{
+	if_t ifp;
+	struct mbuf *m, *m0;
+	int len;
+	uint32_t rdesc0;
+
+	m = map->mbuf;
+	ifp = sc->ifp;
+	rdesc0 = desc ->desc0;
+
+	if ((rdesc0 & (RDESC0_FS | RDESC0_LS)) !=
+		    (RDESC0_FS | RDESC0_LS)) {
+		/*
+		 * Something very wrong happens. The whole packet should be
+		 * recevied in one descriptr. Report problem.
+		 */
+		device_printf(sc->dev,
+		    "%s: RX descriptor without FIRST and LAST bit set: 0x%08X",
+		    __func__, rdesc0);
+		return (NULL);
+	}
+
+	len = (rdesc0 >> RDESC0_FL_SHIFT) & RDESC0_FL_MASK;
+	if (len < 64) {
+		/*
+		 * Lenght is invalid, recycle old mbuf
+		 * Probably impossible case
+		 */
+		return (NULL);
+	}
+
+	/* Allocate new buffer */
+	m0 = dwc_alloc_mbufcl(sc);
+	if (m0 == NULL) {
+		/* no new mbuf available, recycle old */
+		if_inc_counter(sc->ifp, IFCOUNTER_IQDROPS, 1);
+		return (NULL);
+	}
+	/* Do dmasync for newly received packet */
+	bus_dmamap_sync(sc->rxbuf_tag, map->map, BUS_DMASYNC_POSTREAD);
+	bus_dmamap_unload(sc->rxbuf_tag, map->map);
+
+	/* Received packet is valid, process it */
+	m->m_pkthdr.rcvif = ifp;
+	m->m_pkthdr.len = len;
+	m->m_len = len;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
+
+	if ((if_getcapenable(ifp) & IFCAP_RXCSUM) != 0 &&
+	  (rdesc0 & RDESC0_FT) != 0) {
+		m->m_pkthdr.csum_flags = CSUM_IP_CHECKED;
+		if ((rdesc0 & RDESC0_ICE) == 0)
+			m->m_pkthdr.csum_flags |= CSUM_IP_VALID;
+		if ((rdesc0 & RDESC0_PCE) == 0) {
+			m->m_pkthdr.csum_flags |=
+				CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
+			m->m_pkthdr.csum_data = 0xffff;
+		}
+	}
+
+	/* Remove trailing FCS */
+	m_adj(m, -ETHER_CRC_LEN);
+
+	DWC_UNLOCK(sc);
+	if_input(ifp, m);
+	DWC_LOCK(sc);
+	return (m0);
+}
+
+void
+dma1000_txfinish_locked(struct dwc_softc *sc)
+{
+	struct dwc_bufmap *bmap;
+	struct dwc_hwdesc *desc;
+	if_t ifp;
+	int idx, last_idx;
+	bool map_finished;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	ifp = sc->ifp;
+	/* check if all descriptors of the map are done */
+	while (sc->tx_map_tail != sc->tx_map_head) {
+		map_finished = true;
+		bmap = &sc->txbuf_map[sc->tx_map_tail];
+		idx = sc->tx_desc_tail;
+		last_idx = next_txidx(sc, bmap->last_desc_idx);
+		while (idx != last_idx) {
+			desc = &sc->txdesc_ring[idx];
+			if ((desc->desc0 & TDESC0_OWN) != 0) {
+				map_finished = false;
+				break;
+			}
+			idx = next_txidx(sc, idx);
+		}
+
+		if (!map_finished)
+			break;
+		bus_dmamap_sync(sc->txbuf_tag, bmap->map,
+		    BUS_DMASYNC_POSTWRITE);
+		bus_dmamap_unload(sc->txbuf_tag, bmap->map);
+		m_freem(bmap->mbuf);
+		bmap->mbuf = NULL;
+		sc->tx_mapcount--;
+		while (sc->tx_desc_tail != last_idx) {
+			txdesc_clear(sc, sc->tx_desc_tail);
+			sc->tx_desc_tail = next_txidx(sc, sc->tx_desc_tail);
+		}
+		sc->tx_map_tail = next_txidx(sc, sc->tx_map_tail);
+		if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+	}
+
+	/* If there are no buffers outstanding, muzzle the watchdog. */
+	if (sc->tx_desc_tail == sc->tx_desc_head) {
+		sc->tx_watchdog_count = 0;
+	}
+}
+
+void
+dma1000_txstart(struct dwc_softc *sc)
+{
+	int enqueued;
+	struct mbuf *m;
+
+	enqueued = 0;
+
+	for (;;) {
+		if (sc->tx_desccount > (TX_DESC_COUNT - TX_MAP_MAX_SEGS  + 1)) {
+			if_setdrvflagbits(sc->ifp, IFF_DRV_OACTIVE, 0);
+			break;
+		}
+
+		if (sc->tx_mapcount == (TX_MAP_COUNT - 1)) {
+			if_setdrvflagbits(sc->ifp, IFF_DRV_OACTIVE, 0);
+			break;
+		}
+
+		m = if_dequeue(sc->ifp);
+		if (m == NULL)
+			break;
+		if (dma1000_setup_txbuf(sc, sc->tx_map_head, &m) != 0) {
+			if_sendq_prepend(sc->ifp, m);
+			if_setdrvflagbits(sc->ifp, IFF_DRV_OACTIVE, 0);
+			break;
+		}
+		bpf_mtap_if(sc->ifp, m);
+		sc->tx_map_head = next_txidx(sc, sc->tx_map_head);
+		sc->tx_mapcount++;
+		++enqueued;
+	}
+
+	if (enqueued != 0) {
+		WRITE4(sc, TRANSMIT_POLL_DEMAND, 0x1);
+		sc->tx_watchdog_count = WATCHDOG_TIMEOUT_SECS;
+	}
+}
+
+void
+dma1000_rxfinish_locked(struct dwc_softc *sc)
+{
+	struct mbuf *m;
+	int error, idx;
+	struct dwc_hwdesc *desc;
+
+	DWC_ASSERT_LOCKED(sc);
+	for (;;) {
+		idx = sc->rx_idx;
+		desc = sc->rxdesc_ring + idx;
+		if ((desc->desc0 & RDESC0_OWN) != 0)
+			break;
+
+		m = dwc_rxfinish_one(sc, desc, sc->rxbuf_map + idx);
+		if (m == NULL) {
+			wmb();
+			desc->desc0 = RDESC0_OWN;
+		} else {
+			/* We cannot create hole in RX ring */
+			error = dma1000_setup_rxbuf(sc, idx, m);
+			if (error != 0)
+				panic("dma1000_setup_rxbuf failed:  error %d\n",
+				    error);
+
+		}
+		sc->rx_idx = next_rxidx(sc, sc->rx_idx);
+	}
+}
+
+/*
+ * Start the DMA controller
+ */
+void
+dma1000_start(struct dwc_softc *sc)
+{
+	uint32_t reg;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	/* Initializa DMA and enable transmitters */
+	reg = READ4(sc, OPERATION_MODE);
+	reg |= (MODE_TSF | MODE_OSF | MODE_FUF);
+	reg &= ~(MODE_RSF);
+	reg |= (MODE_RTC_LEV32 << MODE_RTC_SHIFT);
+	WRITE4(sc, OPERATION_MODE, reg);
+
+	WRITE4(sc, INTERRUPT_ENABLE, INT_EN_DEFAULT);
+
+	/* Start DMA */
+	reg = READ4(sc, OPERATION_MODE);
+	reg |= (MODE_ST | MODE_SR);
+	WRITE4(sc, OPERATION_MODE, reg);
+}
+
+/*
+ * Stop the DMA controller
+ */
+void
+dma1000_stop(struct dwc_softc *sc)
+{
+	uint32_t reg;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	/* Stop DMA TX */
+	reg = READ4(sc, OPERATION_MODE);
+	reg &= ~(MODE_ST);
+	WRITE4(sc, OPERATION_MODE, reg);
+
+	/* Flush TX */
+	reg = READ4(sc, OPERATION_MODE);
+	reg |= (MODE_FTF);
+	WRITE4(sc, OPERATION_MODE, reg);
+
+	/* Stop DMA RX */
+	reg = READ4(sc, OPERATION_MODE);
+	reg &= ~(MODE_SR);
+	WRITE4(sc, OPERATION_MODE, reg);
+}
+
+int
+dma1000_reset(struct dwc_softc *sc)
+{
+	uint32_t reg;
+	int i;
+
+	reg = READ4(sc, BUS_MODE);
+	reg |= (BUS_MODE_SWR);
+	WRITE4(sc, BUS_MODE, reg);
+
+	for (i = 0; i < DMA_RESET_TIMEOUT; i++) {
+		if ((READ4(sc, BUS_MODE) & BUS_MODE_SWR) == 0)
+			break;
+		DELAY(10);
+	}
+	if (i >= DMA_RESET_TIMEOUT) {
+		return (ENXIO);
+	}
+
+	return (0);
+}
+
+/*
+ * Create the bus_dma resources
+ */
+int
+dma1000_init(struct dwc_softc *sc)
+{
+	struct mbuf *m;
+	uint32_t reg;
+	int error;
+	int nidx;
+	int idx;
+
+	reg = BUS_MODE_USP;
+	if (!sc->nopblx8)
+		reg |= BUS_MODE_EIGHTXPBL;
+	reg |= (sc->txpbl << BUS_MODE_PBL_SHIFT);
+	reg |= (sc->rxpbl << BUS_MODE_RPBL_SHIFT);
+	if (sc->fixed_burst)
+		reg |= BUS_MODE_FIXEDBURST;
+	if (sc->mixed_burst)
+		reg |= BUS_MODE_MIXEDBURST;
+	if (sc->aal)
+		reg |= BUS_MODE_AAL;
+
+	WRITE4(sc, BUS_MODE, reg);
+
+	reg = READ4(sc, HW_FEATURE);
+	if (reg & HW_FEATURE_EXT_DESCRIPTOR)
+		sc->dma_ext_desc = true;
+
+	/*
+	 * DMA must be stop while changing descriptor list addresses.
+	 */
+	reg = READ4(sc, OPERATION_MODE);
+	reg &= ~(MODE_ST | MODE_SR);
+	WRITE4(sc, OPERATION_MODE, reg);
+
+	/*
+	 * Set up TX descriptor ring, descriptors, and dma maps.
+	 */
+	error = bus_dma_tag_create(
+	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
+	    DWC_DESC_RING_ALIGN, 0,	/* alignment, boundary */
+	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
+	    BUS_SPACE_MAXADDR,		/* highaddr */
+	    NULL, NULL,			/* filter, filterarg */
+	    TX_DESC_SIZE, 1, 		/* maxsize, nsegments */
+	    TX_DESC_SIZE,		/* maxsegsize */
+	    0,				/* flags */
+	    NULL, NULL,			/* lockfunc, lockarg */
+	    &sc->txdesc_tag);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not create TX ring DMA tag.\n");
+		goto out;
+	}
+
+	error = bus_dmamem_alloc(sc->txdesc_tag, (void**)&sc->txdesc_ring,
+	    BUS_DMA_COHERENT | BUS_DMA_WAITOK | BUS_DMA_ZERO,
+	    &sc->txdesc_map);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not allocate TX descriptor ring.\n");
+		goto out;
+	}
+
+	error = bus_dmamap_load(sc->txdesc_tag, sc->txdesc_map,
+	    sc->txdesc_ring, TX_DESC_SIZE, dwc_get1paddr,
+	    &sc->txdesc_ring_paddr, 0);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not load TX descriptor ring map.\n");
+		goto out;
+	}
+
+	for (idx = 0; idx < TX_DESC_COUNT; idx++) {
+		nidx = next_txidx(sc, idx);
+		sc->txdesc_ring[idx].addr2 = sc->txdesc_ring_paddr +
+		    (nidx * sizeof(struct dwc_hwdesc));
+	}
+
+	error = bus_dma_tag_create(
+	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
+	    1, 0,			/* alignment, boundary */
+	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
+	    BUS_SPACE_MAXADDR,		/* highaddr */
+	    NULL, NULL,			/* filter, filterarg */
+	    MCLBYTES*TX_MAP_MAX_SEGS,	/* maxsize */
+	    TX_MAP_MAX_SEGS,		/* nsegments */
+	    MCLBYTES,			/* maxsegsize */
+	    0,				/* flags */
+	    NULL, NULL,			/* lockfunc, lockarg */
+	    &sc->txbuf_tag);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not create TX ring DMA tag.\n");
+		goto out;
+	}
+
+	for (idx = 0; idx < TX_MAP_COUNT; idx++) {
+		error = bus_dmamap_create(sc->txbuf_tag, BUS_DMA_COHERENT,
+		    &sc->txbuf_map[idx].map);
+		if (error != 0) {
+			device_printf(sc->dev,
+			    "could not create TX buffer DMA map.\n");
+			goto out;
+		}
+	}
+
+	for (idx = 0; idx < TX_DESC_COUNT; idx++)
+		txdesc_clear(sc, idx);
+
+	WRITE4(sc, TX_DESCR_LIST_ADDR, sc->txdesc_ring_paddr);
+
+	/*
+	 * Set up RX descriptor ring, descriptors, dma maps, and mbufs.
+	 */
+	error = bus_dma_tag_create(
+	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
+	    DWC_DESC_RING_ALIGN, 0,	/* alignment, boundary */
+	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
+	    BUS_SPACE_MAXADDR,		/* highaddr */
+	    NULL, NULL,			/* filter, filterarg */
+	    RX_DESC_SIZE, 1, 		/* maxsize, nsegments */
+	    RX_DESC_SIZE,		/* maxsegsize */
+	    0,				/* flags */
+	    NULL, NULL,			/* lockfunc, lockarg */
+	    &sc->rxdesc_tag);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not create RX ring DMA tag.\n");
+		goto out;
+	}
+
+	error = bus_dmamem_alloc(sc->rxdesc_tag, (void **)&sc->rxdesc_ring,
+	    BUS_DMA_COHERENT | BUS_DMA_WAITOK | BUS_DMA_ZERO,
+	    &sc->rxdesc_map);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not allocate RX descriptor ring.\n");
+		goto out;
+	}
+
+	error = bus_dmamap_load(sc->rxdesc_tag, sc->rxdesc_map,
+	    sc->rxdesc_ring, RX_DESC_SIZE, dwc_get1paddr,
+	    &sc->rxdesc_ring_paddr, 0);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not load RX descriptor ring map.\n");
+		goto out;
+	}
+
+	error = bus_dma_tag_create(
+	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
+	    1, 0,			/* alignment, boundary */
+	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
+	    BUS_SPACE_MAXADDR,		/* highaddr */
+	    NULL, NULL,			/* filter, filterarg */
+	    MCLBYTES, 1, 		/* maxsize, nsegments */
+	    MCLBYTES,			/* maxsegsize */
+	    0,				/* flags */
+	    NULL, NULL,			/* lockfunc, lockarg */
+	    &sc->rxbuf_tag);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not create RX buf DMA tag.\n");
+		goto out;
+	}
+
+	for (idx = 0; idx < RX_DESC_COUNT; idx++) {
+		error = bus_dmamap_create(sc->rxbuf_tag, BUS_DMA_COHERENT,
+		    &sc->rxbuf_map[idx].map);
+		if (error != 0) {
+			device_printf(sc->dev,
+			    "could not create RX buffer DMA map.\n");
+			goto out;
+		}
+		if ((m = dwc_alloc_mbufcl(sc)) == NULL) {
+			device_printf(sc->dev, "Could not alloc mbuf\n");
+			error = ENOMEM;
+			goto out;
+		}
+		if ((error = dma1000_setup_rxbuf(sc, idx, m)) != 0) {
+			device_printf(sc->dev,
+			    "could not create new RX buffer.\n");
+			goto out;
+		}
+	}
+	WRITE4(sc, RX_DESCR_LIST_ADDR, sc->rxdesc_ring_paddr);
+
+out:
+	if (error != 0)
+		return (ENXIO);
+
+	return (0);
+}
+
+/*
+ * Free the bus_dma resources
+ */
+void
+dma1000_free(struct dwc_softc *sc)
+{
+	bus_dmamap_t map;
+	int idx;
+
+	/* Clean up RX DMA resources and free mbufs. */
+	for (idx = 0; idx < RX_DESC_COUNT; ++idx) {
+		if ((map = sc->rxbuf_map[idx].map) != NULL) {
+			bus_dmamap_unload(sc->rxbuf_tag, map);
+			bus_dmamap_destroy(sc->rxbuf_tag, map);
+			m_freem(sc->rxbuf_map[idx].mbuf);
+		}
+	}
+	if (sc->rxbuf_tag != NULL)
+		bus_dma_tag_destroy(sc->rxbuf_tag);
+	if (sc->rxdesc_map != NULL) {
+		bus_dmamap_unload(sc->rxdesc_tag, sc->rxdesc_map);
+		bus_dmamem_free(sc->rxdesc_tag, sc->rxdesc_ring,
+		    sc->rxdesc_map);
+	}
+	if (sc->rxdesc_tag != NULL)
+		bus_dma_tag_destroy(sc->rxdesc_tag);
+
+	/* Clean up TX DMA resources. */
+	for (idx = 0; idx < TX_DESC_COUNT; ++idx) {
+		if ((map = sc->txbuf_map[idx].map) != NULL) {
+			/* TX maps are already unloaded. */
+			bus_dmamap_destroy(sc->txbuf_tag, map);
+		}
+	}
+	if (sc->txbuf_tag != NULL)
+		bus_dma_tag_destroy(sc->txbuf_tag);
+	if (sc->txdesc_map != NULL) {
+		bus_dmamap_unload(sc->txdesc_tag, sc->txdesc_map);
+		bus_dmamem_free(sc->txdesc_tag, sc->txdesc_ring,
+		    sc->txdesc_map);
+	}
+	if (sc->txdesc_tag != NULL)
+		bus_dma_tag_destroy(sc->txdesc_tag);
+}
+
+/*
+ * Interrupt function
+ */
+
+int
+dma1000_intr(struct dwc_softc *sc)
+{
+	uint32_t reg;
+	int rv;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	rv = 0;
+	reg = READ4(sc, DMA_STATUS);
+	if (reg & DMA_STATUS_NIS) {
+		if (reg & DMA_STATUS_RI)
+			dma1000_rxfinish_locked(sc);
+
+		if (reg & DMA_STATUS_TI) {
+			dma1000_txfinish_locked(sc);
+			dma1000_txstart(sc);
+		}
+	}
+
+	if (reg & DMA_STATUS_AIS) {
+		if (reg & DMA_STATUS_FBI) {
+			/* Fatal bus error */
+			rv = EIO;
+		}
+	}
+
+	WRITE4(sc, DMA_STATUS, reg & DMA_STATUS_INTR_MASK);
+	return (rv);
+}
diff --git a/sys/dev/dwc/dwc1000_dma.h b/sys/dev/dwc/dwc1000_dma.h
new file mode 100644
index 000000000000..f0d22a67617f
--- /dev/null
+++ b/sys/dev/dwc/dwc1000_dma.h
@@ -0,0 +1,56 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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.
+ */
+
+#ifndef	__DWC1000_DMA_H__
+#define	 __DWC1000_DMA_H__
+
+/*
+ * A hardware buffer descriptor.  Rx and Tx buffers have the same descriptor
+ * layout, but the bits in the fields have different meanings.
+ */
+struct dwc_hwdesc
+{
+	uint32_t desc0;
+	uint32_t desc1;
+	uint32_t addr1;		/* ptr to first buffer data */
+	uint32_t addr2;		/* ptr to next descriptor / second buffer data*/
+};
+
+int dma1000_init(struct dwc_softc *sc);
+void dma1000_free(struct dwc_softc *sc);
+void dma1000_start(struct dwc_softc *sc);
+void dma1000_stop(struct dwc_softc *sc);
+int dma1000_reset(struct dwc_softc *sc);
+int dma1000_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp);
+void dma1000_txfinish_locked(struct dwc_softc *sc);
+void dma1000_rxfinish_locked(struct dwc_softc *sc);
+void dma1000_txstart(struct dwc_softc *sc);
+int dma1000_intr(struct dwc_softc *sc);
+
+#endif	/* __DWC1000_DMA_H__ */
diff --git a/sys/dev/dwc/if_dwc.h b/sys/dev/dwc/dwc1000_reg.h
similarity index 97%
rename from sys/dev/dwc/if_dwc.h
rename to sys/dev/dwc/dwc1000_reg.h
index 5397b5801596..f581bf135cd8 100644
--- a/sys/dev/dwc/if_dwc.h
+++ b/sys/dev/dwc/dwc1000_reg.h
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
- * All rights reserved.
  *
  * This software was developed by SRI International and the University of
  * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
@@ -32,13 +31,8 @@
  * Register names were taken almost as is from the documentation.
  */
 
-#ifndef __IF_DWC_H__
-#define __IF_DWC_H__
-
-#define	PHY_MODE_UNKNOWN	0x0
-#define	PHY_MODE_RMII		0x1
-#define	PHY_MODE_RGMII		0x2
-#define	PHY_MODE_MII		0x3
+#ifndef __DWC1000_REG_H__
+#define __DWC1000_REG_H__
 
 #define	MAC_CONFIGURATION	0x0
 #define	 CONF_JD		(1 << 22)	/* jabber timer disable */
@@ -219,6 +213,8 @@
 
 /* DMA */
 #define	BUS_MODE		0x1000
+#define	 BUS_MODE_MIXEDBURST	(1 << 26)
+#define	 BUS_MODE_AAL		(1 << 25)
 #define	 BUS_MODE_EIGHTXPBL	(1 << 24) /* Multiplies PBL by 8 */
 #define	 BUS_MODE_USP		(1 << 23)
 #define	 BUS_MODE_RPBL_SHIFT	17 /* Single block transfer size */
@@ -230,7 +226,6 @@
 #define	 BUS_MODE_PRIORXTX_11	0
 #define	 BUS_MODE_PBL_SHIFT	8 /* Single block transfer size */
 #define	 BUS_MODE_SWR		(1 << 0) /* Reset */
-#define	 BUS_MODE_DEFAULT_PBL	8
 #define	TRANSMIT_POLL_DEMAND	0x1004
 #define	RECEIVE_POLL_DEMAND	0x1008
 #define	RX_DESCR_LIST_ADDR	0x100C
@@ -280,7 +275,9 @@
 #define	CURRENT_HOST_RECEIVE_DESCR	0x104C
 #define	CURRENT_HOST_TRANSMIT_BUF_ADDR	0x1050
 #define	CURRENT_HOST_RECEIVE_BUF_ADDR	0x1054
+
 #define	HW_FEATURE			0x1058
+#define	 HW_FEATURE_EXT_DESCRIPTOR	(1 << 24)
 
 #define	DWC_GMAC_NORMAL_DESC		0x1
 #define	DWC_GMAC_EXT_DESC		0x2
@@ -300,4 +297,4 @@
 #define	GMAC_MII_CLK_DIV16		0xe
 #define	GMAC_MII_CLK_DIV18		0xf
 
-#endif	/* __IF_DWC_H__ */
+#endif	/* __DWC1000_REG_H__ */
diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c
index 18e86ac025d4..d212c2db131f 100644
--- a/sys/dev/dwc/if_dwc.c
+++ b/sys/dev/dwc/if_dwc.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
- * All rights reserved.
  *
  * This software was developed by SRI International and the University of
  * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
@@ -61,292 +60,33 @@
 
 #include <machine/bus.h>
 
-#include <dev/dwc/if_dwc.h>
-#include <dev/dwc/if_dwcvar.h>
+#include <dev/extres/clk/clk.h>
+#include <dev/extres/hwreset/hwreset.h>
+
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/mii/mii_fdt.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/hwreset/hwreset.h>
+#include <dev/dwc/if_dwcvar.h>
+#include <dev/dwc/dwc1000_core.h>
+#include <dev/dwc/dwc1000_dma.h>
 
 #include "if_dwc_if.h"
 #include "gpio_if.h"
 #include "miibus_if.h"
 
-#define	READ4(_sc, _reg) \
-	bus_read_4((_sc)->res[0], _reg)
-#define	WRITE4(_sc, _reg, _val) \
-	bus_write_4((_sc)->res[0], _reg, _val)
-
-#define	MAC_RESET_TIMEOUT	100
-#define	WATCHDOG_TIMEOUT_SECS	5
-#define	STATS_HARVEST_INTERVAL	2
-
-#define	DWC_LOCK(sc)			mtx_lock(&(sc)->mtx)
-#define	DWC_UNLOCK(sc)			mtx_unlock(&(sc)->mtx)
-#define	DWC_ASSERT_LOCKED(sc)		mtx_assert(&(sc)->mtx, MA_OWNED)
-#define	DWC_ASSERT_UNLOCKED(sc)		mtx_assert(&(sc)->mtx, MA_NOTOWNED)
-
-/* TX descriptors - TDESC0 is almost unified */
-#define	TDESC0_OWN		(1U << 31)
-#define	TDESC0_IHE		(1U << 16)	/* IP Header Error */
-#define	TDESC0_ES		(1U << 15)	/* Error Summary */
-#define	TDESC0_JT		(1U << 14)	/* Jabber Timeout */
-#define	TDESC0_FF		(1U << 13)	/* Frame Flushed */
-#define	TDESC0_PCE		(1U << 12)	/* Payload Checksum Error */
-#define	TDESC0_LOC		(1U << 11)	/* Loss of Carrier */
-#define	TDESC0_NC		(1U << 10)	/* No Carrier */
-#define	TDESC0_LC		(1U <<  9)	/* Late Collision */
-#define	TDESC0_EC		(1U <<  8)	/* Excessive Collision */
-#define	TDESC0_VF		(1U <<  7)	/* VLAN Frame */
-#define	TDESC0_CC_MASK		0xf
-#define	TDESC0_CC_SHIFT		3		/* Collision Count */
-#define	TDESC0_ED		(1U <<  2)	/* Excessive Deferral */
-#define	TDESC0_UF		(1U <<  1)	/* Underflow Error */
-#define	TDESC0_DB		(1U <<  0)	/* Deferred Bit */
-/* TX descriptors - TDESC0 extended format only */
-#define	ETDESC0_IC		(1U << 30)	/* Interrupt on Completion */
-#define	ETDESC0_LS		(1U << 29)	/* Last Segment */
-#define	ETDESC0_FS		(1U << 28)	/* First Segment */
-#define	ETDESC0_DC		(1U << 27)	/* Disable CRC */
-#define	ETDESC0_DP		(1U << 26)	/* Disable Padding */
-#define	ETDESC0_CIC_NONE	(0U << 22)	/* Checksum Insertion Control */
-#define	ETDESC0_CIC_HDR		(1U << 22)
-#define	ETDESC0_CIC_SEG 	(2U << 22)
-#define	ETDESC0_CIC_FULL	(3U << 22)
-#define	ETDESC0_TER		(1U << 21)	/* Transmit End of Ring */
-#define	ETDESC0_TCH		(1U << 20)	/* Second Address Chained */
-
-/* TX descriptors - TDESC1 normal format */
-#define	NTDESC1_IC		(1U << 31)	/* Interrupt on Completion */
-#define	NTDESC1_LS		(1U << 30)	/* Last Segment */
-#define	NTDESC1_FS		(1U << 29)	/* First Segment */
-#define	NTDESC1_CIC_NONE	(0U << 27)	/* Checksum Insertion Control */
-#define	NTDESC1_CIC_HDR		(1U << 27)
-#define	NTDESC1_CIC_SEG 	(2U << 27)
-#define	NTDESC1_CIC_FULL	(3U << 27)
-#define	NTDESC1_DC		(1U << 26)	/* Disable CRC */
-#define	NTDESC1_TER		(1U << 25)	/* Transmit End of Ring */
-#define	NTDESC1_TCH		(1U << 24)	/* Second Address Chained */
-/* TX descriptors - TDESC1 extended format */
-#define	ETDESC1_DP		(1U << 23)	/* Disable Padding */
-#define	ETDESC1_TBS2_MASK	0x7ff
-#define	ETDESC1_TBS2_SHIFT	11		/* Receive Buffer 2 Size */
-#define	ETDESC1_TBS1_MASK	0x7ff
-#define	ETDESC1_TBS1_SHIFT	0		/* Receive Buffer 1 Size */
-
-/* RX descriptor - RDESC0 is unified */
-#define	RDESC0_OWN		(1U << 31)
-#define	RDESC0_AFM		(1U << 30)	/* Dest. Address Filter Fail */
-#define	RDESC0_FL_MASK		0x3fff
-#define	RDESC0_FL_SHIFT		16		/* Frame Length */
-#define	RDESC0_ES		(1U << 15)	/* Error Summary */
-#define	RDESC0_DE		(1U << 14)	/* Descriptor Error */
-#define	RDESC0_SAF		(1U << 13)	/* Source Address Filter Fail */
-#define	RDESC0_LE		(1U << 12)	/* Length Error */
-#define	RDESC0_OE		(1U << 11)	/* Overflow Error */
-#define	RDESC0_VLAN		(1U << 10)	/* VLAN Tag */
-#define	RDESC0_FS		(1U <<  9)	/* First Descriptor */
-#define	RDESC0_LS		(1U <<  8)	/* Last Descriptor */
-#define	RDESC0_ICE		(1U <<  7)	/* IPC Checksum Error */
-#define	RDESC0_LC		(1U <<  6)	/* Late Collision */
-#define	RDESC0_FT		(1U <<  5)	/* Frame Type */
-#define	RDESC0_RWT		(1U <<  4)	/* Receive Watchdog Timeout */
-#define	RDESC0_RE		(1U <<  3)	/* Receive Error */
-#define	RDESC0_DBE		(1U <<  2)	/* Dribble Bit Error */
-#define	RDESC0_CE		(1U <<  1)	/* CRC Error */
-#define	RDESC0_PCE		(1U <<  0)	/* Payload Checksum Error */
-#define	RDESC0_RXMA		(1U <<  0)	/* Rx MAC Address */
-
-/* RX descriptors - RDESC1 normal format */
-#define	NRDESC1_DIC		(1U << 31)	/* Disable Intr on Completion */
-#define	NRDESC1_RER		(1U << 25)	/* Receive End of Ring */
-#define	NRDESC1_RCH		(1U << 24)	/* Second Address Chained */
-#define	NRDESC1_RBS2_MASK	0x7ff
-#define	NRDESC1_RBS2_SHIFT	11		/* Receive Buffer 2 Size */
-#define	NRDESC1_RBS1_MASK	0x7ff
-#define	NRDESC1_RBS1_SHIFT	0		/* Receive Buffer 1 Size */
-
-/* RX descriptors - RDESC1 enhanced format */
-#define	ERDESC1_DIC		(1U << 31)	/* Disable Intr on Completion */
-#define	ERDESC1_RBS2_MASK	0x7ffff
-#define	ERDESC1_RBS2_SHIFT	16		/* Receive Buffer 2 Size */
-#define	ERDESC1_RER		(1U << 15)	/* Receive End of Ring */
-#define	ERDESC1_RCH		(1U << 14)	/* Second Address Chained */
-#define	ERDESC1_RBS1_MASK	0x7ffff
-#define	ERDESC1_RBS1_SHIFT	0		/* Receive Buffer 1 Size */
-
-/*
- * A hardware buffer descriptor.  Rx and Tx buffers have the same descriptor
- * layout, but the bits in the fields have different meanings.
- */
-struct dwc_hwdesc
-{
-	uint32_t desc0;
-	uint32_t desc1;
-	uint32_t addr1;		/* ptr to first buffer data */
-	uint32_t addr2;		/* ptr to next descriptor / second buffer data*/
-};
-
-
-struct dwc_hash_maddr_ctx {
-	struct dwc_softc *sc;
-	uint32_t hash[8];
-};
-
-/*
- * The hardware imposes alignment restrictions on various objects involved in
- * DMA transfers.  These values are expressed in bytes (not bits).
- */
-#define	DWC_DESC_RING_ALIGN	2048
-
 static struct resource_spec dwc_spec[] = {
 	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
 	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
 	{ -1, 0 }
 };
 
-static void dwc_txfinish_locked(struct dwc_softc *sc);
-static void dwc_rxfinish_locked(struct dwc_softc *sc);
 static void dwc_stop_locked(struct dwc_softc *sc);
-static void dwc_setup_rxfilter(struct dwc_softc *sc);
-static void dwc_setup_core(struct dwc_softc *sc);
-static void dwc_enable_mac(struct dwc_softc *sc, bool enable);
-static void dwc_init_dma(struct dwc_softc *sc);
-static void dwc_stop_dma(struct dwc_softc *sc);
 
 static void dwc_tick(void *arg);
 
-/* Pause time field in the transmitted control frame */
-static int dwc_pause_time = 0xffff;
-TUNABLE_INT("hw.dwc.pause_time", &dwc_pause_time);
-
-/*
- * MIIBUS functions
- */
-
-static int
-dwc_miibus_read_reg(device_t dev, int phy, int reg)
-{
-	struct dwc_softc *sc;
-	uint16_t mii;
-	size_t cnt;
-	int rv = 0;
-
-	sc = device_get_softc(dev);
-
-	mii = ((phy & GMII_ADDRESS_PA_MASK) << GMII_ADDRESS_PA_SHIFT)
-	    | ((reg & GMII_ADDRESS_GR_MASK) << GMII_ADDRESS_GR_SHIFT)
-	    | (sc->mii_clk << GMII_ADDRESS_CR_SHIFT)
-	    | GMII_ADDRESS_GB; /* Busy flag */
-
-	WRITE4(sc, GMII_ADDRESS, mii);
-
-	for (cnt = 0; cnt < 1000; cnt++) {
-		if (!(READ4(sc, GMII_ADDRESS) & GMII_ADDRESS_GB)) {
-			rv = READ4(sc, GMII_DATA);
-			break;
-		}
-		DELAY(10);
-	}
-
-	return rv;
-}
-
-static int
-dwc_miibus_write_reg(device_t dev, int phy, int reg, int val)
-{
-	struct dwc_softc *sc;
-	uint16_t mii;
-	size_t cnt;
-
-	sc = device_get_softc(dev);
-
-	mii = ((phy & GMII_ADDRESS_PA_MASK) << GMII_ADDRESS_PA_SHIFT)
-	    | ((reg & GMII_ADDRESS_GR_MASK) << GMII_ADDRESS_GR_SHIFT)
-	    | (sc->mii_clk << GMII_ADDRESS_CR_SHIFT)
-	    | GMII_ADDRESS_GB | GMII_ADDRESS_GW;
-
-	WRITE4(sc, GMII_DATA, val);
-	WRITE4(sc, GMII_ADDRESS, mii);
-
-	for (cnt = 0; cnt < 1000; cnt++) {
-		if (!(READ4(sc, GMII_ADDRESS) & GMII_ADDRESS_GB)) {
-			break;
-                }
-		DELAY(10);
-	}
-
-	return (0);
-}
-
-static void
-dwc_miibus_statchg(device_t dev)
-{
-	struct dwc_softc *sc;
-	struct mii_data *mii;
-	uint32_t reg;
-
-	/*
-	 * Called by the MII bus driver when the PHY establishes
-	 * link to set the MAC interface registers.
-	 */
-
-	sc = device_get_softc(dev);
-
-	DWC_ASSERT_LOCKED(sc);
-
-	mii = sc->mii_softc;
-
-	if (mii->mii_media_status & IFM_ACTIVE)
-		sc->link_is_up = true;
-	else
-		sc->link_is_up = false;
-
-	reg = READ4(sc, MAC_CONFIGURATION);
-	switch (IFM_SUBTYPE(mii->mii_media_active)) {
-	case IFM_1000_T:
-	case IFM_1000_SX:
-		reg &= ~(CONF_FES | CONF_PS);
-		break;
-	case IFM_100_TX:
-		reg |= (CONF_FES | CONF_PS);
-		break;
-	case IFM_10_T:
-		reg &= ~(CONF_FES);
-		reg |= (CONF_PS);
-		break;
-	case IFM_NONE:
-		sc->link_is_up = false;
-		return;
-	default:
-		sc->link_is_up = false;
-		device_printf(dev, "Unsupported media %u\n",
-		    IFM_SUBTYPE(mii->mii_media_active));
-		return;
-	}
-	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0)
-		reg |= (CONF_DM);
-	else
-		reg &= ~(CONF_DM);
-	WRITE4(sc, MAC_CONFIGURATION, reg);
-
-	reg = FLOW_CONTROL_UP;
-	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_TXPAUSE) != 0)
-		reg |= FLOW_CONTROL_TX;
-	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_RXPAUSE) != 0)
-		reg |= FLOW_CONTROL_RX;
-	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0)
-		reg |= dwc_pause_time << FLOW_CONTROL_PT_SHIFT;
-	WRITE4(sc, FLOW_CONTROL, reg);
-
-	IF_DWC_SET_SPEED(dev, IFM_SUBTYPE(mii->mii_media_active));
-
-}
-
 /*
  * Media functions
  */
@@ -387,708 +127,6 @@ dwc_media_change(if_t ifp)
 	return (error);
 }
 
-/*
- * Core functions
- */
-
-static const uint8_t nibbletab[] = {
-	/* 0x0 0000 -> 0000 */  0x0,
-	/* 0x1 0001 -> 1000 */  0x8,
-	/* 0x2 0010 -> 0100 */  0x4,
-	/* 0x3 0011 -> 1100 */  0xc,
-	/* 0x4 0100 -> 0010 */  0x2,
-	/* 0x5 0101 -> 1010 */  0xa,
-	/* 0x6 0110 -> 0110 */  0x6,
-	/* 0x7 0111 -> 1110 */  0xe,
-	/* 0x8 1000 -> 0001 */  0x1,
-	/* 0x9 1001 -> 1001 */  0x9,
-	/* 0xa 1010 -> 0101 */  0x5,
-	/* 0xb 1011 -> 1101 */  0xd,
-	/* 0xc 1100 -> 0011 */  0x3,
-	/* 0xd 1101 -> 1011 */  0xb,
-	/* 0xe 1110 -> 0111 */  0x7,
-	/* 0xf 1111 -> 1111 */  0xf, };
-
-static uint8_t
-bitreverse(uint8_t x)
-{
-
-	return (nibbletab[x & 0xf] << 4) | nibbletab[x >> 4];
-}
-
-static u_int
-dwc_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt)
-{
-	struct dwc_hash_maddr_ctx *ctx = arg;
-	uint32_t crc, hashbit, hashreg;
-	uint8_t val;
-
-	crc = ether_crc32_le(LLADDR(sdl), ETHER_ADDR_LEN);
-	/* Take lower 8 bits and reverse it */
-	val = bitreverse(~crc & 0xff);
-	if (ctx->sc->mactype != DWC_GMAC_EXT_DESC)
-		val >>= 2; /* Only need lower 6 bits */
-	hashreg = (val >> 5);
-	hashbit = (val & 31);
-	ctx->hash[hashreg] |= (1 << hashbit);
-
-	return (1);
-}
-
-static void
-dwc_setup_rxfilter(struct dwc_softc *sc)
-{
-	struct dwc_hash_maddr_ctx ctx;
-	if_t ifp;
-	uint8_t *eaddr;
-	uint32_t ffval, hi, lo;
-	int nhash, i;
-
-	DWC_ASSERT_LOCKED(sc);
-
-	ifp = sc->ifp;
-	nhash = sc->mactype != DWC_GMAC_EXT_DESC ? 2 : 8;
-
-	/*
-	 * Set the multicast (group) filter hash.
-	 */
-	if ((if_getflags(ifp) & IFF_ALLMULTI) != 0) {
-		ffval = (FRAME_FILTER_PM);
-		for (i = 0; i < nhash; i++)
-			ctx.hash[i] = ~0;
-	} else {
-		ffval = (FRAME_FILTER_HMC);
-		for (i = 0; i < nhash; i++)
-			ctx.hash[i] = 0;
-		ctx.sc = sc;
-		if_foreach_llmaddr(ifp, dwc_hash_maddr, &ctx);
-	}
-
-	/*
-	 * Set the individual address filter hash.
-	 */
-	if ((if_getflags(ifp) & IFF_PROMISC) != 0)
-		ffval |= (FRAME_FILTER_PR);
-
-	/*
-	 * Set the primary address.
-	 */
-	eaddr = if_getlladdr(ifp);
-	lo = eaddr[0] | (eaddr[1] << 8) | (eaddr[2] << 16) |
-	    (eaddr[3] << 24);
-	hi = eaddr[4] | (eaddr[5] << 8);
-	WRITE4(sc, MAC_ADDRESS_LOW(0), lo);
-	WRITE4(sc, MAC_ADDRESS_HIGH(0), hi);
-	WRITE4(sc, MAC_FRAME_FILTER, ffval);
-	if (sc->mactype != DWC_GMAC_EXT_DESC) {
-		WRITE4(sc, GMAC_MAC_HTLOW, ctx.hash[0]);
-		WRITE4(sc, GMAC_MAC_HTHIGH, ctx.hash[1]);
-	} else {
-		for (i = 0; i < nhash; i++)
-			WRITE4(sc, HASH_TABLE_REG(i), ctx.hash[i]);
-	}
-}
-
-static void
-dwc_setup_core(struct dwc_softc *sc)
-{
-	uint32_t reg;
-
-	DWC_ASSERT_LOCKED(sc);
-
-	/* Enable core */
-	reg = READ4(sc, MAC_CONFIGURATION);
-	reg |= (CONF_JD | CONF_ACS | CONF_BE);
-	WRITE4(sc, MAC_CONFIGURATION, reg);
-}
-
-static void
-dwc_enable_mac(struct dwc_softc *sc, bool enable)
-{
-	uint32_t reg;
-
-	DWC_ASSERT_LOCKED(sc);
-	reg = READ4(sc, MAC_CONFIGURATION);
-	if (enable)
-		reg |= CONF_TE | CONF_RE;
-	else
-		reg &= ~(CONF_TE | CONF_RE);
-	WRITE4(sc, MAC_CONFIGURATION, reg);
-}
-
-static void
-dwc_enable_csum_offload(struct dwc_softc *sc)
-{
-	uint32_t reg;
-
-	DWC_ASSERT_LOCKED(sc);
-	reg = READ4(sc, MAC_CONFIGURATION);
-	if ((if_getcapenable(sc->ifp) & IFCAP_RXCSUM) != 0)
-		reg |= CONF_IPC;
-	else
-		reg &= ~CONF_IPC;
-	WRITE4(sc, MAC_CONFIGURATION, reg);
-}
-
-static void
-dwc_get_hwaddr(struct dwc_softc *sc, uint8_t *hwaddr)
-{
-	uint32_t hi, lo, rnd;
-
-	/*
-	 * Try to recover a MAC address from the running hardware. If there's
-	 * something non-zero there, assume the bootloader did the right thing
-	 * and just use it.
-	 *
-	 * Otherwise, set the address to a convenient locally assigned address,
-	 * 'bsd' + random 24 low-order bits.  'b' is 0x62, which has the locally
-	 * assigned bit set, and the broadcast/multicast bit clear.
-	 */
-	lo = READ4(sc, MAC_ADDRESS_LOW(0));
-	hi = READ4(sc, MAC_ADDRESS_HIGH(0)) & 0xffff;
-	if ((lo != 0xffffffff) || (hi != 0xffff)) {
-		hwaddr[0] = (lo >>  0) & 0xff;
-		hwaddr[1] = (lo >>  8) & 0xff;
-		hwaddr[2] = (lo >> 16) & 0xff;
-		hwaddr[3] = (lo >> 24) & 0xff;
-		hwaddr[4] = (hi >>  0) & 0xff;
-		hwaddr[5] = (hi >>  8) & 0xff;
-	} else {
-		rnd = arc4random() & 0x00ffffff;
-		hwaddr[0] = 'b';
-		hwaddr[1] = 's';
-		hwaddr[2] = 'd';
-		hwaddr[3] = rnd >> 16;
-		hwaddr[4] = rnd >>  8;
-		hwaddr[5] = rnd >>  0;
-	}
-}
-
-/*
- * DMA functions
- */
-
-static void
-dwc_init_dma(struct dwc_softc *sc)
-{
-	uint32_t reg;
-
-	DWC_ASSERT_LOCKED(sc);
-
-	/* Initializa DMA and enable transmitters */
-	reg = READ4(sc, OPERATION_MODE);
-	reg |= (MODE_TSF | MODE_OSF | MODE_FUF);
-	reg &= ~(MODE_RSF);
-	reg |= (MODE_RTC_LEV32 << MODE_RTC_SHIFT);
-	WRITE4(sc, OPERATION_MODE, reg);
-
-	WRITE4(sc, INTERRUPT_ENABLE, INT_EN_DEFAULT);
-
-	/* Start DMA */
-	reg = READ4(sc, OPERATION_MODE);
-	reg |= (MODE_ST | MODE_SR);
-	WRITE4(sc, OPERATION_MODE, reg);
-}
-
-static void
-dwc_stop_dma(struct dwc_softc *sc)
-{
-	uint32_t reg;
-
-	DWC_ASSERT_LOCKED(sc);
-
-	/* Stop DMA TX */
-	reg = READ4(sc, OPERATION_MODE);
-	reg &= ~(MODE_ST);
-	WRITE4(sc, OPERATION_MODE, reg);
-
-	/* Flush TX */
-	reg = READ4(sc, OPERATION_MODE);
-	reg |= (MODE_FTF);
-	WRITE4(sc, OPERATION_MODE, reg);
-
-	/* Stop DMA RX */
-	reg = READ4(sc, OPERATION_MODE);
-	reg &= ~(MODE_SR);
-	WRITE4(sc, OPERATION_MODE, reg);
-}
-
-static inline uint32_t
-next_rxidx(struct dwc_softc *sc, uint32_t curidx)
-{
-
-	return ((curidx + 1) % RX_DESC_COUNT);
-}
-
-static inline uint32_t
-next_txidx(struct dwc_softc *sc, uint32_t curidx)
-{
-
-	return ((curidx + 1) % TX_DESC_COUNT);
-}
-
-static void
-dwc_get1paddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
-{
-
-	if (error != 0)
-		return;
-	*(bus_addr_t *)arg = segs[0].ds_addr;
-}
-
-inline static void
-dwc_setup_txdesc(struct dwc_softc *sc, int idx, bus_addr_t paddr,
-  uint32_t len, uint32_t flags, bool first, bool last)
-{
-	uint32_t desc0, desc1;
-
-	/* Addr/len 0 means we're clearing the descriptor after xmit done. */
-	if (paddr == 0 || len == 0) {
-		desc0 = 0;
-		desc1 = 0;
-		--sc->tx_desccount;
-	} else {
-		if (sc->mactype != DWC_GMAC_EXT_DESC) {
-			desc0 = 0;
-			desc1 = NTDESC1_TCH | len | flags;
-			if (first)
-				desc1 |=  NTDESC1_FS;
-			if (last)
-				desc1 |= NTDESC1_LS | NTDESC1_IC;
-		} else {
-			desc0 = ETDESC0_TCH | flags;
-			if (first)
-				desc0 |= ETDESC0_FS;
-			if (last)
-				desc0 |= ETDESC0_LS | ETDESC0_IC;
-			desc1 = len;
-		}
-		++sc->tx_desccount;
-	}
-
-	sc->txdesc_ring[idx].addr1 = (uint32_t)(paddr);
-	sc->txdesc_ring[idx].desc0 = desc0;
-	sc->txdesc_ring[idx].desc1 = desc1;
-}
-
-inline static void
-dwc_set_owner(struct dwc_softc *sc, int idx)
-{
-	wmb();
-	sc->txdesc_ring[idx].desc0 |= TDESC0_OWN;
-	wmb();
-}
-
-static int
-dwc_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp)
-{
-	struct bus_dma_segment segs[TX_MAP_MAX_SEGS];
-	int error, nsegs;
-	struct mbuf * m;
-	uint32_t flags = 0;
-	int i;
-	int first, last;
-
-	error = bus_dmamap_load_mbuf_sg(sc->txbuf_tag, sc->txbuf_map[idx].map,
-	    *mp, segs, &nsegs, 0);
-	if (error == EFBIG) {
-		/*
-		 * The map may be partially mapped from the first call.
-		 * Make sure to reset it.
-		 */
-		bus_dmamap_unload(sc->txbuf_tag, sc->txbuf_map[idx].map);
-		if ((m = m_defrag(*mp, M_NOWAIT)) == NULL)
-			return (ENOMEM);
-		*mp = m;
-		error = bus_dmamap_load_mbuf_sg(sc->txbuf_tag, sc->txbuf_map[idx].map,
-		    *mp, segs, &nsegs, 0);
-	}
-	if (error != 0)
-		return (ENOMEM);
-
-	if (sc->tx_desccount + nsegs > TX_DESC_COUNT) {
-		bus_dmamap_unload(sc->txbuf_tag, sc->txbuf_map[idx].map);
-		return (ENOMEM);
-	}
-
-	m = *mp;
-
-	if ((m->m_pkthdr.csum_flags & CSUM_IP) != 0) {
-		if ((m->m_pkthdr.csum_flags & (CSUM_TCP|CSUM_UDP)) != 0) {
-			if (sc->mactype != DWC_GMAC_EXT_DESC)
-				flags = NTDESC1_CIC_FULL;
-			else
-				flags = ETDESC0_CIC_FULL;
-		} else {
-			if (sc->mactype != DWC_GMAC_EXT_DESC)
-				flags = NTDESC1_CIC_HDR;
-			else
-				flags = ETDESC0_CIC_HDR;
-		}
-	}
-
-	bus_dmamap_sync(sc->txbuf_tag, sc->txbuf_map[idx].map,
-	    BUS_DMASYNC_PREWRITE);
-
-	sc->txbuf_map[idx].mbuf = m;
-
-	first = sc->tx_desc_head;
-	for (i = 0; i < nsegs; i++) {
-		dwc_setup_txdesc(sc, sc->tx_desc_head,
-		    segs[i].ds_addr, segs[i].ds_len,
-		    (i == 0) ? flags : 0, /* only first desc needs flags */
-		    (i == 0),
-		    (i == nsegs - 1));
-		if (i > 0)
-			dwc_set_owner(sc, sc->tx_desc_head);
-		last = sc->tx_desc_head;
-		sc->tx_desc_head = next_txidx(sc, sc->tx_desc_head);
-	}
-
-	sc->txbuf_map[idx].last_desc_idx = last;
-
-	dwc_set_owner(sc, first);
-
-	return (0);
-}
-
-inline static uint32_t
-dwc_setup_rxdesc(struct dwc_softc *sc, int idx, bus_addr_t paddr)
-{
-	uint32_t nidx;
-
-	sc->rxdesc_ring[idx].addr1 = (uint32_t)paddr;
-	nidx = next_rxidx(sc, idx);
-	sc->rxdesc_ring[idx].addr2 = sc->rxdesc_ring_paddr +
-	    (nidx * sizeof(struct dwc_hwdesc));
-	if (sc->mactype != DWC_GMAC_EXT_DESC)
-		sc->rxdesc_ring[idx].desc1 = NRDESC1_RCH |
-		    MIN(MCLBYTES, NRDESC1_RBS1_MASK);
-	else
-		sc->rxdesc_ring[idx].desc1 = ERDESC1_RCH |
-		    MIN(MCLBYTES, ERDESC1_RBS1_MASK);
-
-	wmb();
-	sc->rxdesc_ring[idx].desc0 = RDESC0_OWN;
-	wmb();
-	return (nidx);
-}
-
-static int
-dwc_setup_rxbuf(struct dwc_softc *sc, int idx, struct mbuf *m)
-{
-	struct bus_dma_segment seg;
-	int error, nsegs;
-
-	m_adj(m, ETHER_ALIGN);
-
-	error = bus_dmamap_load_mbuf_sg(sc->rxbuf_tag, sc->rxbuf_map[idx].map,
-	    m, &seg, &nsegs, 0);
-	if (error != 0)
-		return (error);
-
-	KASSERT(nsegs == 1, ("%s: %d segments returned!", __func__, nsegs));
-
-	bus_dmamap_sync(sc->rxbuf_tag, sc->rxbuf_map[idx].map,
-	    BUS_DMASYNC_PREREAD);
-
-	sc->rxbuf_map[idx].mbuf = m;
-	dwc_setup_rxdesc(sc, idx, seg.ds_addr);
-
-	return (0);
-}
-
-static struct mbuf *
-dwc_alloc_mbufcl(struct dwc_softc *sc)
-{
-	struct mbuf *m;
-
-	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
-	if (m != NULL)
-		m->m_pkthdr.len = m->m_len = m->m_ext.ext_size;
-
-	return (m);
-}
-
-static struct mbuf *
-dwc_rxfinish_one(struct dwc_softc *sc, struct dwc_hwdesc *desc,
-    struct dwc_bufmap *map)
-{
-	if_t ifp;
-	struct mbuf *m, *m0;
-	int len;
-	uint32_t rdesc0;
-
-	m = map->mbuf;
-	ifp = sc->ifp;
-	rdesc0 = desc ->desc0;
-
-	if ((rdesc0 & (RDESC0_FS | RDESC0_LS)) !=
-		    (RDESC0_FS | RDESC0_LS)) {
-		/*
-		 * Something very wrong happens. The whole packet should be
-		 * recevied in one descriptr. Report problem.
-		 */
-		device_printf(sc->dev,
-		    "%s: RX descriptor without FIRST and LAST bit set: 0x%08X",
-		    __func__, rdesc0);
-		return (NULL);
-	}
-
-	len = (rdesc0 >> RDESC0_FL_SHIFT) & RDESC0_FL_MASK;
-	if (len < 64) {
-		/*
-		 * Lenght is invalid, recycle old mbuf
-		 * Probably impossible case
-		 */
-		return (NULL);
-	}
-
-	/* Allocate new buffer */
-	m0 = dwc_alloc_mbufcl(sc);
-	if (m0 == NULL) {
-		/* no new mbuf available, recycle old */
-		if_inc_counter(sc->ifp, IFCOUNTER_IQDROPS, 1);
-		return (NULL);
-	}
-	/* Do dmasync for newly received packet */
-	bus_dmamap_sync(sc->rxbuf_tag, map->map, BUS_DMASYNC_POSTREAD);
-	bus_dmamap_unload(sc->rxbuf_tag, map->map);
-
-	/* Received packet is valid, process it */
-	m->m_pkthdr.rcvif = ifp;
-	m->m_pkthdr.len = len;
-	m->m_len = len;
-	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
-
-	if ((if_getcapenable(ifp) & IFCAP_RXCSUM) != 0 &&
-	  (rdesc0 & RDESC0_FT) != 0) {
-		m->m_pkthdr.csum_flags = CSUM_IP_CHECKED;
-		if ((rdesc0 & RDESC0_ICE) == 0)
-			m->m_pkthdr.csum_flags |= CSUM_IP_VALID;
-		if ((rdesc0 & RDESC0_PCE) == 0) {
-			m->m_pkthdr.csum_flags |=
-				CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
-			m->m_pkthdr.csum_data = 0xffff;
-		}
-	}
-
-	/* Remove trailing FCS */
-	m_adj(m, -ETHER_CRC_LEN);
-
-	DWC_UNLOCK(sc);
-	if_input(ifp, m);
-	DWC_LOCK(sc);
-	return (m0);
-}
-
-static int
-setup_dma(struct dwc_softc *sc)
-{
-	struct mbuf *m;
-	int error;
-	int nidx;
-	int idx;
-
-	/*
-	 * Set up TX descriptor ring, descriptors, and dma maps.
-	 */
-	error = bus_dma_tag_create(
-	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
-	    DWC_DESC_RING_ALIGN, 0,	/* alignment, boundary */
-	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
-	    BUS_SPACE_MAXADDR,		/* highaddr */
-	    NULL, NULL,			/* filter, filterarg */
-	    TX_DESC_SIZE, 1, 		/* maxsize, nsegments */
-	    TX_DESC_SIZE,		/* maxsegsize */
-	    0,				/* flags */
-	    NULL, NULL,			/* lockfunc, lockarg */
-	    &sc->txdesc_tag);
-	if (error != 0) {
-		device_printf(sc->dev,
-		    "could not create TX ring DMA tag.\n");
-		goto out;
-	}
-
-	error = bus_dmamem_alloc(sc->txdesc_tag, (void**)&sc->txdesc_ring,
-	    BUS_DMA_COHERENT | BUS_DMA_WAITOK | BUS_DMA_ZERO,
-	    &sc->txdesc_map);
-	if (error != 0) {
-		device_printf(sc->dev,
-		    "could not allocate TX descriptor ring.\n");
-		goto out;
-	}
-
-	error = bus_dmamap_load(sc->txdesc_tag, sc->txdesc_map,
-	    sc->txdesc_ring, TX_DESC_SIZE, dwc_get1paddr,
-	    &sc->txdesc_ring_paddr, 0);
-	if (error != 0) {
-		device_printf(sc->dev,
-		    "could not load TX descriptor ring map.\n");
-		goto out;
-	}
-
-	for (idx = 0; idx < TX_DESC_COUNT; idx++) {
-		nidx = next_txidx(sc, idx);
-		sc->txdesc_ring[idx].addr2 = sc->txdesc_ring_paddr +
-		    (nidx * sizeof(struct dwc_hwdesc));
-	}
-
-	error = bus_dma_tag_create(
-	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
-	    1, 0,			/* alignment, boundary */
-	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
-	    BUS_SPACE_MAXADDR,		/* highaddr */
-	    NULL, NULL,			/* filter, filterarg */
-	    MCLBYTES*TX_MAP_MAX_SEGS,	/* maxsize */
-	    TX_MAP_MAX_SEGS,		/* nsegments */
-	    MCLBYTES,			/* maxsegsize */
-	    0,				/* flags */
-	    NULL, NULL,			/* lockfunc, lockarg */
-	    &sc->txbuf_tag);
-	if (error != 0) {
-		device_printf(sc->dev,
-		    "could not create TX ring DMA tag.\n");
-		goto out;
-	}
-
-	for (idx = 0; idx < TX_MAP_COUNT; idx++) {
-		error = bus_dmamap_create(sc->txbuf_tag, BUS_DMA_COHERENT,
-		    &sc->txbuf_map[idx].map);
-		if (error != 0) {
-			device_printf(sc->dev,
-			    "could not create TX buffer DMA map.\n");
-			goto out;
-		}
-	}
-
-	for (idx = 0; idx < TX_DESC_COUNT; idx++)
-		dwc_setup_txdesc(sc, idx, 0, 0, 0, false, false);
-
-	/*
-	 * Set up RX descriptor ring, descriptors, dma maps, and mbufs.
-	 */
-	error = bus_dma_tag_create(
-	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
-	    DWC_DESC_RING_ALIGN, 0,	/* alignment, boundary */
-	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
-	    BUS_SPACE_MAXADDR,		/* highaddr */
-	    NULL, NULL,			/* filter, filterarg */
-	    RX_DESC_SIZE, 1, 		/* maxsize, nsegments */
-	    RX_DESC_SIZE,		/* maxsegsize */
-	    0,				/* flags */
-	    NULL, NULL,			/* lockfunc, lockarg */
-	    &sc->rxdesc_tag);
-	if (error != 0) {
-		device_printf(sc->dev,
-		    "could not create RX ring DMA tag.\n");
-		goto out;
-	}
-
-	error = bus_dmamem_alloc(sc->rxdesc_tag, (void **)&sc->rxdesc_ring,
-	    BUS_DMA_COHERENT | BUS_DMA_WAITOK | BUS_DMA_ZERO,
-	    &sc->rxdesc_map);
-	if (error != 0) {
-		device_printf(sc->dev,
-		    "could not allocate RX descriptor ring.\n");
-		goto out;
-	}
-
-	error = bus_dmamap_load(sc->rxdesc_tag, sc->rxdesc_map,
-	    sc->rxdesc_ring, RX_DESC_SIZE, dwc_get1paddr,
-	    &sc->rxdesc_ring_paddr, 0);
-	if (error != 0) {
-		device_printf(sc->dev,
-		    "could not load RX descriptor ring map.\n");
-		goto out;
-	}
-
-	error = bus_dma_tag_create(
-	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
-	    1, 0,			/* alignment, boundary */
-	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
-	    BUS_SPACE_MAXADDR,		/* highaddr */
-	    NULL, NULL,			/* filter, filterarg */
-	    MCLBYTES, 1, 		/* maxsize, nsegments */
-	    MCLBYTES,			/* maxsegsize */
-	    0,				/* flags */
-	    NULL, NULL,			/* lockfunc, lockarg */
-	    &sc->rxbuf_tag);
-	if (error != 0) {
-		device_printf(sc->dev,
-		    "could not create RX buf DMA tag.\n");
-		goto out;
-	}
-
-	for (idx = 0; idx < RX_DESC_COUNT; idx++) {
-		error = bus_dmamap_create(sc->rxbuf_tag, BUS_DMA_COHERENT,
-		    &sc->rxbuf_map[idx].map);
-		if (error != 0) {
-			device_printf(sc->dev,
-			    "could not create RX buffer DMA map.\n");
-			goto out;
-		}
-		if ((m = dwc_alloc_mbufcl(sc)) == NULL) {
-			device_printf(sc->dev, "Could not alloc mbuf\n");
-			error = ENOMEM;
-			goto out;
-		}
-		if ((error = dwc_setup_rxbuf(sc, idx, m)) != 0) {
-			device_printf(sc->dev,
-			    "could not create new RX buffer.\n");
-			goto out;
-		}
-	}
-
-out:
-	if (error != 0)
-		return (ENXIO);
-
-	return (0);
-}
-
-static void
-free_dma(struct dwc_softc *sc)
-{
-	bus_dmamap_t map;
-	int idx;
-
-	/* Clean up RX DMA resources and free mbufs. */
-	for (idx = 0; idx < RX_DESC_COUNT; ++idx) {
-		if ((map = sc->rxbuf_map[idx].map) != NULL) {
-			bus_dmamap_unload(sc->rxbuf_tag, map);
-			bus_dmamap_destroy(sc->rxbuf_tag, map);
-			m_freem(sc->rxbuf_map[idx].mbuf);
-		}
-	}
-	if (sc->rxbuf_tag != NULL)
-		bus_dma_tag_destroy(sc->rxbuf_tag);
-	if (sc->rxdesc_map != NULL) {
-		bus_dmamap_unload(sc->rxdesc_tag, sc->rxdesc_map);
-		bus_dmamem_free(sc->rxdesc_tag, sc->rxdesc_ring,
-		    sc->rxdesc_map);
-	}
-	if (sc->rxdesc_tag != NULL)
-		bus_dma_tag_destroy(sc->rxdesc_tag);
-
-	/* Clean up TX DMA resources. */
-	for (idx = 0; idx < TX_DESC_COUNT; ++idx) {
-		if ((map = sc->txbuf_map[idx].map) != NULL) {
-			/* TX maps are already unloaded. */
-			bus_dmamap_destroy(sc->txbuf_tag, map);
-		}
-	}
-	if (sc->txbuf_tag != NULL)
-		bus_dma_tag_destroy(sc->txbuf_tag);
-	if (sc->txdesc_map != NULL) {
-		bus_dmamap_unload(sc->txdesc_tag, sc->txdesc_map);
-		bus_dmamem_free(sc->txdesc_tag, sc->txdesc_ring,
-		    sc->txdesc_map);
-	}
-	if (sc->txdesc_tag != NULL)
-		bus_dma_tag_destroy(sc->txdesc_tag);
-}
-
 /*
  * if_ functions
  */
@@ -1097,8 +135,6 @@ static void
 dwc_txstart_locked(struct dwc_softc *sc)
 {
 	if_t ifp;
-	struct mbuf *m;
-	int enqueued;
 
 	DWC_ASSERT_LOCKED(sc);
 
@@ -1110,38 +146,7 @@ dwc_txstart_locked(struct dwc_softc *sc)
 	if ((if_getdrvflags(ifp) & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) !=
 	    IFF_DRV_RUNNING)
 		return;
-
-	enqueued = 0;
-
-	for (;;) {
-		if (sc->tx_desccount > (TX_DESC_COUNT - TX_MAP_MAX_SEGS  + 1)) {
-			if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0);
-			break;
-		}
-
-		if (sc->tx_mapcount == (TX_MAP_COUNT - 1)) {
-			if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0);
-			break;
-		}
-
-		m = if_dequeue(ifp);
-		if (m == NULL)
-			break;
-		if (dwc_setup_txbuf(sc, sc->tx_map_head, &m) != 0) {
-			if_sendq_prepend(ifp, m);
-			if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0);
-			break;
-		}
-		bpf_mtap_if(ifp, m);
-		sc->tx_map_head = next_txidx(sc, sc->tx_map_head);
-		sc->tx_mapcount++;
-		++enqueued;
-	}
-
-	if (enqueued != 0) {
-		WRITE4(sc, TRANSMIT_POLL_DEMAND, 0x1);
-		sc->tx_watchdog_count = WATCHDOG_TIMEOUT_SECS;
-	}
+	dma1000_txstart(sc);
 }
 
 static void
@@ -1165,16 +170,16 @@ dwc_init_locked(struct dwc_softc *sc)
 		return;
 
 	/*
-	 * Call mii_mediachg() which will call back into dwc_miibus_statchg()
+	 * Call mii_mediachg() which will call back into dwc1000_miibus_statchg()
 	 * to set up the remaining config registers based on current media.
 	 */
 	mii_mediachg(sc->mii_softc);
 
-	dwc_setup_rxfilter(sc);
-	dwc_setup_core(sc);
-	dwc_enable_mac(sc, true);
-	dwc_enable_csum_offload(sc);
-	dwc_init_dma(sc);
+	dwc1000_setup_rxfilter(sc);
+	dwc1000_core_setup(sc);
+	dwc1000_enable_mac(sc, true);
+	dwc1000_enable_csum_offload(sc);
+	dma1000_start(sc);
 
 	if_setdrvflagbits(ifp, IFF_DRV_RUNNING, IFF_DRV_OACTIVE);
 
@@ -1205,8 +210,8 @@ dwc_stop_locked(struct dwc_softc *sc)
 
 	callout_stop(&sc->dwc_callout);
 
-	dwc_stop_dma(sc);
-	dwc_enable_mac(sc, false);
+	dma1000_stop(sc);
+	dwc1000_enable_mac(sc, false);
 }
 
 static int
@@ -1228,7 +233,7 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data)
 			if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
 				flags = if_getflags(ifp) ^ sc->if_flags;
 				if ((flags & (IFF_PROMISC|IFF_ALLMULTI)) != 0)
-					dwc_setup_rxfilter(sc);
+					dwc1000_setup_rxfilter(sc);
 			} else {
 				if (!sc->is_detaching)
 					dwc_init_locked(sc);
@@ -1244,7 +249,7 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data)
 	case SIOCDELMULTI:
 		if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
 			DWC_LOCK(sc);
-			dwc_setup_rxfilter(sc);
+			dwc1000_setup_rxfilter(sc);
 			DWC_UNLOCK(sc);
 		}
 		break;
@@ -1270,7 +275,7 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data)
 
 		if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
 			DWC_LOCK(sc);
-			dwc_enable_csum_offload(sc);
+			dwc1000_enable_csum_offload(sc);
 			DWC_UNLOCK(sc);
 		}
 		break;
@@ -1287,167 +292,26 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data)
  * Interrupts functions
  */
 
-static void
-dwc_txfinish_locked(struct dwc_softc *sc)
-{
-	struct dwc_bufmap *bmap;
-	struct dwc_hwdesc *desc;
-	if_t ifp;
-	int idx, last_idx;
-	bool map_finished;
-
-	DWC_ASSERT_LOCKED(sc);
-
-	ifp = sc->ifp;
-	/* check if all descriptors of the map are done */
-	while (sc->tx_map_tail != sc->tx_map_head) {
-		map_finished = true;
-		bmap = &sc->txbuf_map[sc->tx_map_tail];
-		idx = sc->tx_desc_tail;
-		last_idx = next_txidx(sc, bmap->last_desc_idx);
-		while (idx != last_idx) {
-			desc = &sc->txdesc_ring[idx];
-			if ((desc->desc0 & TDESC0_OWN) != 0) {
-				map_finished = false;
-				break;
-			}
-			idx = next_txidx(sc, idx);
-		}
-
-		if (!map_finished)
-			break;
-		bus_dmamap_sync(sc->txbuf_tag, bmap->map,
-		    BUS_DMASYNC_POSTWRITE);
-		bus_dmamap_unload(sc->txbuf_tag, bmap->map);
-		m_freem(bmap->mbuf);
-		bmap->mbuf = NULL;
-		sc->tx_mapcount--;
-		while (sc->tx_desc_tail != last_idx) {
-			dwc_setup_txdesc(sc, sc->tx_desc_tail, 0, 0, 0, false, false);
-			sc->tx_desc_tail = next_txidx(sc, sc->tx_desc_tail);
-		}
-		sc->tx_map_tail = next_txidx(sc, sc->tx_map_tail);
-		if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
-		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
-	}
-
-	/* If there are no buffers outstanding, muzzle the watchdog. */
-	if (sc->tx_desc_tail == sc->tx_desc_head) {
-		sc->tx_watchdog_count = 0;
-	}
-}
-
-static void
-dwc_rxfinish_locked(struct dwc_softc *sc)
-{
-	struct mbuf *m;
-	int error, idx;
-	struct dwc_hwdesc *desc;
-
-	DWC_ASSERT_LOCKED(sc);
-	for (;;) {
-		idx = sc->rx_idx;
-		desc = sc->rxdesc_ring + idx;
-		if ((desc->desc0 & RDESC0_OWN) != 0)
-			break;
-
-		m = dwc_rxfinish_one(sc, desc, sc->rxbuf_map + idx);
-		if (m == NULL) {
-			wmb();
-			desc->desc0 = RDESC0_OWN;
-			wmb();
-		} else {
-			/* We cannot create hole in RX ring */
-			error = dwc_setup_rxbuf(sc, idx, m);
-			if (error != 0)
-				panic("dwc_setup_rxbuf failed:  error %d\n",
-				    error);
-
-		}
-		sc->rx_idx = next_rxidx(sc, sc->rx_idx);
-	}
-}
 
 static void
 dwc_intr(void *arg)
 {
 	struct dwc_softc *sc;
-	uint32_t reg;
+	int rv;
 
 	sc = arg;
-
 	DWC_LOCK(sc);
-
-	reg = READ4(sc, INTERRUPT_STATUS);
-	if (reg)
-		READ4(sc, SGMII_RGMII_SMII_CTRL_STATUS);
-
-	reg = READ4(sc, DMA_STATUS);
-	if (reg & DMA_STATUS_NIS) {
-		if (reg & DMA_STATUS_RI)
-			dwc_rxfinish_locked(sc);
-
-		if (reg & DMA_STATUS_TI) {
-			dwc_txfinish_locked(sc);
-			dwc_txstart_locked(sc);
-		}
-	}
-
-	if (reg & DMA_STATUS_AIS) {
-		if (reg & DMA_STATUS_FBI) {
-			/* Fatal bus error */
-			device_printf(sc->dev,
-			    "Ethernet DMA error, restarting controller.\n");
-			dwc_stop_locked(sc);
-			dwc_init_locked(sc);
-		}
+	dwc1000_intr(sc);
+	rv = dma1000_intr(sc);
+	if (rv == EIO) {
+		device_printf(sc->dev,
+		  "Ethernet DMA error, restarting controller.\n");
+		dwc_stop_locked(sc);
+		dwc_init_locked(sc);
 	}
-
-	WRITE4(sc, DMA_STATUS, reg & DMA_STATUS_INTR_MASK);
 	DWC_UNLOCK(sc);
 }
 
-/*
- * Stats
- */
-
-static void dwc_clear_stats(struct dwc_softc *sc)
-{
-	uint32_t reg;
-
-	reg = READ4(sc, MMC_CONTROL);
-	reg |= (MMC_CONTROL_CNTRST);
-	WRITE4(sc, MMC_CONTROL, reg);
-}
-
-static void
-dwc_harvest_stats(struct dwc_softc *sc)
-{
-	if_t ifp;
-
-	/* We don't need to harvest too often. */
-	if (++sc->stats_harvest_count < STATS_HARVEST_INTERVAL)
-		return;
-
-	sc->stats_harvest_count = 0;
-	ifp = sc->ifp;
-
-	if_inc_counter(ifp, IFCOUNTER_IERRORS,
-	    READ4(sc, RXOVERSIZE_G) + READ4(sc, RXUNDERSIZE_G) +
-	    READ4(sc, RXCRCERROR) + READ4(sc, RXALIGNMENTERROR) +
-	    READ4(sc, RXRUNTERROR) + READ4(sc, RXJABBERERROR) +
-	    READ4(sc, RXLENGTHERROR));
-
-	if_inc_counter(ifp, IFCOUNTER_OERRORS,
-	    READ4(sc, TXOVERSIZE_G) + READ4(sc, TXEXCESSDEF) +
-	    READ4(sc, TXCARRIERERR) + READ4(sc, TXUNDERFLOWERROR));
-
-	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
-	    READ4(sc, TXEXESSCOL) + READ4(sc, TXLATECOL));
-
-	dwc_clear_stats(sc);
-}
-
 static void
 dwc_tick(void *arg)
 {
@@ -1471,12 +335,12 @@ dwc_tick(void *arg)
 	 */
 	if (sc->tx_watchdog_count > 0) {
 		if (--sc->tx_watchdog_count == 0) {
-			dwc_txfinish_locked(sc);
+			dma1000_txfinish_locked(sc);
 		}
 	}
 
 	/* Gather stats from hardware counters. */
-	dwc_harvest_stats(sc);
+	dwc1000_harvest_stats(sc);
 
 	/* Check the media status. */
 	link_was_up = sc->link_is_up;
@@ -1488,50 +352,48 @@ dwc_tick(void *arg)
 	callout_reset(&sc->dwc_callout, hz, dwc_tick, sc);
 }
 
-/*
- * Probe/Attach functions
- */
-
-#define	GPIO_ACTIVE_LOW 1
-
 static int
-dwc_reset(device_t dev)
+dwc_reset_phy(struct dwc_softc *sc)
 {
 	pcell_t gpio_prop[4];
 	pcell_t delay_prop[3];
-	phandle_t node, gpio_node;
+	phandle_t gpio_node;
 	device_t gpio;
 	uint32_t pin, flags;
 	uint32_t pin_value;
 
-	node = ofw_bus_get_node(dev);
-	if (OF_getencprop(node, "snps,reset-gpio",
+	/*
+	 * All those properties are deprecated but still used in some DTS.
+	 * The new way to deal with this is to use the generic bindings
+	 * present in the ethernet-phy node.
+	 */
+	if (OF_getencprop(sc->node, "snps,reset-gpio",
 	    gpio_prop, sizeof(gpio_prop)) <= 0)
 		return (0);
 
-	if (OF_getencprop(node, "snps,reset-delays-us",
+	if (OF_getencprop(sc->node, "snps,reset-delays-us",
 	    delay_prop, sizeof(delay_prop)) <= 0) {
-		device_printf(dev,
+		device_printf(sc->dev,
 		    "Wrong property for snps,reset-delays-us");
 		return (ENXIO);
 	}
 
 	gpio_node = OF_node_from_xref(gpio_prop[0]);
 	if ((gpio = OF_device_from_xref(gpio_prop[0])) == NULL) {
-		device_printf(dev,
+		device_printf(sc->dev,
 		    "Can't find gpio controller for phy reset\n");
 		return (ENXIO);
 	}
 
-	if (GPIO_MAP_GPIOS(gpio, node, gpio_node,
+	if (GPIO_MAP_GPIOS(gpio, sc->node, gpio_node,
 	    nitems(gpio_prop) - 1,
 	    gpio_prop + 1, &pin, &flags) != 0) {
-		device_printf(dev, "Can't map gpio for phy reset\n");
+		device_printf(sc->dev, "Can't map gpio for phy reset\n");
 		return (ENXIO);
 	}
 
 	pin_value = GPIO_PIN_LOW;
-	if (OF_hasprop(node, "snps,reset-active-low"))
+	if (OF_hasprop(sc->node, "snps,reset-active-low"))
 		pin_value = GPIO_PIN_HIGH;
 
 	GPIO_PIN_SETFLAGS(gpio, pin, GPIO_PIN_OUTPUT);
@@ -1546,42 +408,74 @@ dwc_reset(device_t dev)
 }
 
 static int
-dwc_clock_init(device_t dev)
+dwc_clock_init(struct dwc_softc *sc)
 {
-	hwreset_t rst;
-	clk_t clk;
-	int error;
+	int rv;
 	int64_t freq;
 
-	/* Enable clocks */
-	if (clk_get_by_ofw_name(dev, 0, "stmmaceth", &clk) == 0) {
-		error = clk_enable(clk);
-		if (error != 0) {
-			device_printf(dev, "could not enable main clock\n");
-			return (error);
-		}
-		if (bootverbose) {
-			clk_get_freq(clk, &freq);
-			device_printf(dev, "MAC clock(%s) freq: %jd\n",
-					clk_get_name(clk), (intmax_t)freq);
-		}
+	/* Required clock */
+	rv = clk_get_by_ofw_name(sc->dev, 0, "stmmaceth", &sc->clk_stmmaceth);
+	if (rv != 0) {
+		device_printf(sc->dev, "Cannot get GMAC main clock\n");
+		return (ENXIO);
 	}
-	else {
-		device_printf(dev, "could not find clock stmmaceth\n");
+	if ((rv = clk_enable(sc->clk_stmmaceth)) != 0) {
+		device_printf(sc->dev, "could not enable main clock\n");
+		return (rv);
 	}
 
-	/* De-assert reset */
-	if (hwreset_get_by_ofw_name(dev, 0, "stmmaceth", &rst) == 0) {
-		error = hwreset_deassert(rst);
-		if (error != 0) {
-			device_printf(dev, "could not de-assert reset\n");
-			return (error);
-		}
+	/* Optional clock */
+	rv = clk_get_by_ofw_name(sc->dev, 0, "pclk", &sc->clk_pclk);
+	if (rv != 0)
+		return (0);
+	if ((rv = clk_enable(sc->clk_pclk)) != 0) {
+		device_printf(sc->dev, "could not enable peripheral clock\n");
+		return (rv);
+	}
+
+	if (bootverbose) {
+		clk_get_freq(sc->clk_stmmaceth, &freq);
+		device_printf(sc->dev, "MAC clock(%s) freq: %jd\n",
+		    clk_get_name(sc->clk_stmmaceth), (intmax_t)freq);
+	}
+
+	return (0);
+}
+
+static int
+dwc_reset_deassert(struct dwc_softc *sc)
+{
+	int rv;
+
+	/* Required reset */
+	rv = hwreset_get_by_ofw_name(sc->dev, 0, "stmmaceth", &sc->rst_stmmaceth);
+	if (rv != 0) {
+		device_printf(sc->dev, "Cannot get GMAC reset\n");
+		return (ENXIO);
+	}
+	rv = hwreset_deassert(sc->rst_stmmaceth);
+	if (rv != 0) {
+		device_printf(sc->dev, "could not de-assert GMAC reset\n");
+		return (rv);
+	}
+
+	/* Optional reset */
+	rv = hwreset_get_by_ofw_name(sc->dev, 0, "ahb", &sc->rst_ahb);
+	if (rv != 0)
+		return (0);
+	rv = hwreset_deassert(sc->rst_ahb);
+	if (rv != 0) {
+		device_printf(sc->dev, "could not de-assert AHB reset\n");
+		return (rv);
 	}
 
 	return (0);
 }
 
+/*
+ * Probe/Attach functions
+ */
+
 static int
 dwc_probe(device_t dev)
 {
@@ -1602,56 +496,65 @@ dwc_attach(device_t dev)
 	uint8_t macaddr[ETHER_ADDR_LEN];
 	struct dwc_softc *sc;
 	if_t ifp;
-	int error, i;
-	uint32_t reg;
-	phandle_t node;
-	uint32_t txpbl, rxpbl, pbl;
-	bool nopblx8 = false;
-	bool fixed_burst = false;
+	int error;
+	uint32_t pbl;
 
 	sc = device_get_softc(dev);
 	sc->dev = dev;
 	sc->rx_idx = 0;
 	sc->tx_desccount = TX_DESC_COUNT;
 	sc->tx_mapcount = 0;
-	sc->mii_clk = IF_DWC_MII_CLK(dev);
-	sc->mactype = IF_DWC_MAC_TYPE(dev);
 
-	node = ofw_bus_get_node(dev);
-	switch (mii_fdt_get_contype(node)) {
+	sc->node = ofw_bus_get_node(dev);
+	sc->phy_mode = mii_fdt_get_contype(sc->node);
+	switch (sc->phy_mode) {
 	case MII_CONTYPE_RGMII:
 	case MII_CONTYPE_RGMII_ID:
 	case MII_CONTYPE_RGMII_RXID:
 	case MII_CONTYPE_RGMII_TXID:
-		sc->phy_mode = PHY_MODE_RGMII;
-		break;
 	case MII_CONTYPE_RMII:
-		sc->phy_mode = PHY_MODE_RMII;
-		break;
 	case MII_CONTYPE_MII:
-		sc->phy_mode = PHY_MODE_MII;
 		break;
 	default:
 		device_printf(dev, "Unsupported MII type\n");
 		return (ENXIO);
 	}
 
-	if (OF_getencprop(node, "snps,pbl", &pbl, sizeof(uint32_t)) <= 0)
-		pbl = BUS_MODE_DEFAULT_PBL;
-	if (OF_getencprop(node, "snps,txpbl", &txpbl, sizeof(uint32_t)) <= 0)
-		txpbl = pbl;
-	if (OF_getencprop(node, "snps,rxpbl", &rxpbl, sizeof(uint32_t)) <= 0)
-		rxpbl = pbl;
-	if (OF_hasprop(node, "snps,no-pbl-x8") == 1)
-		nopblx8 = true;
-	if (OF_hasprop(node, "snps,fixed-burst") == 1)
-		fixed_burst = true;
+	if (OF_getencprop(sc->node, "snps,pbl", &pbl, sizeof(uint32_t)) <= 0)
+		pbl = DMA_DEFAULT_PBL;
+	if (OF_getencprop(sc->node, "snps,txpbl", &sc->txpbl, sizeof(uint32_t)) <= 0)
+		sc->txpbl = pbl;
+	if (OF_getencprop(sc->node, "snps,rxpbl", &sc->rxpbl, sizeof(uint32_t)) <= 0)
+		sc->rxpbl = pbl;
+	if (OF_hasprop(sc->node, "snps,no-pbl-x8") == 1)
+		sc->nopblx8 = true;
+	if (OF_hasprop(sc->node, "snps,fixed-burst") == 1)
+		sc->fixed_burst = true;
+	if (OF_hasprop(sc->node, "snps,mixed-burst") == 1)
+		sc->mixed_burst = true;
+	if (OF_hasprop(sc->node, "snps,aal") == 1)
+		sc->aal = true;
+
+	error = clk_set_assigned(dev, ofw_bus_get_node(dev));
+	if (error != 0) {
+		device_printf(dev, "clk_set_assigned failed\n");
+		return (error);
+	}
+
+	/* Enable main clock */
+	if ((error = dwc_clock_init(sc)) != 0)
+		return (error);
+	/* De-assert main reset */
+	if ((error = dwc_reset_deassert(sc)) != 0)
+		return (error);
 
 	if (IF_DWC_INIT(dev) != 0)
 		return (ENXIO);
 
-	if (dwc_clock_init(dev) != 0)
+	if ((sc->mii_clk = IF_DWC_MII_CLK(dev)) < 0) {
+		device_printf(dev, "Cannot get mii clock value %d\n", -sc->mii_clk);
 		return (ENXIO);
+	}
 
 	if (bus_alloc_resources(dev, dwc_spec, sc->res)) {
 		device_printf(dev, "could not allocate resources\n");
@@ -1659,57 +562,27 @@ dwc_attach(device_t dev)
 	}
 
 	/* Read MAC before reset */
-	dwc_get_hwaddr(sc, macaddr);
+	dwc1000_get_hwaddr(sc, macaddr);
 
 	/* Reset the PHY if needed */
-	if (dwc_reset(dev) != 0) {
+	if (dwc_reset_phy(sc) != 0) {
 		device_printf(dev, "Can't reset the PHY\n");
 		bus_release_resources(dev, dwc_spec, sc->res);
 		return (ENXIO);
 	}
 
 	/* Reset */
-	reg = READ4(sc, BUS_MODE);
-	reg |= (BUS_MODE_SWR);
-	WRITE4(sc, BUS_MODE, reg);
-
-	for (i = 0; i < MAC_RESET_TIMEOUT; i++) {
-		if ((READ4(sc, BUS_MODE) & BUS_MODE_SWR) == 0)
-			break;
-		DELAY(10);
-	}
-	if (i >= MAC_RESET_TIMEOUT) {
-		device_printf(sc->dev, "Can't reset DWC.\n");
-		bus_release_resources(dev, dwc_spec, sc->res);
-		return (ENXIO);
+	if ((error = dma1000_reset(sc)) != 0) {
+		device_printf(sc->dev, "Can't reset DMA controller.\n");
+		bus_release_resources(sc->dev, dwc_spec, sc->res);
+		return (error);
 	}
 
-	reg = BUS_MODE_USP;
-	if (!nopblx8)
-		reg |= BUS_MODE_EIGHTXPBL;
-	reg |= (txpbl << BUS_MODE_PBL_SHIFT);
-	reg |= (rxpbl << BUS_MODE_RPBL_SHIFT);
-	if (fixed_burst)
-		reg |= BUS_MODE_FIXEDBURST;
-
-	WRITE4(sc, BUS_MODE, reg);
-
-	/*
-	 * DMA must be stop while changing descriptor list addresses.
-	 */
-	reg = READ4(sc, OPERATION_MODE);
-	reg &= ~(MODE_ST | MODE_SR);
-	WRITE4(sc, OPERATION_MODE, reg);
-
-	if (setup_dma(sc)) {
+	if (dma1000_init(sc)) {
 		bus_release_resources(dev, dwc_spec, sc->res);
 		return (ENXIO);
 	}
 
-	/* Setup addresses */
-	WRITE4(sc, RX_DESCR_LIST_ADDR, sc->rxdesc_ring_paddr);
-	WRITE4(sc, TX_DESCR_LIST_ADDR, sc->txdesc_ring_paddr);
-
 	mtx_init(&sc->mtx, device_get_nameunit(sc->dev),
 	    MTX_NETWORK_LOCK, MTX_DEF);
 
@@ -1770,7 +643,7 @@ dwc_detach(device_t dev)
 	 * Disable and tear down interrupts before anything else, so we don't
 	 * race with the handler.
 	 */
-	WRITE4(sc, INTERRUPT_ENABLE, 0);
+	dwc1000_intr_disable(sc);
 	if (sc->intr_cookie != NULL) {
 		bus_teardown_intr(dev, sc->res[1], sc->intr_cookie);
 	}
@@ -1791,7 +664,7 @@ dwc_detach(device_t dev)
 	bus_generic_detach(dev);
 
 	/* Free DMA descriptors */
-	free_dma(sc);
+	dma1000_free(sc);
 
 	if (sc->ifp != NULL) {
 		if_free(sc->ifp);
@@ -1810,9 +683,9 @@ static device_method_t dwc_methods[] = {
 	DEVMETHOD(device_detach,	dwc_detach),
 
 	/* MII Interface */
-	DEVMETHOD(miibus_readreg,	dwc_miibus_read_reg),
-	DEVMETHOD(miibus_writereg,	dwc_miibus_write_reg),
-	DEVMETHOD(miibus_statchg,	dwc_miibus_statchg),
+	DEVMETHOD(miibus_readreg,	dwc1000_miibus_read_reg),
+	DEVMETHOD(miibus_writereg,	dwc1000_miibus_write_reg),
+	DEVMETHOD(miibus_statchg,	dwc1000_miibus_statchg),
 
 	{ 0, 0 }
 };
diff --git a/sys/arm/allwinner/aw_if_dwc.c b/sys/dev/dwc/if_dwc_aw.c
similarity index 93%
rename from sys/arm/allwinner/aw_if_dwc.c
rename to sys/dev/dwc/if_dwc_aw.c
index 5992a652facb..4b2735cd07cf 100644
--- a/sys/arm/allwinner/aw_if_dwc.c
+++ b/sys/dev/dwc/if_dwc_aw.c
@@ -33,18 +33,24 @@
 #include <sys/module.h>
 
 #include <net/if.h>
+#include <net/if_media.h>
 
 #include <machine/bus.h>
 
-#include <dev/dwc/if_dwc.h>
-#include <dev/dwc/if_dwcvar.h>
+#include <dev/mii/miivar.h>
+
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <arm/allwinner/aw_machdep.h>
 #include <dev/extres/clk/clk.h>
+#include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 
+#include <arm/allwinner/aw_machdep.h>
+
+#include <dev/dwc/if_dwcvar.h>
+#include <dev/dwc/dwc1000_reg.h>
+
 #include "if_dwc_if.h"
 
 static int
@@ -73,10 +79,13 @@ a20_if_dwc_init(device_t dev)
 
 	/* Configure PHY for MII or RGMII mode */
 	switch(sc->phy_mode) {
-	case PHY_MODE_RGMII:
+	case MII_CONTYPE_RGMII:
+	case MII_CONTYPE_RGMII_ID:
+	case MII_CONTYPE_RGMII_RXID:
+	case MII_CONTYPE_RGMII_TXID:
 		tx_parent_name = "gmac_int_tx";
 		break;
-	case PHY_MODE_MII:
+	case MII_CONTYPE_MII:
 		tx_parent_name = "mii_phy_tx";
 		break;
 	default:
@@ -114,13 +123,6 @@ a20_if_dwc_init(device_t dev)
 	return (0);
 }
 
-static int
-a20_if_dwc_mac_type(device_t dev)
-{
-
-	return (DWC_GMAC_NORMAL_DESC);
-}
-
 static int
 a20_if_dwc_mii_clk(device_t dev)
 {
@@ -132,7 +134,6 @@ static device_method_t a20_dwc_methods[] = {
 	DEVMETHOD(device_probe,		a20_if_dwc_probe),
 
 	DEVMETHOD(if_dwc_init,		a20_if_dwc_init),
-	DEVMETHOD(if_dwc_mac_type,	a20_if_dwc_mac_type),
 	DEVMETHOD(if_dwc_mii_clk,	a20_if_dwc_mii_clk),
 
 	DEVMETHOD_END
diff --git a/sys/dev/dwc/if_dwc_if.m b/sys/dev/dwc/if_dwc_if.m
index b8133ef898da..aea61579946e 100644
--- a/sys/dev/dwc/if_dwc_if.m
+++ b/sys/dev/dwc/if_dwc_if.m
@@ -1,7 +1,6 @@
 #-
 # Copyright (c) 2015 Luiz Otavio O Souza <loos@FreeBSD.org>
 # Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
-# All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -28,7 +27,7 @@
 
 INTERFACE if_dwc;
 
-#include <dev/dwc/if_dwc.h>
+#include <dev/dwc/dwc1000_reg.h>
 
 CODE {
 	static int
@@ -37,12 +36,6 @@
 		return (0);
 	}
 
-	static int
-	if_dwc_default_mac_type(device_t dev)
-	{
-		return (DWC_GMAC_EXT_DESC);
-	}
-
 	static int
 	if_dwc_default_mii_clk(device_t dev)
 	{
@@ -66,13 +59,6 @@
 	device_t dev;
 } DEFAULT if_dwc_default_init;
 
-#
-# Return the DWC MAC type (descriptor type).
-#
-METHOD int mac_type {
-	device_t dev;
-} DEFAULT if_dwc_default_mac_type;
-
 #
 # Return the DWC MII clock for a specific hardware.
 #
diff --git a/sys/arm64/rockchip/if_dwc_rk.c b/sys/dev/dwc/if_dwc_rk.c
similarity index 91%
rename from sys/arm64/rockchip/if_dwc_rk.c
rename to sys/dev/dwc/if_dwc_rk.c
index 7c8a6c2ab668..257d80bd1e59 100644
--- a/sys/arm64/rockchip/if_dwc_rk.c
+++ b/sys/dev/dwc/if_dwc_rk.c
@@ -38,8 +38,8 @@
 #include <net/if.h>
 #include <net/if_media.h>
 
-#include <dev/dwc/if_dwc.h>
-#include <dev/dwc/if_dwcvar.h>
+#include <dev/mii/miivar.h>
+
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
@@ -48,6 +48,9 @@
 #include <dev/extres/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
 
+#include <dev/dwc/if_dwcvar.h>
+#include <dev/dwc/dwc1000_reg.h>
+
 #include "if_dwc_if.h"
 #include "syscon_if.h"
 
@@ -130,6 +133,7 @@ struct if_dwc_rk_softc {
 	clk_t			aclk_mac;
 	clk_t			pclk_mac;
 	clk_t			clk_stmmaceth;
+	clk_t			clk_mac_speed;
 	/* RMII clocks */
 	clk_t			clk_mac_ref;
 	clk_t			clk_mac_refout;
@@ -173,7 +177,7 @@ rk3328_set_delays(struct if_dwc_rk_softc *sc)
 	uint32_t reg;
 	uint32_t tx, rx;
 
-	if (sc->base.phy_mode != PHY_MODE_RGMII)
+	if (!mii_contype_is_rgmii(sc->base.phy_mode))
 		return;
 
 	reg = SYSCON_READ_4(sc->grf, RK3328_GRF_MAC_CON0);
@@ -208,7 +212,10 @@ rk3328_set_speed(struct if_dwc_rk_softc *sc, int speed)
 	uint32_t reg;
 
 	switch (sc->base.phy_mode) {
-	case PHY_MODE_RGMII:
+	case MII_CONTYPE_RGMII:
+	case MII_CONTYPE_RGMII_ID:
+	case MII_CONTYPE_RGMII_RXID:
+	case MII_CONTYPE_RGMII_TXID:
 		switch (speed) {
 		case IFM_1000_T:
 		case IFM_1000_SX:
@@ -228,7 +235,7 @@ rk3328_set_speed(struct if_dwc_rk_softc *sc, int speed)
 		SYSCON_WRITE_4(sc->grf, RK3328_GRF_MAC_CON1,
 		    ((MAC_CON1_GMAC2IO_GMII_CLK_SEL_MASK << 16) | reg));
 		break;
-	case PHY_MODE_RMII:
+	case MII_CONTYPE_RMII:
 		switch (speed) {
 		case IFM_100_TX:
 			reg = MAC_CON1_GMAC2IO_RMII_CLK_SEL_25 |
@@ -258,12 +265,15 @@ rk3328_set_phy_mode(struct if_dwc_rk_softc *sc)
 {
 
 	switch (sc->base.phy_mode) {
-	case PHY_MODE_RGMII:
+	case MII_CONTYPE_RGMII:
+	case MII_CONTYPE_RGMII_ID:
+	case MII_CONTYPE_RGMII_RXID:
+	case MII_CONTYPE_RGMII_TXID:
 		SYSCON_WRITE_4(sc->grf, RK3328_GRF_MAC_CON1,
 		    ((MAC_CON1_GMAC2IO_INTF_SEL_MASK | MAC_CON1_GMAC2IO_RMII_MODE_MASK) << 16) |
 		    MAC_CON1_GMAC2IO_INTF_RGMII);
 		break;
-	case PHY_MODE_RMII:
+	case MII_CONTYPE_RMII:
 		SYSCON_WRITE_4(sc->grf, sc->integrated_phy ? RK3328_GRF_MAC_CON2 : RK3328_GRF_MAC_CON1,
 		    ((MAC_CON1_GMAC2IO_INTF_SEL_MASK | MAC_CON1_GMAC2IO_RMII_MODE_MASK) << 16) |
 		    MAC_CON1_GMAC2IO_INTF_RMII | MAC_CON1_GMAC2IO_RMII_MODE);
@@ -284,7 +294,7 @@ rk3399_set_delays(struct if_dwc_rk_softc *sc)
 {
 	uint32_t reg, tx, rx;
 
-	if (sc->base.phy_mode != PHY_MODE_RGMII)
+	if (!mii_contype_is_rgmii(sc->base.phy_mode))
 		return;
 
 	reg = SYSCON_READ_4(sc->grf, RK3399_GRF_SOC_CON6);
@@ -391,26 +401,10 @@ static int
 if_dwc_rk_init_clocks(device_t dev)
 {
 	struct if_dwc_rk_softc *sc;
-	int error;
 
 	sc = device_get_softc(dev);
-	error = clk_set_assigned(dev, ofw_bus_get_node(dev));
-	if (error != 0) {
-		device_printf(dev, "clk_set_assigned failed\n");
-		return (error);
-	}
 
 	/* Enable clocks */
-	error = clk_get_by_ofw_name(dev, 0, "stmmaceth", &sc->clk_stmmaceth);
-	if (error != 0) {
-		device_printf(dev, "could not find clock stmmaceth\n");
-		return (error);
-	}
-
-	if (clk_get_by_ofw_name(dev, 0, "mac_clk_rx", &sc->mac_clk_rx) != 0) {
-		device_printf(sc->base.dev, "could not get mac_clk_rx clock\n");
-		sc->mac_clk_rx = NULL;
-	}
 
 	if (clk_get_by_ofw_name(dev, 0, "mac_clk_tx", &sc->mac_clk_tx) != 0) {
 		device_printf(sc->base.dev, "could not get mac_clk_tx clock\n");
@@ -427,7 +421,15 @@ if_dwc_rk_init_clocks(device_t dev)
 		sc->pclk_mac = NULL;
 	}
 
-	if (sc->base.phy_mode == PHY_MODE_RGMII) {
+	/* Optional clock */
+	clk_get_by_ofw_name(dev, 0, "clk_mac_speed", &sc->clk_mac_speed);
+
+	if (sc->base.phy_mode == MII_CONTYPE_RMII) {
+		if (clk_get_by_ofw_name(dev, 0, "mac_clk_rx", &sc->mac_clk_rx) != 0) {
+			device_printf(sc->base.dev, "could not get mac_clk_rx clock\n");
+			sc->mac_clk_rx = NULL;
+		}
+
 		if (clk_get_by_ofw_name(dev, 0, "clk_mac_ref", &sc->clk_mac_ref) != 0) {
 			device_printf(sc->base.dev, "could not get clk_mac_ref clock\n");
 			sc->clk_mac_ref = NULL;
@@ -454,7 +456,7 @@ if_dwc_rk_init_clocks(device_t dev)
 		}
 	}
 
-	if (sc->base.phy_mode == PHY_MODE_RMII) {
+	if (sc->base.phy_mode == MII_CONTYPE_RMII) {
 		if (sc->mac_clk_rx)
 			clk_enable(sc->mac_clk_rx);
 		if (sc->clk_mac_ref)
@@ -470,6 +472,8 @@ if_dwc_rk_init_clocks(device_t dev)
 		clk_enable(sc->pclk_mac);
 	if (sc->mac_clk_tx)
 		clk_enable(sc->mac_clk_tx);
+	if (sc->clk_mac_speed)
+		clk_enable(sc->clk_mac_speed);
 
 	DELAY(50);
 
@@ -574,19 +578,32 @@ if_dwc_rk_init(device_t dev)
 	return (0);
 }
 
-static int
-if_dwc_rk_mac_type(device_t dev)
-{
-
-	return (DWC_GMAC_NORMAL_DESC);
-}
-
 static int
 if_dwc_rk_mii_clk(device_t dev)
 {
+	struct if_dwc_rk_softc *sc;
+	uint64_t freq;
+	int rv;
 
-	/* Should be calculated from the clock */
-	return (GMAC_MII_CLK_150_250M_DIV102);
+	sc = device_get_softc(dev);
+	if ((rv = clk_get_freq(sc->pclk_mac, &freq)) != 0)
+		return (-rv);
+	freq = freq / 1000 / 1000;
+
+	if (freq >= 60 && freq <= 100)
+		return (GMAC_MII_CLK_60_100M_DIV42);
+	else if (freq >= 100 && freq <= 150)
+		return (GMAC_MII_CLK_100_150M_DIV62);
+	else if (freq >= 20 && freq <= 35)
+		return (GMAC_MII_CLK_25_35M_DIV16);
+	else if (freq >= 35 && freq <= 60)
+		return (GMAC_MII_CLK_35_60M_DIV26);
+	else if (freq >= 150 && freq <= 250)
+		return (GMAC_MII_CLK_150_250M_DIV102);
+	else if (freq >= 250 && freq <= 300)
+		return (GMAC_MII_CLK_250_300M_DIV124);
+
+	return (-ERANGE);
 }
 
 static int
@@ -606,7 +623,6 @@ static device_method_t if_dwc_rk_methods[] = {
 	DEVMETHOD(device_probe,		if_dwc_rk_probe),
 
 	DEVMETHOD(if_dwc_init,		if_dwc_rk_init),
-	DEVMETHOD(if_dwc_mac_type,	if_dwc_rk_mac_type),
 	DEVMETHOD(if_dwc_mii_clk,	if_dwc_rk_mii_clk),
 	DEVMETHOD(if_dwc_set_speed,	if_dwc_rk_set_speed),
 
diff --git a/sys/dev/altera/dwc/if_dwc_socfpga.c b/sys/dev/dwc/if_dwc_socfpga.c
similarity index 94%
rename from sys/dev/altera/dwc/if_dwc_socfpga.c
rename to sys/dev/dwc/if_dwc_socfpga.c
index ac8c78326df7..867c09109d2a 100644
--- a/sys/dev/altera/dwc/if_dwc_socfpga.c
+++ b/sys/dev/dwc/if_dwc_socfpga.c
@@ -42,11 +42,15 @@
 
 #include <machine/bus.h>
 
-#include <dev/dwc/if_dwc.h>
-#include <dev/dwc/if_dwcvar.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
+#include <dev/extres/clk/clk.h>
+#include <dev/extres/hwreset/hwreset.h>
+
+#include <dev/dwc/if_dwcvar.h>
+#include <dev/dwc/dwc1000_reg.h>
+
 #include "if_dwc_if.h"
 
 static int
@@ -71,13 +75,6 @@ if_dwc_socfpga_init(device_t dev)
 	return (0);
 }
 
-static int
-if_dwc_socfpga_mac_type(device_t dev)
-{
-
-	return (DWC_GMAC_EXT_DESC);
-}
-
 static int
 if_dwc_socfpga_mii_clk(device_t dev)
 {
@@ -96,7 +93,6 @@ static device_method_t dwc_socfpga_methods[] = {
 	DEVMETHOD(device_probe,		if_dwc_socfpga_probe),
 
 	DEVMETHOD(if_dwc_init,		if_dwc_socfpga_init),
-	DEVMETHOD(if_dwc_mac_type,	if_dwc_socfpga_mac_type),
 	DEVMETHOD(if_dwc_mii_clk,	if_dwc_socfpga_mii_clk),
 
 	DEVMETHOD_END
diff --git a/sys/dev/dwc/if_dwcvar.h b/sys/dev/dwc/if_dwcvar.h
index 8a8b9b283784..e21e256852fa 100644
--- a/sys/dev/dwc/if_dwcvar.h
+++ b/sys/dev/dwc/if_dwcvar.h
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
- * All rights reserved.
  *
  * This software was developed by SRI International and the University of
  * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
@@ -49,6 +48,8 @@
 #define	TX_DESC_SIZE	(sizeof(struct dwc_hwdesc) * TX_DESC_COUNT)
 #define	TX_MAP_MAX_SEGS	32
 
+#define	DMA_DEFAULT_PBL	8
+
 struct dwc_bufmap {
 	bus_dmamap_t		map;
 	struct mbuf		*mbuf;
@@ -59,7 +60,7 @@ struct dwc_bufmap {
 struct dwc_softc {
 	struct resource		*res[2];
 	device_t		dev;
-	int			mactype;
+	phandle_t		node;
 	int			mii_clk;
 	device_t		miibus;
 	struct mii_data *	mii_softc;
@@ -75,6 +76,21 @@ struct dwc_softc {
 	int			stats_harvest_count;
 	int			phy_mode;
 
+	/* clocks and reset */
+	clk_t			clk_stmmaceth;
+	clk_t			clk_pclk;
+	hwreset_t		rst_stmmaceth;
+	hwreset_t		rst_ahb;
+
+	/* DMA config */
+	uint32_t		txpbl;	/* TX Burst lenght */
+	uint32_t		rxpbl;	/* RX Burst lenght */
+	bool			nopblx8;
+	bool			fixed_burst;
+	bool			mixed_burst;
+	bool			aal;
+	bool			dma_ext_desc;
+
 	/* RX */
 	bus_dma_tag_t		rxdesc_tag;
 	bus_dmamap_t		rxdesc_map;
@@ -99,4 +115,14 @@ struct dwc_softc {
 	int			tx_mapcount;
 };
 
+#define	READ4(_sc, _reg) \
+	bus_read_4((_sc)->res[0], _reg)
+#define	WRITE4(_sc, _reg, _val) \
+	bus_write_4((_sc)->res[0], _reg, _val)
+
+#define	DWC_LOCK(sc)			mtx_lock(&(sc)->mtx)
+#define	DWC_UNLOCK(sc)			mtx_unlock(&(sc)->mtx)
+#define	DWC_ASSERT_LOCKED(sc)		mtx_assert(&(sc)->mtx, MA_OWNED)
+#define	DWC_ASSERT_UNLOCKED(sc)		mtx_assert(&(sc)->mtx, MA_NOTOWNED)
+
 #endif	/* __IF_DWCVAR_H__ */
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index 5237c555d999..b698db6c9620 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -780,7 +780,7 @@ fwip_stream_input(struct fw_xferq *xferq)
 		 * Record the sender ID for possible BPF usage.
 		 */
 		src = ntohl(p[1]) >> 16;
-		if (bpf_peers_present(if_getbpf(ifp))) {
+		if (bpf_peers_present_if(ifp)) {
 			mtag = m_tag_alloc(MTAG_FIREWIRE,
 			    MTAG_FIREWIRE_SENDER_EUID,
 			    2*sizeof(uint32_t), M_NOWAIT);
@@ -880,7 +880,7 @@ fwip_unicast_input(struct fw_xfer *xfer)
 		goto done;
 	}
 
-	if (bpf_peers_present(if_getbpf(ifp))) {
+	if (bpf_peers_present_if(ifp)) {
 		/*
 		 * Record the sender ID for possible BPF usage.
 		 */
diff --git a/sys/dev/firmware/xilinx/zynqmp_firmware_if.m b/sys/dev/firmware/xilinx/zynqmp_firmware_if.m
index 1007d721952d..53b9fa5399bb 100644
--- a/sys/dev/firmware/xilinx/zynqmp_firmware_if.m
+++ b/sys/dev/firmware/xilinx/zynqmp_firmware_if.m
@@ -23,8 +23,6 @@
 # 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$
 
 INTERFACE zynqmp_firmware;
 
diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c
index 7d8e1914163e..f6f885873a79 100644
--- a/sys/dev/hyperv/netvsc/if_hn.c
+++ b/sys/dev/hyperv/netvsc/if_hn.c
@@ -3262,7 +3262,7 @@ hn_txpkt(if_t ifp, struct hn_tx_ring *txr, struct hn_txdesc *txd)
 	int error, send_failed = 0, has_bpf;
 
 again:
-	has_bpf = bpf_peers_present(if_getbpf(ifp));
+	has_bpf = bpf_peers_present_if(ifp);
 	if (has_bpf) {
 		/*
 		 * Make sure that this txd and any aggregated txds are not
@@ -5972,7 +5972,7 @@ hn_transmit(if_t ifp, struct mbuf *m)
 			omcast = (m->m_flags & M_MCAST) != 0;
 
 			if (sc->hn_xvf_flags & HN_XVFFLAG_ACCBPF) {
-				if (bpf_peers_present(if_getbpf(ifp))) {
+				if (bpf_peers_present_if(ifp)) {
 					m_bpf = m_copypacket(m, M_NOWAIT);
 					if (m_bpf == NULL) {
 						/*
diff --git a/sys/dev/iicbus/ad7417.c b/sys/dev/iicbus/adc/ad7417.c
similarity index 100%
rename from sys/dev/iicbus/ad7417.c
rename to sys/dev/iicbus/adc/ad7417.c
diff --git a/sys/dev/iicbus/ad7418.c b/sys/dev/iicbus/adc/ad7418.c
similarity index 100%
rename from sys/dev/iicbus/ad7418.c
rename to sys/dev/iicbus/adc/ad7418.c
diff --git a/sys/dev/iicbus/ads111x.c b/sys/dev/iicbus/adc/ads111x.c
similarity index 100%
rename from sys/dev/iicbus/ads111x.c
rename to sys/dev/iicbus/adc/ads111x.c
diff --git a/sys/dev/iicbus/pcf8591.c b/sys/dev/iicbus/adc/pcf8591.c
similarity index 100%
rename from sys/dev/iicbus/pcf8591.c
rename to sys/dev/iicbus/adc/pcf8591.c
diff --git a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c
new file mode 100644
index 000000000000..dd525071caa2
--- /dev/null
+++ b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c
@@ -0,0 +1,707 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019-2020 Thomas Skibo <thomasskibo@yahoo.com>
+ *
+ * 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.
+ */
+
+/* Cadence / Zynq i2c driver.
+ *
+ * Reference: Zynq-7000 All Programmable SoC Technical Reference Manual.
+ * (v1.12.2) July 1, 2018.  Xilinx doc UG585.  I2C Controller is documented
+ * in Chapter 20.
+ */
+
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/sysctl.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/resource.h>
+#include <sys/rman.h>
+#include <sys/uio.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <machine/stdarg.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/extres/clk/clk.h>
+
+#include <dev/iicbus/iiconf.h>
+#include <dev/iicbus/iicbus.h>
+
+#include "iicbus_if.h"
+
+#ifdef I2CDEBUG
+#define DPRINTF(...)	do { printf(__VA_ARGS__); } while (0)
+#else
+#define DPRINTF(...)    do { } while (0)
+#endif
+
+#if 0
+#define HWTYPE_CDNS_R1P10	1
+#endif
+#define HWTYPE_CDNS_R1P14	2
+
+static struct ofw_compat_data compat_data[] = {
+#if 0
+	{"cdns,i2c-r1p10",		HWTYPE_CDNS_R1P10},
+#endif
+	{"cdns,i2c-r1p14",		HWTYPE_CDNS_R1P14},
+	{NULL,				0}
+};
+
+struct cdnc_i2c_softc {
+	device_t		dev;
+	device_t		iicbus;
+	struct mtx		sc_mtx;
+	struct resource		*mem_res;
+	struct resource		*irq_res;
+	void			*intrhandle;
+
+	uint16_t		cfg_reg_shadow;
+	uint16_t		istat;
+	clk_t			ref_clk;
+	uint32_t		ref_clock_freq;
+	uint32_t		i2c_clock_freq;
+
+	int			hwtype;
+	int			hold;
+
+	/* sysctls */
+	unsigned int		i2c_clk_real_freq;
+	unsigned int		interrupts;
+	unsigned int		timeout_ints;
+};
+
+#define I2C_SC_LOCK(sc)		mtx_lock(&(sc)->sc_mtx)
+#define	I2C_SC_UNLOCK(sc)	mtx_unlock(&(sc)->sc_mtx)
+#define I2C_SC_LOCK_INIT(sc) \
+	mtx_init(&(sc)->sc_mtx, device_get_nameunit((sc)->dev),	NULL, MTX_DEF)
+#define I2C_SC_LOCK_DESTROY(sc)	mtx_destroy(&(sc)->sc_mtx)
+#define I2C_SC_ASSERT_LOCKED(sc)	mtx_assert(&(sc)->sc_mtx, MA_OWNED)
+
+#define RD2(sc, off)		(bus_read_2((sc)->mem_res, (off)))
+#define WR2(sc, off, val)	(bus_write_2((sc)->mem_res, (off), (val)))
+#define RD1(sc, off)		(bus_read_1((sc)->mem_res, (off)))
+#define WR1(sc, off, val)	(bus_write_1((sc)->mem_res, (off), (val)))
+
+/* Cadence I2C controller device registers. */
+#define CDNC_I2C_CR			0x0000	/* Config register. */
+#define    CDNC_I2C_CR_DIV_A_MASK		(3 << 14)
+#define    CDNC_I2C_CR_DIV_A_SHIFT		14
+#define    CDNC_I2C_CR_DIV_A(a)			((a) << 14)
+#define    CDNC_I2C_CR_DIV_A_MAX		3
+#define    CDNC_I2C_CR_DIV_B_MASK		(0x3f << 8)
+#define    CDNC_I2C_CR_DIV_B_SHIFT		8
+#define    CDNC_I2C_CR_DIV_B(b)			((b) << 8)
+#define    CDNC_I2C_CR_DIV_B_MAX		63
+#define    CDNC_I2C_CR_CLR_FIFO			(1 << 6)
+#define    CDNC_I2C_CR_SLVMON_MODE		(1 << 5)
+#define    CDNC_I2C_CR_HOLD			(1 << 4)
+#define    CDNC_I2C_CR_ACKEN			(1 << 3)
+#define    CDNC_I2C_CR_NEA			(1 << 2)
+#define    CDNC_I2C_CR_MAST			(1 << 1)
+#define    CDNC_I2C_CR_RNW			(1 << 0)
+
+#define CDNC_I2C_SR			0x0004	/* Status register. */
+#define    CDNC_I2C_SR_BUS_ACTIVE		(1 << 8)
+#define    CDNC_I2C_SR_RX_OVF			(1 << 7)
+#define    CDNC_I2C_SR_TX_VALID			(1 << 6)
+#define    CDNC_I2C_SR_RX_VALID			(1 << 5)
+#define    CDNC_I2C_SR_RXRW			(1 << 3)
+
+#define CDNC_I2C_ADDR			0x0008	/* i2c address register. */
+#define CDNC_I2C_DATA			0x000C	/* i2c data register. */
+
+#define CDNC_I2C_ISR			0x0010	/* Int status register. */
+#define    CDNC_I2C_ISR_ARB_LOST		(1 << 9)
+#define    CDNC_I2C_ISR_RX_UNDF			(1 << 7)
+#define    CDNC_I2C_ISR_TX_OVF			(1 << 6)
+#define    CDNC_I2C_ISR_RX_OVF			(1 << 5)
+#define    CDNC_I2C_ISR_SLV_RDY			(1 << 4)
+#define    CDNC_I2C_ISR_XFER_TMOUT		(1 << 3)
+#define    CDNC_I2C_ISR_XFER_NACK		(1 << 2)
+#define    CDNC_I2C_ISR_XFER_DATA		(1 << 1)
+#define    CDNC_I2C_ISR_XFER_DONE		(1 << 0)
+#define    CDNC_I2C_ISR_ALL			0x2ff
+#define CDNC_I2C_TRANS_SIZE		0x0014	/* Transfer size. */
+#define CDNC_I2C_PAUSE			0x0018	/* Slv Monitor Pause reg. */
+#define CDNC_I2C_TIME_OUT		0x001C	/* Time-out register. */
+#define    CDNC_I2C_TIME_OUT_MIN		31
+#define    CDNC_I2C_TIME_OUT_MAX		255
+#define CDNC_I2C_IMR			0x0020	/* Int mask register. */
+#define CDNC_I2C_IER			0x0024	/* Int enable register. */
+#define CDNC_I2C_IDR			0x0028	/* Int disable register. */
+
+#define CDNC_I2C_FIFO_SIZE		16
+#define CDNC_I2C_DEFAULT_I2C_CLOCK	400000	/* 400Khz default */
+
+#define CDNC_I2C_ISR_ERRS (CDNC_I2C_ISR_ARB_LOST | CDNC_I2C_ISR_RX_UNDF | \
+	CDNC_I2C_ISR_TX_OVF | CDNC_I2C_ISR_RX_OVF | CDNC_I2C_ISR_XFER_TMOUT | \
+	CDNC_I2C_ISR_XFER_NACK)
+
+/* Configure clock dividers. */
+static int
+cdnc_i2c_set_freq(struct cdnc_i2c_softc *sc)
+{
+	uint32_t div_a, div_b, err, clk_out;
+	uint32_t best_div_a, best_div_b, best_err;
+
+	best_div_a = 0;
+	best_div_b = 0;
+	best_err = ~0U;
+
+	/*
+	 * The i2c controller has a two-stage clock divider to create
+	 * the "clock enable" signal used to sample the incoming SCL and
+	 * SDA signals.  The Clock Enable signal is divided by 22 to create
+	 * the outgoing SCL signal.
+	 *
+	 * Try all div_a values and pick best match.
+	 */
+	for (div_a = 0; div_a <= CDNC_I2C_CR_DIV_A_MAX; div_a++) {
+		div_b = sc->ref_clock_freq / (22 * sc->i2c_clock_freq *
+		    (div_a + 1));
+		if (div_b > CDNC_I2C_CR_DIV_B_MAX)
+			continue;
+		clk_out = sc->ref_clock_freq / (22 * (div_a + 1) *
+		    (div_b + 1));
+		err = clk_out > sc->i2c_clock_freq ?
+		    clk_out - sc->i2c_clock_freq :
+		    sc->i2c_clock_freq - clk_out;
+		if (err < best_err) {
+			best_err = err;
+			best_div_a = div_a;
+			best_div_b = div_b;
+		}
+	}
+
+	if (best_err == ~0U) {
+		device_printf(sc->dev, "cannot configure clock divider.\n");
+		return (EINVAL); /* out of range */
+	}
+
+	clk_out = sc->ref_clock_freq / (22 * (best_div_a + 1) *
+	    (best_div_b + 1));
+
+	DPRINTF("%s: ref_clock_freq=%d i2c_clock_freq=%d\n", __func__,
+	    sc->ref_clock_freq, sc->i2c_clock_freq);
+	DPRINTF("%s: div_a=%d div_b=%d real-freq=%d\n", __func__, best_div_a,
+	    best_div_b, clk_out);
+
+	sc->cfg_reg_shadow &= ~(CDNC_I2C_CR_DIV_A_MASK |
+	    CDNC_I2C_CR_DIV_B_MASK);
+	sc->cfg_reg_shadow |= CDNC_I2C_CR_DIV_A(best_div_a) |
+	    CDNC_I2C_CR_DIV_B(best_div_b);
+	WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow);
+
+	sc->i2c_clk_real_freq = clk_out;
+
+	return (0);
+}
+
+/* Initialize hardware. */
+static int
+cdnc_i2c_init_hw(struct cdnc_i2c_softc *sc)
+{
+
+	/* Reset config register and clear FIFO. */
+	sc->cfg_reg_shadow = 0;
+	WR2(sc, CDNC_I2C_CR, CDNC_I2C_CR_CLR_FIFO);
+	sc->hold = 0;
+
+	/* Clear and disable all interrupts. */
+	WR2(sc, CDNC_I2C_ISR, CDNC_I2C_ISR_ALL);
+	WR2(sc, CDNC_I2C_IDR, CDNC_I2C_ISR_ALL);
+
+	/* Max out bogus time-out register. */
+	WR1(sc, CDNC_I2C_TIME_OUT, CDNC_I2C_TIME_OUT_MAX);
+
+	/* Set up clock dividers. */
+	return (cdnc_i2c_set_freq(sc));
+}
+
+static int
+cdnc_i2c_errs(struct cdnc_i2c_softc *sc, uint16_t istat)
+{
+
+	DPRINTF("%s: istat=0x%x\n", __func__, istat);
+
+	/* XXX: clean up after errors. */
+
+	/* Reset config register and clear FIFO. */
+	sc->cfg_reg_shadow &= CDNC_I2C_CR_DIV_A_MASK | CDNC_I2C_CR_DIV_B_MASK;
+	WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow | CDNC_I2C_CR_CLR_FIFO);
+	sc->hold = 0;
+
+	if (istat & CDNC_I2C_ISR_XFER_TMOUT)
+		return (IIC_ETIMEOUT);
+	else if (istat & CDNC_I2C_ISR_RX_UNDF)
+		return (IIC_EUNDERFLOW);
+	else if (istat & (CDNC_I2C_ISR_RX_OVF | CDNC_I2C_ISR_TX_OVF))
+		return (IIC_EOVERFLOW);
+	else if (istat & CDNC_I2C_ISR_XFER_NACK)
+		return (IIC_ENOACK);
+	else if (istat & CDNC_I2C_ISR_ARB_LOST)
+		return (IIC_EBUSERR); /* XXX: ???? */
+	else
+		/* Should not happen */
+		return (IIC_NOERR);
+}
+
+static int
+cdnc_i2c_reset(device_t dev, u_char speed, u_char addr, u_char *oldaddr)
+{
+	struct cdnc_i2c_softc *sc = device_get_softc(dev);
+	int error;
+
+	DPRINTF("%s: speed=%d addr=0x%x\n", __func__, speed, addr);
+
+	I2C_SC_LOCK(sc);
+
+	sc->i2c_clock_freq = IICBUS_GET_FREQUENCY(sc->iicbus, speed);
+
+	error = cdnc_i2c_init_hw(sc);
+
+	I2C_SC_UNLOCK(sc);
+
+	return (error ? IIC_ENOTSUPP : IIC_NOERR);
+}
+
+static void
+cdnc_i2c_intr(void *arg)
+{
+	struct cdnc_i2c_softc *sc = (struct cdnc_i2c_softc *)arg;
+	uint16_t status;
+
+	I2C_SC_LOCK(sc);
+
+	sc->interrupts++;
+
+	/* Read active interrupts. */
+	status = RD2(sc, CDNC_I2C_ISR) & ~RD2(sc, CDNC_I2C_IMR);
+
+	/* Clear interrupts. */
+	WR2(sc, CDNC_I2C_ISR, status);
+
+	if (status & CDNC_I2C_ISR_XFER_TMOUT)
+		sc->timeout_ints++;
+
+	sc->istat |= status;
+
+	if (status)
+		wakeup(sc);
+
+	I2C_SC_UNLOCK(sc);
+}
+
+static int
+cdnc_i2c_xfer_rd(struct cdnc_i2c_softc *sc, struct iic_msg *msg)
+{
+	int error = IIC_NOERR;
+	uint16_t flags = msg->flags;
+	uint16_t len = msg->len;
+	int idx = 0, nbytes, last, first = 1;
+	uint16_t statr;
+
+	DPRINTF("%s: flags=0x%x len=%d\n", __func__, flags, len);
+
+#if 0
+	if (sc->hwtype == HWTYPE_CDNS_R1P10 && (flags & IIC_M_NOSTOP))
+		return (IIC_ENOTSUPP);
+#endif
+
+	I2C_SC_ASSERT_LOCKED(sc);
+
+	/* Program config register. */
+	sc->cfg_reg_shadow &= CDNC_I2C_CR_DIV_A_MASK | CDNC_I2C_CR_DIV_B_MASK;
+	sc->cfg_reg_shadow |= CDNC_I2C_CR_HOLD | CDNC_I2C_CR_ACKEN |
+	    CDNC_I2C_CR_NEA | CDNC_I2C_CR_MAST | CDNC_I2C_CR_RNW;
+	WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow | CDNC_I2C_CR_CLR_FIFO);
+	sc->hold = 1;
+
+	while (len > 0) {
+		nbytes = MIN(CDNC_I2C_FIFO_SIZE - 2, len);
+		WR1(sc, CDNC_I2C_TRANS_SIZE, nbytes);
+
+		last = nbytes == len && !(flags & IIC_M_NOSTOP);
+		if (last) {
+			/* Clear HOLD bit on last transfer. */
+			sc->cfg_reg_shadow &= ~CDNC_I2C_CR_HOLD;
+			WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow);
+			sc->hold = 0;
+		}
+
+		/* Writing slv address for a start or repeated start. */
+		if (first && !(flags & IIC_M_NOSTART))
+			WR2(sc, CDNC_I2C_ADDR, msg->slave >> 1);
+		first = 0;
+
+		/* Enable FIFO interrupts and wait. */
+		if (last)
+			WR2(sc, CDNC_I2C_IER, CDNC_I2C_ISR_XFER_DONE |
+			    CDNC_I2C_ISR_ERRS);
+		else
+			WR2(sc, CDNC_I2C_IER, CDNC_I2C_ISR_XFER_DATA |
+			    CDNC_I2C_ISR_ERRS);
+
+		error = mtx_sleep(sc, &sc->sc_mtx, 0, "cdi2c", hz);
+
+		/* Disable FIFO interrupts. */
+		WR2(sc, CDNC_I2C_IDR, CDNC_I2C_ISR_XFER_DATA |
+		    CDNC_I2C_ISR_XFER_DONE | CDNC_I2C_ISR_ERRS);
+
+		if (error == EWOULDBLOCK)
+			error = cdnc_i2c_errs(sc, CDNC_I2C_ISR_XFER_TMOUT);
+		else if (sc->istat & CDNC_I2C_ISR_ERRS)
+			error = cdnc_i2c_errs(sc, sc->istat);
+		sc->istat = 0;
+
+		if (error != IIC_NOERR)
+			break;
+
+		/* Read nbytes from FIFO. */
+		while (nbytes-- > 0) {
+			statr = RD2(sc, CDNC_I2C_SR);
+			if (!(statr & CDNC_I2C_SR_RX_VALID)) {
+				printf("%s: RX FIFO underflow?\n", __func__);
+				break;
+			}
+			msg->buf[idx++] = RD2(sc, CDNC_I2C_DATA);
+			len--;
+		}
+	}
+
+	return (error);
+}
+
+static int
+cdnc_i2c_xfer_wr(struct cdnc_i2c_softc *sc, struct iic_msg *msg)
+{
+	int error = IIC_NOERR;
+	uint16_t flags = msg->flags;
+	uint16_t len = msg->len;
+	int idx = 0, nbytes, last, first = 1;
+
+	DPRINTF("%s: flags=0x%x len=%d\n", __func__, flags, len);
+
+	I2C_SC_ASSERT_LOCKED(sc);
+
+	/* Program config register. */
+	sc->cfg_reg_shadow &= CDNC_I2C_CR_DIV_A_MASK | CDNC_I2C_CR_DIV_B_MASK;
+	sc->cfg_reg_shadow |= CDNC_I2C_CR_HOLD | CDNC_I2C_CR_ACKEN |
+	    CDNC_I2C_CR_NEA | CDNC_I2C_CR_MAST;
+	WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow | CDNC_I2C_CR_CLR_FIFO);
+	sc->hold = 1;
+
+	while (len > 0) {
+		/* Put as much data into fifo as you can. */
+		nbytes = MIN(len, CDNC_I2C_FIFO_SIZE -
+		    RD1(sc, CDNC_I2C_TRANS_SIZE) - 1);
+		len -= nbytes;
+		while (nbytes-- > 0)
+			WR2(sc, CDNC_I2C_DATA, msg->buf[idx++]);
+
+		last = len == 0 && !(flags & IIC_M_NOSTOP);
+		if (last) {
+			/* Clear HOLD bit on last transfer. */
+			sc->cfg_reg_shadow &= ~CDNC_I2C_CR_HOLD;
+			WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow);
+			sc->hold = 0;
+		}
+
+		/* Perform START if this is start or repeated start. */
+		if (first && !(flags & IIC_M_NOSTART))
+			WR2(sc, CDNC_I2C_ADDR, msg->slave >> 1);
+		first = 0;
+
+		/* Enable FIFO interrupts. */
+		WR2(sc, CDNC_I2C_IER, CDNC_I2C_ISR_XFER_DONE |
+		    CDNC_I2C_ISR_ERRS);
+
+		/* Wait for end of data transfer. */
+		error = mtx_sleep(sc, &sc->sc_mtx, 0, "cdi2c", hz);
+
+		/* Disable FIFO interrupts. */
+		WR2(sc, CDNC_I2C_IDR, CDNC_I2C_ISR_XFER_DONE |
+		    CDNC_I2C_ISR_ERRS);
+
+		if (error == EWOULDBLOCK)
+			error = cdnc_i2c_errs(sc, CDNC_I2C_ISR_XFER_TMOUT);
+		else if (sc->istat & CDNC_I2C_ISR_ERRS)
+			error = cdnc_i2c_errs(sc, sc->istat);
+		sc->istat = 0;
+		if (error)
+			break;
+	}
+
+	return (error);
+}
+
+static int
+cdnc_i2c_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs)
+{
+	struct cdnc_i2c_softc *sc = device_get_softc(dev);
+	int i, error = IIC_NOERR;
+
+	DPRINTF("%s: nmsgs=%d\n", __func__, nmsgs);
+
+	I2C_SC_LOCK(sc);
+
+	for (i = 0; i < nmsgs; i++) {
+		DPRINTF("%s: msg[%d]: hold=%d slv=0x%x flags=0x%x len=%d\n",
+		    __func__, i, sc->hold, msgs[i].slave, msgs[i].flags,
+		    msgs[i].len);
+
+		if (!sc->hold && (msgs[i].flags & IIC_M_NOSTART))
+			return (IIC_ENOTSUPP);
+
+		if (msgs[i].flags & IIC_M_RD) {
+			error = cdnc_i2c_xfer_rd(sc, &msgs[i]);
+			if (error != IIC_NOERR)
+				break;
+		} else {
+			error = cdnc_i2c_xfer_wr(sc, &msgs[i]);
+			if (error != IIC_NOERR)
+				break;
+		}
+	}
+
+	I2C_SC_UNLOCK(sc);
+
+	return (error);
+}
+
+static void
+cdnc_i2c_add_sysctls(device_t dev)
+{
+	struct cdnc_i2c_softc *sc = device_get_softc(dev);
+	struct sysctl_ctx_list *ctx;
+	struct sysctl_oid_list *child;
+
+	ctx = device_get_sysctl_ctx(dev);
+	child = SYSCTL_CHILDREN(device_get_sysctl_tree(dev));
+
+	SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "i2c_clk_real_freq", CTLFLAG_RD,
+	    &sc->i2c_clk_real_freq, 0, "i2c clock real frequency");
+
+	SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "_interrupts", CTLFLAG_RD,
+	    &sc->interrupts, 0, "interrupt calls");
+	SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "_timeouts", CTLFLAG_RD,
+	    &sc->timeout_ints, 0, "hardware timeout interrupts");
+}
+
+
+static int
+cdnc_i2c_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
+		return (ENXIO);
+
+	device_set_desc(dev, "Cadence I2C Controller");
+
+	return (BUS_PROBE_DEFAULT);
+}
+
+
+static int cdnc_i2c_detach(device_t);
+
+static int
+cdnc_i2c_attach(device_t dev)
+{
+	struct cdnc_i2c_softc *sc;
+	int rid, err;
+	phandle_t node;
+	pcell_t cell;
+	uint64_t freq;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+	sc->hwtype = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
+
+	I2C_SC_LOCK_INIT(sc);
+
+	/* Get ref-clock and i2c-clock properties. */
+	node = ofw_bus_get_node(dev);
+	if (OF_getprop(node, "ref-clock", &cell, sizeof(cell)) > 0)
+		sc->ref_clock_freq = fdt32_to_cpu(cell);
+	else if (clk_get_by_ofw_index(dev, node, 0, &sc->ref_clk) == 0) {
+		if ((err = clk_enable(sc->ref_clk)) != 0)
+			device_printf(dev, "Cannot enable clock. err=%d\n",
+			    err);
+		else if ((err = clk_get_freq(sc->ref_clk, &freq)) != 0)
+			device_printf(dev,
+			    "Cannot get clock frequency. err=%d\n", err);
+		else
+			sc->ref_clock_freq = freq;
+	}
+	else {
+		device_printf(dev, "must have ref-clock property\n");
+		return (ENXIO);
+	}
+	if (OF_getprop(node, "clock-frequency", &cell, sizeof(cell)) > 0)
+		sc->i2c_clock_freq = fdt32_to_cpu(cell);
+	else
+		sc->i2c_clock_freq = CDNC_I2C_DEFAULT_I2C_CLOCK;
+
+	/* Get memory resource. */
+	rid = 0;
+	sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (sc->mem_res == NULL) {
+		device_printf(dev, "could not allocate memory resources.\n");
+		cdnc_i2c_detach(dev);
+		return (ENOMEM);
+	}
+
+	/* Allocate IRQ. */
+	rid = 0;
+	sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_ACTIVE);
+	if (sc->irq_res == NULL) {
+		device_printf(dev, "could not allocate IRQ resource.\n");
+		cdnc_i2c_detach(dev);
+		return (ENOMEM);
+	}
+
+	/* Activate the interrupt. */
+	err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE,
+	    NULL, cdnc_i2c_intr, sc, &sc->intrhandle);
+	if (err) {
+		device_printf(dev, "could not setup IRQ.\n");
+		cdnc_i2c_detach(dev);
+		return (err);
+	}
+
+	/* Configure the device. */
+	err = cdnc_i2c_init_hw(sc);
+	if (err) {
+		cdnc_i2c_detach(dev);
+		return (err);
+	}
+
+	sc->iicbus = device_add_child(dev, "iicbus", -1);
+
+	cdnc_i2c_add_sysctls(dev);
+
+	/* Probe and attach iicbus when interrupts work. */
+	return (bus_delayed_attach_children(dev));
+}
+
+static int
+cdnc_i2c_detach(device_t dev)
+{
+	struct cdnc_i2c_softc *sc = device_get_softc(dev);
+
+	if (device_is_attached(dev))
+		bus_generic_detach(dev);
+
+	if (sc->ref_clk != NULL) {
+		clk_release(sc->ref_clk);
+		sc->ref_clk = NULL;
+	}
+
+	/* Delete iic bus. */
+	if (sc->iicbus)
+		device_delete_child(dev, sc->iicbus);
+
+	/* Disable hardware. */
+	if (sc->mem_res != NULL) {
+		sc->cfg_reg_shadow = 0;
+		WR2(sc, CDNC_I2C_CR, CDNC_I2C_CR_CLR_FIFO);
+
+		/* Clear and disable all interrupts. */
+		WR2(sc, CDNC_I2C_ISR, CDNC_I2C_ISR_ALL);
+		WR2(sc, CDNC_I2C_IDR, CDNC_I2C_ISR_ALL);
+	}
+
+	/* Teardown and release interrupt. */
+	if (sc->irq_res != NULL) {
+		if (sc->intrhandle)
+			bus_teardown_intr(dev, sc->irq_res, sc->intrhandle);
+		bus_release_resource(dev, SYS_RES_IRQ,
+		    rman_get_rid(sc->irq_res), sc->irq_res);
+		sc->irq_res = NULL;
+	}
+
+	/* Release memory resource. */
+	if (sc->mem_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY,
+		    rman_get_rid(sc->mem_res), sc->mem_res);
+		sc->mem_res = NULL;
+	}
+
+	I2C_SC_LOCK_DESTROY(sc);
+
+	return (0);
+}
+
+
+static phandle_t
+cdnc_i2c_get_node(device_t bus, device_t dev)
+{
+
+	return (ofw_bus_get_node(bus));
+}
+
+static device_method_t cdnc_i2c_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,			cdnc_i2c_probe),
+	DEVMETHOD(device_attach,		cdnc_i2c_attach),
+	DEVMETHOD(device_detach,		cdnc_i2c_detach),
+
+	/* ofw_bus interface */
+	DEVMETHOD(ofw_bus_get_node,		cdnc_i2c_get_node),
+
+	/* iicbus methods */
+	DEVMETHOD(iicbus_callback,              iicbus_null_callback),
+	DEVMETHOD(iicbus_reset,			cdnc_i2c_reset),
+	DEVMETHOD(iicbus_transfer,		cdnc_i2c_transfer),
+
+	DEVMETHOD_END
+};
+
+static driver_t cdnc_i2c_driver = {
+	"cdnc_i2c",
+	cdnc_i2c_methods,
+	sizeof(struct cdnc_i2c_softc),
+};
+
+DRIVER_MODULE(cdnc_i2c, simplebus, cdnc_i2c_driver, NULL, NULL);
+DRIVER_MODULE(ofw_iicbus, cdnc_i2c, ofw_iicbus_driver, NULL, NULL);
+MODULE_DEPEND(cdnc_i2c, iicbus, 1, 1, 1);
+MODULE_DEPEND(cdnc_i2c, ofw_iicbus, 1, 1, 1);
+SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/iicoc.c b/sys/dev/iicbus/controller/opencores/iicoc.c
similarity index 100%
rename from sys/dev/iicbus/iicoc.c
rename to sys/dev/iicbus/controller/opencores/iicoc.c
diff --git a/sys/dev/iicbus/iicoc.h b/sys/dev/iicbus/controller/opencores/iicoc.h
similarity index 100%
rename from sys/dev/iicbus/iicoc.h
rename to sys/dev/iicbus/controller/opencores/iicoc.h
diff --git a/sys/dev/iicbus/iicoc_fdt.c b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c
similarity index 100%
rename from sys/dev/iicbus/iicoc_fdt.c
rename to sys/dev/iicbus/controller/opencores/iicoc_fdt.c
diff --git a/sys/dev/iicbus/iicoc_pci.c b/sys/dev/iicbus/controller/opencores/iicoc_pci.c
similarity index 100%
rename from sys/dev/iicbus/iicoc_pci.c
rename to sys/dev/iicbus/controller/opencores/iicoc_pci.c
diff --git a/sys/dev/iicbus/twsi/a10_twsi.c b/sys/dev/iicbus/controller/twsi/a10_twsi.c
similarity index 98%
rename from sys/dev/iicbus/twsi/a10_twsi.c
rename to sys/dev/iicbus/controller/twsi/a10_twsi.c
index 3b61d338e580..de3f6a92f44f 100644
--- a/sys/dev/iicbus/twsi/a10_twsi.c
+++ b/sys/dev/iicbus/controller/twsi/a10_twsi.c
@@ -41,7 +41,7 @@
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
-#include <dev/iicbus/twsi/twsi.h>
+#include <dev/iicbus/controller/twsi/twsi.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/dev/iicbus/twsi/mv_twsi.c b/sys/dev/iicbus/controller/twsi/mv_twsi.c
similarity index 99%
rename from sys/dev/iicbus/twsi/mv_twsi.c
rename to sys/dev/iicbus/controller/twsi/mv_twsi.c
index 3f50bb0c4968..35f5b0acc650 100644
--- a/sys/dev/iicbus/twsi/mv_twsi.c
+++ b/sys/dev/iicbus/controller/twsi/mv_twsi.c
@@ -63,7 +63,7 @@
 
 #include <arm/mv/mvreg.h>
 #include <arm/mv/mvvar.h>
-#include <dev/iicbus/twsi/twsi.h>
+#include <dev/iicbus/controller/twsi/twsi.h>
 
 #include "iicbus_if.h"
 
diff --git a/sys/dev/iicbus/twsi/twsi.c b/sys/dev/iicbus/controller/twsi/twsi.c
similarity index 99%
rename from sys/dev/iicbus/twsi/twsi.c
rename to sys/dev/iicbus/controller/twsi/twsi.c
index 802110ed7f99..7031cce515ce 100644
--- a/sys/dev/iicbus/twsi/twsi.c
+++ b/sys/dev/iicbus/controller/twsi/twsi.c
@@ -56,7 +56,7 @@
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 
-#include <dev/iicbus/twsi/twsi.h>
+#include <dev/iicbus/controller/twsi/twsi.h>
 
 #include "iicbus_if.h"
 
diff --git a/sys/dev/iicbus/twsi/twsi.h b/sys/dev/iicbus/controller/twsi/twsi.h
similarity index 100%
rename from sys/dev/iicbus/twsi/twsi.h
rename to sys/dev/iicbus/controller/twsi/twsi.h
diff --git a/sys/dev/iicbus/sy8106a.c b/sys/dev/iicbus/pmic/silergy/sy8106a.c
similarity index 100%
rename from sys/dev/iicbus/sy8106a.c
rename to sys/dev/iicbus/pmic/silergy/sy8106a.c
diff --git a/sys/dev/iicbus/syr827.c b/sys/dev/iicbus/pmic/silergy/syr827.c
similarity index 100%
rename from sys/dev/iicbus/syr827.c
rename to sys/dev/iicbus/pmic/silergy/syr827.c
diff --git a/sys/dev/iicbus/adm1030.c b/sys/dev/iicbus/pwm/adm1030.c
similarity index 100%
rename from sys/dev/iicbus/adm1030.c
rename to sys/dev/iicbus/pwm/adm1030.c
diff --git a/sys/dev/iicbus/adt746x.c b/sys/dev/iicbus/pwm/adt746x.c
similarity index 100%
rename from sys/dev/iicbus/adt746x.c
rename to sys/dev/iicbus/pwm/adt746x.c
diff --git a/sys/dev/iicbus/ds1307.c b/sys/dev/iicbus/rtc/ds1307.c
similarity index 99%
rename from sys/dev/iicbus/ds1307.c
rename to sys/dev/iicbus/rtc/ds1307.c
index 6522b3284bf3..e8d24880571c 100644
--- a/sys/dev/iicbus/ds1307.c
+++ b/sys/dev/iicbus/rtc/ds1307.c
@@ -48,7 +48,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #endif
 
-#include <dev/iicbus/ds1307reg.h>
+#include <dev/iicbus/rtc/ds1307reg.h>
 
 #include "clock_if.h"
 #include "iicbus_if.h"
diff --git a/sys/dev/iicbus/ds1307reg.h b/sys/dev/iicbus/rtc/ds1307reg.h
similarity index 100%
rename from sys/dev/iicbus/ds1307reg.h
rename to sys/dev/iicbus/rtc/ds1307reg.h
diff --git a/sys/dev/iicbus/ds13rtc.c b/sys/dev/iicbus/rtc/ds13rtc.c
similarity index 100%
rename from sys/dev/iicbus/ds13rtc.c
rename to sys/dev/iicbus/rtc/ds13rtc.c
diff --git a/sys/dev/iicbus/ds1672.c b/sys/dev/iicbus/rtc/ds1672.c
similarity index 100%
rename from sys/dev/iicbus/ds1672.c
rename to sys/dev/iicbus/rtc/ds1672.c
diff --git a/sys/dev/iicbus/ds3231.c b/sys/dev/iicbus/rtc/ds3231.c
similarity index 99%
rename from sys/dev/iicbus/ds3231.c
rename to sys/dev/iicbus/rtc/ds3231.c
index eb45f6fcf6e6..23e88eb7ecd3 100644
--- a/sys/dev/iicbus/ds3231.c
+++ b/sys/dev/iicbus/rtc/ds3231.c
@@ -47,7 +47,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #endif
 
-#include <dev/iicbus/ds3231reg.h>
+#include <dev/iicbus/rtc/ds3231reg.h>
 
 #include "clock_if.h"
 #include "iicbus_if.h"
diff --git a/sys/dev/iicbus/ds3231reg.h b/sys/dev/iicbus/rtc/ds3231reg.h
similarity index 100%
rename from sys/dev/iicbus/ds3231reg.h
rename to sys/dev/iicbus/rtc/ds3231reg.h
diff --git a/sys/dev/iicbus/isl12xx.c b/sys/dev/iicbus/rtc/isl12xx.c
similarity index 100%
rename from sys/dev/iicbus/isl12xx.c
rename to sys/dev/iicbus/rtc/isl12xx.c
diff --git a/sys/dev/iicbus/nxprtc.c b/sys/dev/iicbus/rtc/nxprtc.c
similarity index 100%
rename from sys/dev/iicbus/nxprtc.c
rename to sys/dev/iicbus/rtc/nxprtc.c
diff --git a/sys/dev/iicbus/rtc8583.c b/sys/dev/iicbus/rtc/rtc8583.c
similarity index 100%
rename from sys/dev/iicbus/rtc8583.c
rename to sys/dev/iicbus/rtc/rtc8583.c
diff --git a/sys/dev/iicbus/rtc/rv3032.c b/sys/dev/iicbus/rtc/rv3032.c
new file mode 100644
index 000000000000..67805dcb7939
--- /dev/null
+++ b/sys/dev/iicbus/rtc/rv3032.c
@@ -0,0 +1,455 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#include "opt_platform.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/clock.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/module.h>
+#include <sys/sysctl.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/iicbus/iiconf.h>
+#include <dev/iicbus/iicbus.h>
+
+#include "clock_if.h"
+#include "iicbus_if.h"
+
+/* Date registers */
+#define	RV3032_SECS_100TH	0x00
+#define	RV3032_SECS		0x01
+#define	RV3032_MINS		0x02
+#define	RV3032_HOURS		0x03
+#define	RV3032_WEEKDAY		0x04
+#define	RV3032_DATE		0x05
+#define	RV3032_MONTH		0x06
+#define	RV3032_YEAR		0x07
+
+/* Alarm registers */
+#define	RV3032_ALARM_MINUTES	0x08
+#define	RV3032_ALARM_HOURS	0x09
+#define	RV3032_ALARM_DATE	0x0A
+
+/* Periodic countdown timer registers */
+#define	RV3032_TIMER_VALUE0	0x0B
+#define	RV3032_TIMER_VALUE1	0x0C
+
+/* Status register */
+#define	RV3032_STATUS		0x0D
+#define	 RV3032_STATUS_VLF	(1 << 0)	/* Voltage Low Flag */
+#define	 RV3032_STATUS_PORF	(1 << 1)	/* Power On Reset Flag */
+#define	 RV3032_STATUS_EVF	(1 << 2)	/* External eVent Flag */
+#define	 RV3032_STATUS_AF	(1 << 3)	/* Alarm Flag */
+#define	 RV3032_STATUS_TF	(1 << 4)	/* periodic countdown Timer Flag */
+#define	 RV3032_STATUS_UF	(1 << 5)	/* periodic time Update Flag */
+#define	 RV3032_STATUS_TLF 	(1 << 6)	/* Temperature Low Flag */
+#define	 RV3032_STATUS_THF	(1 << 7)	/* Temperature High Flag */
+
+/* Temperature registers */
+#define	RV3032_TEMP_LSB		0x0E
+#define	 RV3032_TEMP_LSB_BSF	(1 << 0)
+#define	 RV3032_TEMP_LSB_CLKF	(1 << 1)
+#define	 RV3032_TEMP_LSB_EEBUSY	(1 << 2)
+#define	 RV3032_TEMP_LSB_EEF	(1 << 3)
+#define	 RV3032_TEMP_LSB_MASK	(0xF0)
+#define	 RV3032_TEMP_LSB_SHIFT	4
+
+#define	RV3032_TEMP_MSB		0x0F
+
+#define	TEMP_DIV		16
+#define	TEMP_C_TO_K		273
+
+/* Control registers */
+#define	RV3032_CTRL1		0x10
+#define	 RV3032_CTRL1_TD_MASK	0x3	/* Timer clock frequency */
+#define	 RV3032_CTRL1_TD_SHIFT	0
+#define	 RV3032_CTRL1_TD_4096	0
+#define	 RV3032_CTRL1_TD_64	1
+#define	 RV3032_CTRL1_TD_1	2
+#define	 RV3032_CTRL1_TD_1_60	3
+#define	 RV3032_CTRL1_EERD	(1 << 2)	/* EEPROM memory refresh disable bit */
+#define	 RV3032_CTRL1_TE	(1 << 3)	/* Periodic countdown timer enable bit */
+#define	 RV3032_CTRL1_USEL	(1 << 4)	/* Update interrupt select bit */
+#define	 RV3032_CTRL1_GP0	(1 << 5)	/* General Purpose bit 0 */
+
+#define	RV3032_CTRL2		0x11
+#define	 RV3032_CTRL2_STOP	(1 << 0)	/* Stop bit */
+#define	 RV3032_CTRL2_GP1	(1 << 1)	/* General Purpose bit 1 */
+#define	 RV3032_CTRL2_EIE	(1 << 2)	/* External event interrupt enable bit */
+#define	 RV3032_CTRL2_AIE	(1 << 3)	/* Alarm interrupt enable bit */
+#define	 RV3032_CTRL2_TIE	(1 << 4)	/* Periodic countdown timer interrupt enable bit */
+#define	 RV3032_CTRL2_UIE	(1 << 5)	/* Periodic time update interrupt enable bit */
+#define	 RV3032_CTRL2_CLKIE	(1 << 6)	/* Interrupt Controlled Clock Output Enable bit */
+#define	RV3032_CTRL3		0x12
+#define	 RV3032_CTRL3_TLIE	(1 << 0)	/* Temperature Low Interrupt Enable bit */
+#define	 RV3032_CTRL3_THIE	(1 << 1)	/* Temperature High Interrupt Enable bit */
+#define	 RV3032_CTRL3_TLE	(1 << 2)	/* Temperature Low Enable bit */
+#define	 RV3032_CTRL3_THE	(1 << 3)	/* Temperature High Enable bit */
+#define	 RV3032_CTRL3_BSIE	(1 << 4)	/* Backup Switchover Interrupt Enable bit */
+
+/* EEPROM registers */
+#define	RV3032_EEPROM_ADDRESS		0x3D
+#define	RV3032_EEPROM_DATA		0x3E
+#define	RV3032_EEPROM_COMMAND		0x3F
+#define RV3032_EEPROM_CMD_UPDATE	0x11
+#define RV3032_EEPROM_CMD_REFRESH	0x12
+#define RV3032_EEPROM_CMD_WRITE_ONE	0x21
+#define RV3032_EEPROM_CMD_READ_ONE	0x22
+
+/* PMU register */
+#define	RV3032_EEPROM_PMU	0xC0
+#define	 RV3032_PMU_TCM_MASK	0x3
+#define	 RV3032_PMU_TCM_SHIFT	0
+#define	 RV3032_PMU_TCM_OFF	0
+#define	 RV3032_PMU_TCM_175V	1
+#define	 RV3032_PMU_TCM_30V	2
+#define	 RV3032_PMU_TCM_45V	3
+#define	 RV3032_PMU_TCR_MASK	0x3
+#define	 RV3032_PMU_TCR_SHIFT	2
+#define	 RV3032_PMU_TCR_06K	0
+#define	 RV3032_PMU_TCR_2K	1
+#define	 RV3032_PMU_TCR_7K	2
+#define	 RV3032_PMU_TCR_12K	3
+#define	 RV3032_PMU_BSM_MASK	0x3
+#define	 RV3032_PMU_BSM_SHIFT	4
+#define	 RV3032_PMU_BSM_OFF	0
+#define	 RV3032_PMU_BSM_DSM	1
+#define	 RV3032_PMU_BSM_LSM	2
+#define	 RV3032_PMU_BSM_OFF2	3
+#define	 RV3032_PMU_NCLKE	(1 << 6)
+
+struct rv3032_softc {
+	device_t		dev;
+	device_t		busdev;
+	struct intr_config_hook	init_hook;
+};
+
+struct rv3032_timeregs {
+	uint8_t	secs;
+	uint8_t	mins;
+	uint8_t	hours;
+	uint8_t	weekday;
+	uint8_t	date;
+	uint8_t	month;
+	uint8_t	year;
+};
+
+static struct ofw_compat_data compat_data[] = {
+	{"microcrystal,rv3032",	1},
+	{NULL,			0},
+};
+
+static int
+rv3032_update_register(struct rv3032_softc *sc, uint8_t reg, uint8_t value, uint8_t mask)
+{
+	int rv;
+	uint8_t data;
+
+	if ((rv = iicdev_readfrom(sc->dev, reg, &data, 1, IIC_WAIT)) != 0)
+		return (rv);
+	data &= mask;
+	data |= value;
+	if ((rv = iicdev_writeto(sc->dev, reg, &data, 1, IIC_WAIT)) != 0)
+		return (rv);
+	return (0);
+}
+
+static int
+rv3032_eeprom_wait(struct rv3032_softc *sc)
+{
+	int rv, timeout;
+	uint8_t data;
+
+	for (timeout = 1000; timeout > 0; timeout--) {
+		if ((rv = iicdev_readfrom(sc->dev, RV3032_TEMP_LSB, &data, sizeof(data), IIC_WAIT)) != 0)
+		return (rv);
+		if ((data & RV3032_TEMP_LSB_EEBUSY) == 0) {
+			break;
+		}
+	}
+	if (timeout == 0) {
+		device_printf(sc->dev, "Timeout updating the eeprom\n");
+		return (ETIMEDOUT);
+	}
+	/* Wait 1ms before allowing another eeprom access */
+	DELAY(1000);
+
+	return (0);
+}
+
+static int
+rv3032_eeprom_disable(struct rv3032_softc *sc)
+{
+	int rv;
+
+	if ((rv = rv3032_update_register(sc, RV3032_CTRL1, RV3032_CTRL1_EERD, ~RV3032_CTRL1_EERD)) != 0)
+		return (rv);
+	/* Wait 1ms before checking EBUSY */
+	DELAY(1000);
+	return (rv3032_eeprom_wait(sc));
+}
+
+static int
+rv3032_eeprom_update(struct rv3032_softc *sc)
+{
+	int rv;
+	uint8_t data;
+
+	data = RV3032_EEPROM_CMD_UPDATE;
+	if ((rv = iicdev_writeto(sc->dev, RV3032_EEPROM_COMMAND, &data, sizeof(data), IIC_WAIT)) != 0)
+		return (rv);
+	/* Wait 1ms before checking EBUSY */
+	DELAY(1000);
+	return (rv3032_eeprom_wait(sc));
+}
+
+static int
+rv3032_eeprom_enable(struct rv3032_softc *sc)
+{
+	int rv;
+
+	/* Restore eeprom refresh */
+	if ((rv = rv3032_update_register(sc, RV3032_CTRL1, 0, ~RV3032_CTRL1_EERD)) != 0)
+		return (rv);
+	DELAY(1000);
+
+	return (0);
+}
+
+static int
+rv3032_update_cfg(struct rv3032_softc *sc)
+{
+	int rv;
+
+	if ((rv = rv3032_eeprom_disable(sc)) != 0)
+		return (rv);
+
+	/* Save configuration in eeprom and re-enable it */
+	if ((rv = rv3032_eeprom_update(sc)) != 0)
+		return (rv);
+	return (rv3032_eeprom_enable(sc));
+}
+
+static int
+rv3032_temp_read(struct rv3032_softc *sc, int *temp)
+{
+	int rv, temp2;
+	uint8_t data[2];
+
+	if ((rv = iicdev_readfrom(sc->dev, RV3032_TEMP_LSB, &data, sizeof(data), IIC_WAIT)) != 0)
+		return (rv);
+
+	/* Wait for temp to be stable */
+	*temp = (((data[0] & RV3032_TEMP_LSB_MASK) >> RV3032_TEMP_LSB_SHIFT) |
+	    (data[1] << RV3032_TEMP_LSB_SHIFT));
+	do {
+		temp2 = *temp;
+		*temp = (((data[0] & RV3032_TEMP_LSB_MASK) >> RV3032_TEMP_LSB_SHIFT) |
+		    (data[1] << RV3032_TEMP_LSB_SHIFT));
+	} while (temp2 != *temp);
+	*temp = (*temp / TEMP_DIV) + TEMP_C_TO_K;
+	return (0);
+}
+
+static int
+rv3032_temp_sysctl(SYSCTL_HANDLER_ARGS)
+{
+	int error, temp;
+	struct rv3032_softc *sc;
+
+	sc = (struct rv3032_softc *)arg1;
+	if (rv3032_temp_read(sc, &temp) != 0)
+		return (EIO);
+	error = sysctl_handle_int(oidp, &temp, 0, req);
+
+	return (error);
+}
+
+static void
+rv3032_init(void *arg)
+{
+	struct rv3032_softc	*sc;
+	struct sysctl_ctx_list *ctx;
+	struct sysctl_oid *tree_node;
+	struct sysctl_oid_list *tree;
+	int rv;
+
+	sc = (struct rv3032_softc*)arg;
+	config_intrhook_disestablish(&sc->init_hook);
+
+	/* Set direct switching mode */
+	rv3032_update_register(sc,
+	    RV3032_EEPROM_PMU,
+	    RV3032_PMU_BSM_DSM << RV3032_PMU_BSM_SHIFT,
+	    RV3032_PMU_BSM_MASK);
+	if ((rv = rv3032_update_cfg(sc)) != 0) {
+		device_printf(sc->dev, "Cannot set to DSM mode (%d)\n", rv);
+		return;
+	}
+
+	/* Register as clock source */
+	clock_register_flags(sc->dev, 1000000, CLOCKF_SETTIME_NO_ADJ);
+	clock_schedule(sc->dev, 1);
+
+	ctx = device_get_sysctl_ctx(sc->dev);
+	tree_node = device_get_sysctl_tree(sc->dev);
+	tree = SYSCTL_CHILDREN(tree_node);
+	SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "temperature",
+	    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
+	    rv3032_temp_sysctl, "IK0", "Current temperature");
+	return;
+}
+
+static int
+rv3032_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) {
+		device_set_desc(dev, "Microcrystal RV3032");
+		return (BUS_PROBE_DEFAULT);
+	}
+	return (ENXIO);
+}
+
+static int
+rv3032_attach(device_t dev)
+{
+	struct rv3032_softc	*sc;
+	
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+	sc->busdev = device_get_parent(sc->dev);
+
+	sc->init_hook.ich_func = rv3032_init;
+	sc->init_hook.ich_arg = sc;
+	if (config_intrhook_establish(&sc->init_hook) != 0)
+		return (ENOMEM);
+
+	return (0);
+}
+
+static int
+rv3032_detach(device_t dev)
+{
+
+	clock_unregister(dev);
+	return (0);
+}
+
+static int
+rv3032_gettime(device_t dev, struct timespec *ts)
+{
+	struct rv3032_softc *sc;
+	struct rv3032_timeregs time_regs;
+	struct clocktime ct;
+	uint8_t status;
+	int rv;
+
+	sc = device_get_softc(dev);
+
+	if ((rv = iicdev_readfrom(sc->dev, RV3032_STATUS, &status, sizeof(status), IIC_WAIT)) != 0)
+		return (rv);
+	if (status & (RV3032_STATUS_PORF | RV3032_STATUS_VLF))
+		return (EINVAL);
+	if ((rv = iicdev_readfrom(sc->dev, RV3032_SECS, &time_regs, sizeof(time_regs), IIC_WAIT)) != 0)
+		return (rv);
+
+	bzero(&ct, sizeof(ct));
+	ct.sec = FROMBCD(time_regs.secs & 0x7f);
+	ct.min = FROMBCD(time_regs.mins & 0x7f);
+	ct.hour = FROMBCD(time_regs.hours & 0x3f);
+	ct.day = FROMBCD(time_regs.date & 0x3f);
+	ct.mon = FROMBCD(time_regs.month & 0x1f) - 1;
+	ct.year = FROMBCD(time_regs.year) + 2000;
+
+	return (clock_ct_to_ts(&ct, ts));
+}
+
+static int
+rv3032_settime(device_t dev, struct timespec *ts)
+{
+	struct rv3032_softc *sc;
+	struct rv3032_timeregs time_regs;
+	struct clocktime ct;
+	uint8_t status;
+	int rv;
+
+	sc = device_get_softc(dev);
+	if ((rv = iicdev_readfrom(sc->dev, RV3032_STATUS, &status, sizeof(status), IIC_WAIT)) != 0)
+		return (rv);
+
+	clock_ts_to_ct(ts, &ct);
+
+	time_regs.secs = TOBCD(ct.sec);
+	time_regs.mins = TOBCD(ct.min);
+	time_regs.hours = TOBCD(ct.hour);
+	time_regs.date = TOBCD(ct.day);
+	time_regs.month = TOBCD(ct.mon + 1);
+	time_regs.year = TOBCD(ct.year - 2000);
+
+	if ((rv = iicdev_writeto(sc->dev, RV3032_SECS, &time_regs, sizeof(time_regs), IIC_WAIT)) != 0)
+		return (rv);
+
+	/* Force a power on reset event so rv3032 reload the registers */
+	status &= ~(RV3032_STATUS_PORF | RV3032_STATUS_VLF);
+	if ((rv = iicdev_writeto(sc->dev, RV3032_STATUS, &status, sizeof(status), IIC_WAIT)) != 0)
+		return (rv);
+	return (0);
+}
+
+static device_method_t rv3032_methods[] = {
+        /* device_if methods */
+	DEVMETHOD(device_probe,		rv3032_probe),
+	DEVMETHOD(device_attach,	rv3032_attach),
+	DEVMETHOD(device_detach,	rv3032_detach),
+
+        /* clock_if methods */
+	DEVMETHOD(clock_gettime,	rv3032_gettime),
+	DEVMETHOD(clock_settime,	rv3032_settime),
+
+	DEVMETHOD_END,
+};
+
+static driver_t rv3032_driver = {
+	"rv3032",
+	rv3032_methods,
+	sizeof(struct rv3032_softc),
+};
+
+DRIVER_MODULE(rv3032, iicbus, rv3032_driver, NULL, NULL);
+MODULE_VERSION(rv3032, 1);
+MODULE_DEPEND(rv3032, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
+IICBUS_FDT_PNP_INFO(compat_data);
diff --git a/sys/dev/iicbus/s35390a.c b/sys/dev/iicbus/rtc/s35390a.c
similarity index 100%
rename from sys/dev/iicbus/s35390a.c
rename to sys/dev/iicbus/rtc/s35390a.c
diff --git a/sys/dev/iicbus/ds1631.c b/sys/dev/iicbus/sensor/ds1631.c
similarity index 100%
rename from sys/dev/iicbus/ds1631.c
rename to sys/dev/iicbus/sensor/ds1631.c
diff --git a/sys/dev/iicbus/ds1775.c b/sys/dev/iicbus/sensor/ds1775.c
similarity index 100%
rename from sys/dev/iicbus/ds1775.c
rename to sys/dev/iicbus/sensor/ds1775.c
diff --git a/sys/dev/iicbus/htu21.c b/sys/dev/iicbus/sensor/htu21.c
similarity index 100%
rename from sys/dev/iicbus/htu21.c
rename to sys/dev/iicbus/sensor/htu21.c
diff --git a/sys/dev/iicbus/lm75.c b/sys/dev/iicbus/sensor/lm75.c
similarity index 100%
rename from sys/dev/iicbus/lm75.c
rename to sys/dev/iicbus/sensor/lm75.c
diff --git a/sys/dev/iicbus/max44009.c b/sys/dev/iicbus/sensor/max44009.c
similarity index 100%
rename from sys/dev/iicbus/max44009.c
rename to sys/dev/iicbus/sensor/max44009.c
diff --git a/sys/dev/iicbus/max6690.c b/sys/dev/iicbus/sensor/max6690.c
similarity index 100%
rename from sys/dev/iicbus/max6690.c
rename to sys/dev/iicbus/sensor/max6690.c
diff --git a/sys/dev/iicbus/tmp461.c b/sys/dev/iicbus/sensor/tmp461.c
similarity index 100%
rename from sys/dev/iicbus/tmp461.c
rename to sys/dev/iicbus/sensor/tmp461.c
diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c
index 1241f44761c4..e362d4b455fc 100644
--- a/sys/dev/mrsas/mrsas.c
+++ b/sys/dev/mrsas/mrsas.c
@@ -1732,11 +1732,13 @@ mrsas_complete_cmd(struct mrsas_softc *sc, u_int32_t MSIxIndex)
 						data_length = r1_cmd->io_request->DataLength;
 						sense = r1_cmd->sense;
 					}
+					mtx_lock(&sc->sim_lock);
 					r1_cmd->ccb_ptr = NULL;
 					if (r1_cmd->callout_owner) {
 						callout_stop(&r1_cmd->cm_callout);
 						r1_cmd->callout_owner  = false;
 					}
+					mtx_unlock(&sc->sim_lock);
 					mrsas_release_mpt_cmd(r1_cmd);
 					mrsas_atomic_dec(&sc->fw_outstanding);
 					mrsas_map_mpt_cmd_status(cmd_mpt, cmd_mpt->ccb_ptr, status,
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 2bf4573d337b..631c38df9dca 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -1152,7 +1152,7 @@ my_rxeof(struct my_softc * sc)
 		 * broadcast packet, multicast packet, matches our ethernet
 		 * address or the interface is in promiscuous mode.
 		 */
-		if (bpf_peers_present(if_getbpf(ifp))) {
+		if (bpf_peers_present_if(ifp)) {
 			bpf_mtap_if(ifp, m);
 			if (if_getflags(ifp) & IFF_PROMISC &&
 			    (bcmp(eh->ether_dhost, if_getlladdr(sc->my_ifp),
diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
index 8c88e559b45d..29e5000cad08 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -232,35 +232,6 @@ nvme_ctrlr_fail(struct nvme_controller *ctrlr)
 	nvme_notify_fail_consumers(ctrlr);
 }
 
-void
-nvme_ctrlr_post_failed_request(struct nvme_controller *ctrlr,
-    struct nvme_request *req)
-{
-
-	mtx_lock(&ctrlr->lock);
-	STAILQ_INSERT_TAIL(&ctrlr->fail_req, req, stailq);
-	mtx_unlock(&ctrlr->lock);
-	if (!ctrlr->is_dying)
-		taskqueue_enqueue(ctrlr->taskqueue, &ctrlr->fail_req_task);
-}
-
-static void
-nvme_ctrlr_fail_req_task(void *arg, int pending)
-{
-	struct nvme_controller	*ctrlr = arg;
-	struct nvme_request	*req;
-
-	mtx_lock(&ctrlr->lock);
-	while ((req = STAILQ_FIRST(&ctrlr->fail_req)) != NULL) {
-		STAILQ_REMOVE_HEAD(&ctrlr->fail_req, stailq);
-		mtx_unlock(&ctrlr->lock);
-		nvme_qpair_manual_complete_request(req->qpair, req,
-		    NVME_SCT_GENERIC, NVME_SC_ABORTED_BY_REQUEST);
-		mtx_lock(&ctrlr->lock);
-	}
-	mtx_unlock(&ctrlr->lock);
-}
-
 /*
  * Wait for RDY to change.
  *
@@ -1162,11 +1133,6 @@ nvme_ctrlr_start_config_hook(void *arg)
 
 	TSENTER();
 
-	/*
-	 * Don't call pre/post reset here. We've not yet created the qpairs,
-	 * haven't setup the ISRs, so there's no need to 'drain' them or
-	 * 'exclude' them.
-	 */
 	if (nvme_ctrlr_hw_reset(ctrlr) != 0) {
 fail:
 		nvme_ctrlr_fail(ctrlr);
@@ -1174,18 +1140,6 @@ nvme_ctrlr_start_config_hook(void *arg)
 		return;
 	}
 
-#ifdef NVME_2X_RESET
-	/*
-	 * Reset controller twice to ensure we do a transition from cc.en==1 to
-	 * cc.en==0.  This is because we don't really know what status the
-	 * controller was left in when boot handed off to OS.  Linux doesn't do
-	 * this, however, and when the controller is in state cc.en == 0, no
-	 * I/O can happen.
-	 */
-	if (nvme_ctrlr_hw_reset(ctrlr) != 0)
-		goto fail;
-#endif
-
 	nvme_qpair_reset(&ctrlr->adminq);
 	nvme_admin_qpair_enable(&ctrlr->adminq);
 
@@ -1335,8 +1289,9 @@ nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr,
 		mtx_sleep(pt, mtx, PRIBIO, "nvme_pt", 0);
 	mtx_unlock(mtx);
 
-err:
 	if (buf != NULL) {
+		vunmapbuf(buf);
+err:
 		uma_zfree(pbuf_zone, buf);
 		PRELE(curproc);
 	}
@@ -1487,7 +1442,6 @@ nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev)
 	ctrlr->is_initialized = 0;
 	ctrlr->notification_sent = 0;
 	TASK_INIT(&ctrlr->reset_task, 0, nvme_ctrlr_reset_task, ctrlr);
-	TASK_INIT(&ctrlr->fail_req_task, 0, nvme_ctrlr_fail_req_task, ctrlr);
 	STAILQ_INIT(&ctrlr->fail_req);
 	ctrlr->is_failed = false;
 
diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
index 496bd8229e0a..f6ad51795adb 100644
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -150,7 +150,6 @@ struct nvme_tracker {
 enum nvme_recovery {
 	RECOVERY_NONE = 0,		/* Normal operations */
 	RECOVERY_WAITING,		/* waiting for the reset to complete */
-	RECOVERY_FAILED,		/* We have failed, no more I/O */
 };
 struct nvme_qpair {
 	struct nvme_controller	*ctrlr;
@@ -255,7 +254,6 @@ struct nvme_controller {
 	uint32_t		queues_created;
 
 	struct task		reset_task;
-	struct task		fail_req_task;
 	struct taskqueue	*taskqueue;
 
 	/* For shared legacy interrupt. */
@@ -410,8 +408,6 @@ void	nvme_ctrlr_submit_admin_request(struct nvme_controller *ctrlr,
 					struct nvme_request *req);
 void	nvme_ctrlr_submit_io_request(struct nvme_controller *ctrlr,
 				     struct nvme_request *req);
-void	nvme_ctrlr_post_failed_request(struct nvme_controller *ctrlr,
-				       struct nvme_request *req);
 
 int	nvme_qpair_construct(struct nvme_qpair *qpair,
 			     uint32_t num_entries, uint32_t num_trackers,
diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c
index cd0057f444b8..569d54ab6aef 100644
--- a/sys/dev/nvme/nvme_qpair.c
+++ b/sys/dev/nvme/nvme_qpair.c
@@ -727,6 +727,10 @@ nvme_qpair_construct(struct nvme_qpair *qpair,
 	mtx_init(&qpair->lock, "nvme qpair lock", NULL, MTX_DEF);
 	mtx_init(&qpair->recovery, "nvme qpair recovery", NULL, MTX_DEF);
 
+	callout_init_mtx(&qpair->timer, &qpair->recovery, 0);
+	qpair->timer_armed = false;
+	qpair->recovery_state = RECOVERY_WAITING;
+
 	/* Note: NVMe PRP format is restricted to 4-byte alignment. */
 	err = bus_dma_tag_create(bus_get_dma_tag(ctrlr->dev),
 	    4, ctrlr->page_size, BUS_SPACE_MAXADDR,
@@ -792,10 +796,6 @@ nvme_qpair_construct(struct nvme_qpair *qpair,
 	qpair->cpl_bus_addr = queuemem_phys + cmdsz;
 	prpmem_phys = queuemem_phys + cmdsz + cplsz;
 
-	callout_init_mtx(&qpair->timer, &qpair->recovery, 0);
-	qpair->timer_armed = false;
-	qpair->recovery_state = RECOVERY_WAITING;
-
 	/*
 	 * Calcuate the stride of the doorbell register. Many emulators set this
 	 * value to correspond to a cache line. However, some hardware has set
@@ -891,6 +891,9 @@ nvme_qpair_destroy(struct nvme_qpair *qpair)
 {
 	struct nvme_tracker	*tr;
 
+	mtx_lock(&qpair->recovery);
+	qpair->timer_armed = false;
+	mtx_unlock(&qpair->recovery);
 	callout_drain(&qpair->timer);
 
 	if (qpair->tag) {
@@ -1027,6 +1030,31 @@ nvme_qpair_timeout(void *arg)
 
 	mtx_assert(&qpair->recovery, MA_OWNED);
 
+	/*
+	 * If the controller is failed, then stop polling. This ensures that any
+	 * failure processing that races with the qpair timeout will fail
+	 * safely.
+	 */
+	if (qpair->ctrlr->is_failed) {
+		nvme_printf(qpair->ctrlr,
+		    "Failed controller, stopping watchdog timeout.\n");
+		qpair->timer_armed = false;
+		return;
+	}
+
+	/*
+	 * Shutdown condition: We set qpair->timer_armed to false in
+	 * nvme_qpair_destroy before calling callout_drain. When we call that,
+	 * this routine might get called one last time. Exit w/o setting a
+	 * timeout. None of the watchdog stuff needs to be done since we're
+	 * destroying the qpair.
+	 */
+	if (!qpair->timer_armed) {
+		nvme_printf(qpair->ctrlr,
+		    "Timeout fired during nvme_qpair_destroy\n");
+		return;
+	}
+
 	switch (qpair->recovery_state) {
 	case RECOVERY_NONE:
 		/*
@@ -1120,11 +1148,6 @@ nvme_qpair_timeout(void *arg)
 			nvme_printf(ctrlr, "Waiting for reset to complete\n");
 		idle = false;		/* We want to keep polling */
 		break;
-	case RECOVERY_FAILED:
-		KASSERT(qpair->ctrlr->is_failed,
-		    ("Recovery state failed w/o failed controller\n"));
-		idle = true;			/* nothing to monitor */
-		break;
 	}
 
 	/*
@@ -1244,11 +1267,21 @@ _nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req)
 	if (tr == NULL || qpair->recovery_state != RECOVERY_NONE) {
 		/*
 		 * No tracker is available, or the qpair is disabled due to an
-		 * in-progress controller-level reset or controller failure. If
-		 * we lose the race with recovery_state, then we may add an
-		 * extra request to the queue which will be resubmitted later.
-		 * We only set recovery_state to NONE with qpair->lock also
-		 * held.
+		 * in-progress controller-level reset. If we lose the race with
+		 * recovery_state, then we may add an extra request to the queue
+		 * which will be resubmitted later.  We only set recovery_state
+		 * to NONE with qpair->lock also held, so if we observe that the
+		 * state is not NONE, we know it can't transition to NONE below
+		 * when we've submitted the request to hardware.
+		 *
+		 * Also, as part of the failure process, we set recovery_state
+		 * to RECOVERY_WAITING, so we check here to see if we've failed
+		 * the controller. We set it before we call the qpair_fail
+		 * functions, which take out the lock lock before messing with
+		 * queued_req. Since we hold that lock, we know it's safe to
+		 * either fail directly, or queue the failure should is_failed
+		 * be stale. If we lose the race reading is_failed, then
+		 * nvme_qpair_fail will fail the queued request.
 		 */
 
 		if (qpair->ctrlr->is_failed) {
@@ -1314,7 +1347,7 @@ nvme_qpair_enable(struct nvme_qpair *qpair)
 		mtx_assert(&qpair->recovery, MA_OWNED);
 	if (mtx_initialized(&qpair->lock))
 		mtx_assert(&qpair->lock, MA_OWNED);
-	KASSERT(qpair->recovery_state != RECOVERY_FAILED,
+	KASSERT(!qpair->ctrlr->is_failed,
 	    ("Enabling a failed qpair\n"));
 
 	qpair->recovery_state = RECOVERY_NONE;
@@ -1471,10 +1504,6 @@ nvme_qpair_fail(struct nvme_qpair *qpair)
 	if (!mtx_initialized(&qpair->lock))
 		return;
 
-	mtx_lock(&qpair->recovery);
-	qpair->recovery_state = RECOVERY_FAILED;
-	mtx_unlock(&qpair->recovery);
-
 	mtx_lock(&qpair->lock);
 
 	if (!STAILQ_EMPTY(&qpair->queued_req)) {
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 27984200bd91..83fd31fc4f0b 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -178,6 +178,8 @@ static const struct rl_type re_devs[] = {
 	    "D-Link DGE-528(T) Gigabit Ethernet Adapter" },
 	{ DLINK_VENDORID, DLINK_DEVICEID_530T_REVC, 0,
 	    "D-Link DGE-530(T) Gigabit Ethernet Adapter" },
+	{ RT_VENDORID, RT_DEVICEID_2600, 0,
+	   "RealTek Killer E2600 Gigabit Ethernet Controller" },
 	{ RT_VENDORID, RT_DEVICEID_8139, 0,
 	    "RealTek 8139C+ 10/100BaseTX" },
 	{ RT_VENDORID, RT_DEVICEID_8101E, 0,
diff --git a/sys/dev/rl/if_rlreg.h b/sys/dev/rl/if_rlreg.h
index 01634bb704c7..808d11e34346 100644
--- a/sys/dev/rl/if_rlreg.h
+++ b/sys/dev/rl/if_rlreg.h
@@ -991,6 +991,7 @@ struct rl_softc {
 /*
  * RealTek chip device IDs.
  */
+#define	RT_DEVICEID_2600          		0x2600
 #define	RT_DEVICEID_8139D			0x8039
 #define	RT_DEVICEID_8129			0x8129
 #define	RT_DEVICEID_8101E			0x8136
diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c
index 385a982afd9d..cae1d61feb34 100644
--- a/sys/dev/usb/net/if_axge.c
+++ b/sys/dev/usb/net/if_axge.c
@@ -28,7 +28,8 @@
 
 #include <sys/cdefs.h>
 /*
- * ASIX Electronics AX88178A/AX88179 USB 2.0/3.0 gigabit ethernet driver.
+ * ASIX Electronics AX88178A/AX88179/AX88179A USB 2.0/3.0 gigabit ethernet
+ * driver.
  */
 
 #include <sys/param.h>
@@ -70,13 +71,15 @@
  */
 
 static const STRUCT_USB_HOST_ID axge_devs[] = {
-#define	AXGE_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) }
-	AXGE_DEV(ASIX, AX88178A),
-	AXGE_DEV(ASIX, AX88179),
-	AXGE_DEV(BELKIN, B2B128),
-	AXGE_DEV(DLINK, DUB1312),
-	AXGE_DEV(LENOVO, GIGALAN),
-	AXGE_DEV(SITECOMEU, LN032),
+#define	AXGE_DEV(v,p,i,...)	\
+	{ USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i), __VA_ARGS__ }
+	AXGE_DEV(ASIX, AX88178A, AXGE_FLAG_178A),
+	AXGE_DEV(ASIX, AX88179, AXGE_FLAG_179, USB_DEV_BCD_LTEQ(0x0100)),
+	AXGE_DEV(ASIX, AX88179, AXGE_FLAG_179A, USB_DEV_BCD_GTEQ(0x0200)),
+	AXGE_DEV(BELKIN, B2B128, AXGE_FLAG_179),
+	AXGE_DEV(DLINK, DUB1312, AXGE_FLAG_179),
+	AXGE_DEV(LENOVO, GIGALAN, AXGE_FLAG_179),
+	AXGE_DEV(SITECOMEU, LN032, AXGE_FLAG_179),
 #undef AXGE_DEV
 };
 
@@ -410,6 +413,24 @@ axge_chip_init(struct axge_softc *sc)
 	axge_write_cmd_1(sc, AXGE_ACCESS_MAC, AXGE_CLK_SELECT,
 	    AXGE_CLK_SELECT_ACS | AXGE_CLK_SELECT_BCS);
 	uether_pause(&sc->sc_ue, hz / 10);
+
+	if ((sc->sc_flags & AXGE_FLAG_179A) != 0) {
+		/*
+		 * 179A chip has two firmware modes that each use different
+		 * transfer layouts for Ethernet over USB. The newer fw mode has
+		 * larger rx packet headers which seem to
+		 * accomodate for ethernet frames up to 9K length and a VLAN
+		 * field for hardware tagging, but is not backward compatible
+		 * with 178A/179 bulk transfer code due to the change in size
+		 * and field alignments. The other fw mode uses the same packet
+		 * headers as the older 178A/179 chips, which this driver uses.
+		 *
+		 * As we do not currently have VLAN hw tagging or jumbo support
+		 * in this driver anyway, we're ok forcing 179A into its compat
+		 * mode by default.
+		 */
+		axge_write_cmd_1(sc, AXGE_FW_MODE, AXGE_FW_MODE_178A179, 0);
+	}
 }
 
 static void
@@ -551,6 +572,8 @@ axge_attach(device_t dev)
 	device_set_usb_desc(dev);
 	mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
 
+	sc->sc_flags = USB_GET_DRIVER_INFO(uaa);
+
 	iface_index = AXGE_IFACE_IDX;
 	error = usbd_transfer_setup(uaa->device, &iface_index,
 	    sc->sc_xfer, axge_config, AXGE_N_TRANSFER, sc, &sc->sc_mtx);
diff --git a/sys/dev/usb/net/if_axgereg.h b/sys/dev/usb/net/if_axgereg.h
index ea7a2c4a98b8..87e662b6cbc1 100644
--- a/sys/dev/usb/net/if_axgereg.h
+++ b/sys/dev/usb/net/if_axgereg.h
@@ -32,10 +32,14 @@
 #define	AXGE_ACCESS_EEPROM		0x04
 #define	AXGE_ACCESS_EFUSE		0x05
 #define	AXGE_RELOAD_EEPROM_EFUSE	0x06
+#define	AXGE_FW_MODE			0x08
 #define	AXGE_WRITE_EFUSE_EN		0x09
 #define	AXGE_WRITE_EFUSE_DIS		0x0A
 #define	AXGE_ACCESS_MFAB		0x10
 
+#define	AXGE_FW_MODE_178A179		0x0000
+#define	AXGE_FW_MODE_179A		0x0001
+
 /* Physical link status register */
 #define	AXGE_PLSR			0x02
 #define	PLSR_USB_FS			0x01
@@ -202,6 +206,9 @@ struct axge_softc {
 
 	int			sc_flags;
 #define	AXGE_FLAG_LINK		0x0001	/* got a link */
+#define	AXGE_FLAG_178A		0x1000	/* AX88178A */
+#define	AXGE_FLAG_179		0x2000	/* AX88179 */
+#define	AXGE_FLAG_179A		0x4000	/* AX88179A */
 };
 
 #define	AXGE_LOCK(_sc)			mtx_lock(&(_sc)->sc_mtx)
diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c
index 26fe17bb072e..d954276662ca 100644
--- a/sys/dev/usb/net/if_ure.c
+++ b/sys/dev/usb/net/if_ure.c
@@ -98,7 +98,6 @@ static const STRUCT_USB_HOST_ID ure_devs[] = {
   USB_IFACE_CLASS(UICLASS_VENDOR), \
   USB_IFACE_SUBCLASS(UISUBCLASS_VENDOR) }
 	URE_DEV(LENOVO, RTL8153, URE_FLAG_8153),
-	URE_DEV(LENOVO, TBT3LAN, 0),
 	URE_DEV(LENOVO, TBT3LANGEN2, 0),
 	URE_DEV(LENOVO, ONELINK, 0),
 	URE_DEV(LENOVO, RTL8153_04, URE_FLAG_8153),
diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c
index 38016e6abc1b..98515be2a06d 100644
--- a/sys/dev/usb/quirk/usb_quirk.c
+++ b/sys/dev/usb/quirk/usb_quirk.c
@@ -260,6 +260,8 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = {
 	    UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE),
 	USB_QUIRK(GENESYS, GL641USB_2, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_WRONG_CSWSIG),
+	USB_QUIRK(GENESYS, GL3220, 0x0000, 0xffff, UQ_MSC_NO_INQUIRY,
+	    UQ_MSC_NO_RS_CLEAR_UA),
 	USB_QUIRK(HAGIWARA, FG, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI),
 	USB_QUIRK(HAGIWARA, FGSM, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
@@ -355,6 +357,8 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = {
 	USB_QUIRK(NETCHIP, POCKETBOOK, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
 	USB_QUIRK(NIKON, D300, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI),
+	USB_QUIRK(NORELSYS, NS1081, 0x0000, 0xffff, UQ_MSC_NO_RS_CLEAR_UA,
+	    UQ_MSC_NO_INQUIRY),
 	USB_QUIRK(OLYMPUS, C1, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_WRONG_CSWSIG),
 	USB_QUIRK(OLYMPUS, C700, 0x0000, 0xffff, UQ_MSC_NO_GETMAXLUN),
@@ -630,6 +634,9 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = {
 
 	/* Holtek USB gaming keyboard */
 	USB_QUIRK(HOLTEK, F85, 0x0000, 0xffff, UQ_KBD_BOOTPROTO),
+
+	/* This works much better with if_cdce than if_ure */
+	USB_QUIRK(LENOVO, TBT3LAN,  0x0000, 0xffff, UQ_CFG_INDEX_1),
 };
 #undef USB_QUIRK_VP
 #undef USB_QUIRK
diff --git a/sys/dev/usb/usb_pf.c b/sys/dev/usb/usb_pf.c
index a5ff028dcf9c..93da7344747c 100644
--- a/sys/dev/usb/usb_pf.c
+++ b/sys/dev/usb/usb_pf.c
@@ -408,9 +408,7 @@ usbpf_xfertap(struct usb_xfer *xfer, int type)
 	bus = xfer->xroot->bus;
 
 	/* sanity checks */
-	if (bus->ifp == NULL || if_getbpf(bus->ifp) == NULL)
-		return;
-	if (!bpf_peers_present(if_getbpf(bus->ifp)))
+	if (bus->ifp == NULL || !bpf_peers_present_if(bus->ifp))
 		return;
 
 	totlen = usbpf_xfer_precompute_size(xfer, type);
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index da712c5a5954..6543f0cbaa29 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -776,6 +776,7 @@ vendor ARDUINO		0x2341	Arduino SA
 vendor TPLINK		0x2357	TP-Link
 vendor WESTMOUNTAIN	0x2405	West Mountain Radio
 vendor TRIPPLITE	0x2478	Tripp-Lite
+vendor NORELSYS	0x2537	NOREL Systems Ltd.
 vendor TENDA2		0x2604	Tenda
 vendor HIROSE		0x2631	Hirose Electric
 vendor NHJ		0x2770	NHJ
@@ -2295,6 +2296,7 @@ product GENESYS GL3520_SS	0x0616	GL3520 4-Port USB 3.0 DataPath
 product GENESYS GL641USB	0x0700	GL641USB CompactFlash Card Reader
 product GENESYS GL641USB2IDE_2	0x0701	GL641USB USB-IDE Bridge No 2
 product GENESYS GL641USB2IDE	0x0702	GL641USB USB-IDE Bridge
+product GENESYS GL3220		0x0732	GL3220 USB 3.1 AiO Card Reader
 product GENESYS GL3233		0x0743	GL3233 USB 3.0 AiO Card Reader
 product GENESYS GL641USB_2	0x0760	GL641USB 6-in-1 Card Reader
 
@@ -3502,6 +3504,9 @@ product NOVATECH RTL8188CU	0x9071	RTL8188CU
 product NOKIA N958GB		0x0070	Nokia N95 8GBc
 product NOKIA2 CA42		0x1234	CA-42 cable
 
+/* NOREL Systems Ltd. products */
+product NORELSYS NS1081	0x1081	NS1081 USB 3.0 Flash Card Reader
+
 /* Novatel Wireless products */
 product NOVATEL V640		0x1100	Merlin V620
 product NOVATEL CDMA_MODEM	0x1110	Novatel Wireless Merlin CDMA
diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c
index 378dd717a3eb..04190821d9b9 100644
--- a/sys/dev/usb/wlan/if_uath.c
+++ b/sys/dev/usb/wlan/if_uath.c
@@ -1657,7 +1657,7 @@ uath_txfrag_setup(struct uath_softc *sc, uath_datahead *frags,
 			uath_txfrag_cleanup(sc, frags, ni);
 			break;
 		}
-		ieee80211_node_incref(ni);
+		(void) ieee80211_ref_node(ni);
 		STAILQ_INSERT_TAIL(frags, bf, next);
 	}
 
diff --git a/sys/dev/vkbd/vkbd.c b/sys/dev/vkbd/vkbd.c
index a8d4583f46c7..3dbf64063e33 100644
--- a/sys/dev/vkbd/vkbd.c
+++ b/sys/dev/vkbd/vkbd.c
@@ -191,6 +191,8 @@ vkbd_dev_clone(void *arg, struct ucred *cred, char *name, int namelen,
 		*dev = make_dev_credf(MAKEDEV_REF, &vkbd_dev_cdevsw, unit,
 			cred, UID_ROOT, GID_WHEEL, 0600, DEVICE_NAME "%d",
 			unit);
+	else
+		dev_ref(*dev);
 }
 
 /* Open device */
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index c9c2a8f6854e..5ceb037803b8 100644
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -2768,7 +2768,7 @@ wpi_cmd2(struct wpi_softc *sc, struct wpi_buf *buf)
 		ring->pending = 0;
 		sc->sc_update_tx_ring(sc, ring);
 	} else
-		ieee80211_node_incref(data->ni);
+		(void) ieee80211_ref_node(data->ni);
 
 end:	DPRINTF(sc, WPI_DEBUG_TRACE, error ? TRACE_STR_END_ERR : TRACE_STR_END,
 	    __func__);
diff --git a/sys/fs/fuse/fuse_ipc.h b/sys/fs/fuse/fuse_ipc.h
index 27f3662741c5..0ec556138be0 100644
--- a/sys/fs/fuse/fuse_ipc.h
+++ b/sys/fs/fuse/fuse_ipc.h
@@ -239,6 +239,7 @@ struct fuse_data {
 #define FSESS_WARN_CACHE_INCOHERENT 0x200000	/* Read cache incoherent */
 #define FSESS_WARN_WB_CACHE_INCOHERENT 0x400000	/* WB cache incoherent */
 #define	FSESS_WARN_ILLEGAL_INODE  0x800000 /* Illegal inode for new file */
+#define FSESS_WARN_READLINK_EMBEDDED_NUL 0x1000000 /* corrupt READLINK output */
 #define FSESS_MNTOPTS_MASK	( \
 	FSESS_DAEMON_CAN_SPY | FSESS_PUSH_SYMLINKS_IN | \
 	FSESS_DEFAULT_PERMISSIONS | FSESS_INTR)
diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c
index 21ee378b24c6..3249e5988801 100644
--- a/sys/fs/fuse/fuse_vnops.c
+++ b/sys/fs/fuse/fuse_vnops.c
@@ -2007,6 +2007,13 @@ fuse_vnop_readlink(struct vop_readlink_args *ap)
 	if (err) {
 		goto out;
 	}
+	if (strnlen(fdi.answ, fdi.iosize) + 1 < fdi.iosize) {
+		struct fuse_data *data = fuse_get_mpdata(vnode_mount(vp));
+		fuse_warn(data, FSESS_WARN_READLINK_EMBEDDED_NUL,
+				"Returned an embedded NUL from FUSE_READLINK.");
+		err = EIO;
+		goto out;
+	}
 	if (((char *)fdi.answ)[0] == '/' &&
 	    fuse_get_mpdata(vnode_mount(vp))->dataflags & FSESS_PUSH_SYMLINKS_IN) {
 		char *mpth = vnode_mount(vp)->mnt_stat.f_mntonname;
diff --git a/sys/fs/nfsclient/nfs_clnfsiod.c b/sys/fs/nfsclient/nfs_clnfsiod.c
index 5dc1d5643591..f4f97a8646f0 100644
--- a/sys/fs/nfsclient/nfs_clnfsiod.c
+++ b/sys/fs/nfsclient/nfs_clnfsiod.c
@@ -123,8 +123,8 @@ sysctl_iodmin(SYSCTL_HANDLER_ARGS)
 	return (0);
 }
 SYSCTL_PROC(_vfs_nfs, OID_AUTO, iodmin,
-    CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, sizeof (nfs_iodmin),
-    sysctl_iodmin, "IU",
+    CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE,
+    0, sizeof (nfs_iodmin), sysctl_iodmin, "IU",
     "Min number of nfsiod kthreads to keep as spares");
 
 static int
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 00932195efcd..948c44114d7d 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -62,6 +62,7 @@ options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL
index 3d97f84058a9..d8c43d37fbce 100644
--- a/sys/i386/conf/MINIMAL
+++ b/sys/i386/conf/MINIMAL
@@ -62,6 +62,7 @@ options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c
index 8fe65b7612e6..eedff26fb534 100644
--- a/sys/i386/i386/elf_machdep.c
+++ b/sys/i386/i386/elf_machdep.c
@@ -74,7 +74,7 @@ struct sysentvec elf32_freebsd_sysvec = {
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
 	.sv_flags	= SV_ABI_FREEBSD | SV_ASLR | SV_IA32 | SV_ILP32 |
-			    SV_SHP | SV_TIMEKEEP | SV_RNG_SEED_VER,
+			    SV_SHP | SV_TIMEKEEP | SV_RNG_SEED_VER | SV_SIGSYS,
 	.sv_set_syscall_retval = cpu_set_syscall_retval,
 	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
 	.sv_syscallnames = syscallnames,
diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c
index 689796821d80..26def3f433f1 100644
--- a/sys/i386/i386/npx.c
+++ b/sys/i386/i386/npx.c
@@ -123,9 +123,6 @@ xsaveopt(char *addr, uint64_t mask)
 	    "memory");
 }
 
-#define	start_emulating()	load_cr0(rcr0() | CR0_TS)
-#define	stop_emulating()	clts()
-
 #define GET_FPU_CW(thread) \
 	(cpu_fxsr ? \
 		(thread)->td_pcb->pcb_save->sv_xmm.sv_env.en_cw : \
@@ -224,7 +221,7 @@ npx_probe(void)
 	/*
 	 * Don't trap while we're probing.
 	 */
-	stop_emulating();
+	fpu_enable();
 
 	/*
 	 * Finish resetting the coprocessor, if any.  If there is an error
@@ -413,7 +410,7 @@ npxinit(bool bsp)
 	 * It is too early for critical_enter() to work on AP.
 	 */
 	saveintr = intr_disable();
-	stop_emulating();
+	fpu_enable();
 	if (cpu_fxsr)
 		fninit();
 	else
@@ -424,7 +421,7 @@ npxinit(bool bsp)
 		mxcsr = __INITIAL_MXCSR__;
 		ldmxcsr(mxcsr);
 	}
-	start_emulating();
+	fpu_disable();
 	intr_restore(saveintr);
 }
 
@@ -458,7 +455,7 @@ npxinitstate(void *arg __unused)
 	}
 
 	saveintr = intr_disable();
-	stop_emulating();
+	fpu_enable();
 
 	if (cpu_fxsr)
 		fpusave_fxsave(npx_initialstate);
@@ -515,7 +512,7 @@ npxinitstate(void *arg __unused)
 		}
 	}
 
-	start_emulating();
+	fpu_disable();
 	intr_restore(saveintr);
 }
 SYSINIT(npxinitstate, SI_SUB_CPU, SI_ORDER_ANY, npxinitstate, NULL);
@@ -529,9 +526,9 @@ npxexit(struct thread *td)
 
 	critical_enter();
 	if (curthread == PCPU_GET(fpcurthread)) {
-		stop_emulating();
+		fpu_enable();
 		fpusave(curpcb->pcb_save);
-		start_emulating();
+		fpu_disable();
 		PCPU_SET(fpcurthread, NULL);
 	}
 	critical_exit();
@@ -810,7 +807,7 @@ restore_npx_curthread(struct thread *td, struct pcb *pcb)
 	 */
 	PCPU_SET(fpcurthread, td);
 
-	stop_emulating();
+	fpu_enable();
 	if (cpu_fxsr)
 		fpu_clean_state();
 
@@ -863,7 +860,7 @@ npxdna(void)
 		 * regardless of the eager/lazy FPU context switch
 		 * mode.
 		 */
-		stop_emulating();
+		fpu_enable();
 	} else {
 		if (__predict_false(PCPU_GET(fpcurthread) != NULL)) {
 			printf(
@@ -891,7 +888,7 @@ void
 npxsave(union savefpu *addr)
 {
 
-	stop_emulating();
+	fpu_enable();
 	fpusave(addr);
 }
 
@@ -902,7 +899,7 @@ npxswitch(struct thread *td, struct pcb *pcb)
 
 	if (lazy_fpu_switch || (td->td_pflags & TDP_KTHREAD) != 0 ||
 	    !PCB_USER_FPU(pcb)) {
-		start_emulating();
+		fpu_disable();
 		PCPU_SET(fpcurthread, NULL);
 	} else if (PCPU_GET(fpcurthread) != td) {
 		restore_npx_curthread(td, pcb);
@@ -925,7 +922,7 @@ npxsuspend(union savefpu *addr)
 		return;
 	}
 	cr0 = rcr0();
-	stop_emulating();
+	fpu_enable();
 	fpusave(addr);
 	load_cr0(cr0);
 }
@@ -940,7 +937,7 @@ npxresume(union savefpu *addr)
 
 	cr0 = rcr0();
 	npxinit(false);
-	stop_emulating();
+	fpu_enable();
 	fpurstor(addr);
 	load_cr0(cr0);
 }
@@ -962,7 +959,7 @@ npxdrop(void)
 	CRITICAL_ASSERT(td);
 	PCPU_SET(fpcurthread, NULL);
 	td->td_pcb->pcb_flags &= ~PCB_NPXINITDONE;
-	start_emulating();
+	fpu_disable();
 }
 
 /*
@@ -1397,7 +1394,7 @@ fpu_kern_enter(struct thread *td, struct fpu_kern_ctx *ctx, u_int flags)
 
 	if ((flags & FPU_KERN_NOCTX) != 0) {
 		critical_enter();
-		stop_emulating();
+		fpu_enable();
 		if (curthread == PCPU_GET(fpcurthread)) {
 			fpusave(curpcb->pcb_save);
 			PCPU_SET(fpcurthread, NULL);
@@ -1448,7 +1445,7 @@ fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx)
 		CRITICAL_ASSERT(td);
 
 		pcb->pcb_flags &= ~(PCB_NPXNOSAVE | PCB_NPXINITDONE);
-		start_emulating();
+		fpu_disable();
 	} else {
 		KASSERT((ctx->flags & FPU_KERN_CTX_INUSE) != 0,
 		    ("leaving not inuse ctx"));
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 106c10581388..7a01bd064858 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -3973,12 +3973,11 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags,
 	struct spglist free;
 	pd_entry_t oldpde, *pde;
 	vm_page_t mt;
+	vm_page_t uwptpg;
 
 	rw_assert(&pvh_global_lock, RA_WLOCKED);
 	KASSERT((newpde & (PG_M | PG_RW)) != PG_RW,
 	    ("pmap_enter_pde: newpde is missing PG_M"));
-	KASSERT(pmap == kernel_pmap || (newpde & PG_W) == 0,
-	    ("pmap_enter_pde: cannot create wired user mapping"));
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 	pde = pmap_pde(pmap, va);
 	oldpde = *pde;
@@ -4028,11 +4027,40 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags,
 				panic("pmap_enter_pde: trie insert failed");
 		}
 	}
+
+	/*
+	 * Allocate a leaf ptpage for wired userspace pages.
+	 */
+	uwptpg = NULL;
+	if ((newpde & PG_W) != 0 && pmap != kernel_pmap) {
+		uwptpg = vm_page_alloc_noobj(VM_ALLOC_WIRED);
+		if (uwptpg == NULL) {
+			return (KERN_RESOURCE_SHORTAGE);
+		}
+		uwptpg->pindex = va >> PDRSHIFT;
+		if (pmap_insert_pt_page(pmap, uwptpg, true, false)) {
+			vm_page_unwire_noq(uwptpg);
+			vm_page_free(uwptpg);
+			return (KERN_RESOURCE_SHORTAGE);
+		}
+		pmap->pm_stats.resident_count++;
+		uwptpg->ref_count = NPTEPG;
+	}
 	if ((newpde & PG_MANAGED) != 0) {
 		/*
 		 * Abort this mapping if its PV entry could not be created.
 		 */
 		if (!pmap_pv_insert_pde(pmap, va, newpde, flags)) {
+			if (uwptpg != NULL) {
+				mt = pmap_remove_pt_page(pmap, va);
+				KASSERT(mt == uwptpg,
+				    ("removed pt page %p, expected %p", mt,
+				    uwptpg));
+				pmap->pm_stats.resident_count--;
+				uwptpg->ref_count = 1;
+				vm_page_unwire_noq(uwptpg);
+				vm_page_free(uwptpg);
+			}
 			CTR2(KTR_PMAP, "pmap_enter_pde: failure for va %#lx"
 			    " in pmap %p", va, pmap);
 			return (KERN_RESOURCE_SHORTAGE);
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 172317aead29..d0ee2b30a3ce 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -1113,7 +1113,7 @@ cpu_fetch_syscall_args(struct thread *td)
 	}
 
  	if (sa->code >= p->p_sysent->sv_size)
- 		sa->callp = &p->p_sysent->sv_table[0];
+		sa->callp = &nosys_sysent;
   	else
  		sa->callp = &p->p_sysent->sv_table[sa->code];
 
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 6cbab6b1e8d8..8109afec72e9 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -33,7 +33,6 @@ struct thread;
 #define	PADR_(t)	0
 #endif
 
-#define	nosys	linux_nosys
 struct linux_exit_args {
 	char rval_l_[PADL_(int)]; int rval; char rval_r_[PADR_(int)];
 };
@@ -1730,7 +1729,6 @@ struct linux_cachestat_args {
 struct linux_fchmodat2_args {
 	syscallarg_t dummy;
 };
-#define	nosys	linux_nosys
 int	linux_exit(struct thread *, struct linux_exit_args *);
 int	linux_fork(struct thread *, struct linux_fork_args *);
 int	linux_write(struct thread *, struct linux_write_args *);
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index 19b1714fb5d9..d82006b89847 100644
--- a/sys/i386/linux/linux_syscall.h
+++ b/sys/i386/linux/linux_syscall.h
@@ -419,4 +419,4 @@
 #define	LINUX_SYS_linux_set_mempolicy_home_node	450
 #define	LINUX_SYS_linux_cachestat	451
 #define	LINUX_SYS_linux_fchmodat2	452
-#define	LINUX_SYS_MAXSYSCALL	454
+#define	LINUX_SYS_MAXSYSCALL	453
diff --git a/sys/i386/linux/linux_syscalls.c b/sys/i386/linux/linux_syscalls.c
index 112e6505bd00..88f362661ae2 100644
--- a/sys/i386/linux/linux_syscalls.c
+++ b/sys/i386/linux/linux_syscalls.c
@@ -5,7 +5,6 @@
  */
 
 const char *linux_syscallnames[] = {
-#define	nosys	linux_nosys
 	"#0",			/* 0 = setup */
 	"linux_exit",			/* 1 = linux_exit */
 	"linux_fork",			/* 2 = linux_fork */
@@ -459,5 +458,4 @@ const char *linux_syscallnames[] = {
 	"linux_set_mempolicy_home_node",			/* 450 = linux_set_mempolicy_home_node */
 	"linux_cachestat",			/* 451 = linux_cachestat */
 	"linux_fchmodat2",			/* 452 = linux_fchmodat2 */
-	"#453",			/* 453 = nosys */
 };
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 5aa7f4921774..dbba4dec3a8c 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -7,7 +7,6 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <i386/linux/linux.h>
 #include <i386/linux/linux_proto.h>
 
@@ -15,7 +14,6 @@
 
 /* The casts are bogus but will do for now. */
 struct sysent linux_sysent[] = {
-#define	nosys	linux_nosys
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT },			/* 0 = setup */
 	{ .sy_narg = AS(linux_exit_args), .sy_call = (sy_call_t *)linux_exit, .sy_auevent = AUE_EXIT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 1 = linux_exit */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_fork, .sy_auevent = AUE_FORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 2 = linux_fork */
@@ -469,5 +467,4 @@ struct sysent linux_sysent[] = {
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_set_mempolicy_home_node, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 450 = linux_set_mempolicy_home_node */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_cachestat, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 451 = linux_cachestat */
 	{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_fchmodat2, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 452 = linux_fchmodat2 */
-	{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT },			/* 453 = nosys */
 };
diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c
index 76781af18124..70036d227707 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -11,7 +11,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	int64_t *iarg = (int64_t *)uarg;
 	int a = 0;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* linux_exit */
 	case 1: {
 		struct linux_exit_args *p = params;
@@ -3356,7 +3355,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 {
 	const char *p = NULL;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* linux_exit */
 	case 1:
 		switch (ndx) {
@@ -8707,7 +8705,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 {
 	const char *p = NULL;
 	switch (sysnum) {
-#define	nosys	linux_nosys
 	/* linux_exit */
 	case 1:
 		if (ndx == 0 || ndx == 1)
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 6b2112458d35..9d16454c6e9c 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -517,11 +517,11 @@ linux_fetch_syscall_args(struct thread *td)
 	sa->args[2] = frame->tf_edx;
 	sa->args[3] = frame->tf_esi;
 	sa->args[4] = frame->tf_edi;
-	sa->args[5] = frame->tf_ebp;	/* Unconfirmed */
+	sa->args[5] = frame->tf_ebp;
 
 	if (sa->code >= p->p_sysent->sv_size)
 		/* nosys */
-		sa->callp = &p->p_sysent->sv_table[p->p_sysent->sv_size - 1];
+		sa->callp = &nosys_sysent;
 	else
 		sa->callp = &p->p_sysent->sv_table[sa->code];
 
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index 3f37cc2fc485..e3c39e50986c 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -32,13 +32,9 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <i386/linux/linux.h>
 #include <i386/linux/linux_proto.h>
 
-; Isn't pretty, but there seems to be no other way to trap nosys
-#define	nosys	linux_nosys
-
 0	AUE_NULL	UNIMPL	setup
 1	AUE_EXIT	STD {
 		void linux_exit(
@@ -2628,6 +2624,5 @@
 452	AUE_NULL		STD {
 		int linux_fchmodat2(void);
 	}
- ; please, keep this line at the end.
-453	AUE_NULL        UNIMPL  nosys
+
  ; vim: syntax=off
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 2aa59571a290..6fc36804f5dc 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -88,7 +88,8 @@ struct sysentvec aout_sysvec = {
 	.sv_setregs	= exec_setregs,
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
-	.sv_flags	= SV_ABI_FREEBSD | SV_AOUT | SV_IA32 | SV_ILP32,
+	.sv_flags	= SV_ABI_FREEBSD | SV_AOUT | SV_IA32 | SV_ILP32 |
+			    SV_SIGSYS,
 	.sv_set_syscall_retval = cpu_set_syscall_retval,
 	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
 	.sv_syscallnames = syscallnames,
@@ -134,7 +135,8 @@ struct sysentvec aout_sysvec = {
 	.sv_setregs	= ia32_setregs,
 	.sv_fixlimit	= ia32_fixlimit,
 	.sv_maxssiz	= &ia32_maxssiz,
-	.sv_flags	= SV_ABI_FREEBSD | SV_AOUT | SV_IA32 | SV_ILP32,
+	.sv_flags	= SV_ABI_FREEBSD | SV_AOUT | SV_IA32 | SV_ILP32 |
+			    SV_SIGSYS,
 	.sv_set_syscall_retval = ia32_set_syscall_retval,
 	.sv_fetch_syscall_args = ia32_fetch_syscall_args,
 	.sv_syscallnames = freebsd32_syscallnames,
diff --git a/sys/kern/kern_boottrace.c b/sys/kern/kern_boottrace.c
index cb013d4e8be1..86fee4f47fbe 100644
--- a/sys/kern/kern_boottrace.c
+++ b/sys/kern/kern_boottrace.c
@@ -158,6 +158,10 @@ SYSCTL_INT(_kern_boottrace, OID_AUTO, shutdown_trace_threshold, CTLFLAG_RWTUN,
    &shutdown_trace_threshold, 0,
    "Tracing threshold (ms) below which tracing is ignored");
 
+SYSCTL_UINT(_kern_boottrace, OID_AUTO, table_size,
+    CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &bt.size, 0,
+    "Boot-time tracing table size");
+
 /*
  * Dump a trace to buffer or if buffer is NULL to console.
  *
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 083580ea72e3..0ed2d3c76551 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -5099,10 +5099,11 @@ DB_SHOW_COMMAND_FLAGS(files, db_show_files, DB_CMD_MEMSAFE)
 }
 #endif
 
-SYSCTL_INT(_kern, KERN_MAXFILESPERPROC, maxfilesperproc, CTLFLAG_RW,
+SYSCTL_INT(_kern, KERN_MAXFILESPERPROC, maxfilesperproc,
+    CTLFLAG_RWTUN | CTLFLAG_NOFETCH,
     &maxfilesperproc, 0, "Maximum files allowed open per process");
 
-SYSCTL_INT(_kern, KERN_MAXFILES, maxfiles, CTLFLAG_RW,
+SYSCTL_INT(_kern, KERN_MAXFILES, maxfiles, CTLFLAG_RWTUN | CTLFLAG_NOFETCH,
     &maxfiles, 0, "Maximum number of files");
 
 SYSCTL_INT(_kern, OID_AUTO, openfiles, CTLFLAG_RD,
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index 62112a4877b3..f5c6c142e4eb 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -542,7 +542,7 @@ user_jail_set(struct thread *td, struct iovec * __capability iovp,
 	if (error)
 		return (error);
 	error = kern_jail_set(td, auio, flags);
-	free(auio, M_IOV);
+	freeuio(auio);
 	return (error);
 }
 
@@ -2283,7 +2283,7 @@ user_jail_get(struct thread *td, struct iovec * __capability iovp,
 	error = kern_jail_get(td, auio, flags);
 	if (error == 0)
 		error = updateiov_f(auio, iovp);
-	free(auio, M_IOV);
+	freeuio(auio);
 	return (error);
 }
 
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 45d84682e453..c609736f2e1c 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -788,7 +788,7 @@ ktrgenio(int fd, enum uio_rw rw, struct uio *uio, int error)
 	char *buf;
 
 	if (error) {
-		free(uio, M_IOV);
+		freeuio(uio);
 		return;
 	}
 	uio->uio_offset = 0;
@@ -796,7 +796,7 @@ ktrgenio(int fd, enum uio_rw rw, struct uio *uio, int error)
 	datalen = MIN(uio->uio_resid, ktr_geniosize);
 	buf = malloc(datalen, M_KTRACE, M_WAITOK);
 	error = uiomove(buf, datalen, uio);
-	free(uio, M_IOV);
+	freeuio(uio);
 	if (error) {
 		free(buf, M_KTRACE);
 		return;
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index e1b56986a700..b637f7a9faaa 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -134,9 +134,9 @@ sysctl_mb_use_ext_pgs(SYSCTL_HANDLER_ARGS)
 	}
 	return (error);
 }
-SYSCTL_PROC(_kern_ipc, OID_AUTO, mb_use_ext_pgs, CTLTYPE_INT | CTLFLAG_RW,
-    &mb_use_ext_pgs, 0,
-    sysctl_mb_use_ext_pgs, "IU",
+SYSCTL_PROC(_kern_ipc, OID_AUTO, mb_use_ext_pgs,
+    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH,
+    &mb_use_ext_pgs, 0, sysctl_mb_use_ext_pgs, "IU",
     "Use unmapped mbufs for sendfile(2) and TLS offload");
 
 static quad_t maxmbufmem;	/* overall real memory limit for all mbufs */
@@ -231,8 +231,8 @@ sysctl_nmbclusters(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 SYSCTL_PROC(_kern_ipc, OID_AUTO, nmbclusters,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, &nmbclusters, 0,
-    sysctl_nmbclusters, "IU",
+    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE,
+    &nmbclusters, 0, sysctl_nmbclusters, "IU",
     "Maximum number of mbuf clusters allowed");
 
 static int
@@ -253,8 +253,8 @@ sysctl_nmbjumbop(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 SYSCTL_PROC(_kern_ipc, OID_AUTO, nmbjumbop,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, &nmbjumbop, 0,
-    sysctl_nmbjumbop, "IU",
+    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE,
+    &nmbjumbop, 0, sysctl_nmbjumbop, "IU",
     "Maximum number of mbuf page size jumbo clusters allowed");
 
 static int
@@ -275,8 +275,8 @@ sysctl_nmbjumbo9(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 SYSCTL_PROC(_kern_ipc, OID_AUTO, nmbjumbo9,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, &nmbjumbo9, 0,
-    sysctl_nmbjumbo9, "IU",
+    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE,
+    &nmbjumbo9, 0, sysctl_nmbjumbo9, "IU",
     "Maximum number of mbuf 9k jumbo clusters allowed");
 
 static int
@@ -297,8 +297,8 @@ sysctl_nmbjumbo16(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 SYSCTL_PROC(_kern_ipc, OID_AUTO, nmbjumbo16,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, &nmbjumbo16, 0,
-    sysctl_nmbjumbo16, "IU",
+    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE,
+    &nmbjumbo16, 0, sysctl_nmbjumbo16, "IU",
     "Maximum number of mbuf 16k jumbo clusters allowed");
 
 static int
@@ -319,7 +319,7 @@ sysctl_nmbufs(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 SYSCTL_PROC(_kern_ipc, OID_AUTO, nmbufs,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
+    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE,
     &nmbufs, 0, sysctl_nmbufs, "IU",
     "Maximum number of mbufs allowed");
 
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index c5f5ba2d2b82..42f819f54d53 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -170,7 +170,8 @@ EVENTHANDLER_LIST_DEFINE(process_fork);
 EVENTHANDLER_LIST_DEFINE(process_exec);
 
 int kstack_pages = KSTACK_PAGES;
-SYSCTL_INT(_kern, OID_AUTO, kstack_pages, CTLFLAG_RD, &kstack_pages, 0,
+SYSCTL_INT(_kern, OID_AUTO, kstack_pages, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+    &kstack_pages, 0,
     "Kernel stack size in pages");
 static int vmmap_skip_res_cnt = 0;
 SYSCTL_INT(_kern, OID_AUTO, proc_vmmap_skip_resident_count, CTLFLAG_RW,
diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c
index 305f9ddd3482..d958ad7a0f86 100644
--- a/sys/kern/kern_sendfile.c
+++ b/sys/kern/kern_sendfile.c
@@ -1343,8 +1343,8 @@ kern_sendfile(struct thread *td, int fd, int s, off_t offset, size_t nbytes,
 		copyout(&sbytes, usbytes, sizeof(off_t));
 
 out:
-	free(hdr_uio, M_IOV);
-	free(trl_uio, M_IOV);
+	freeuio(hdr_uio);
+	freeuio(trl_uio);
 	return (error);
 }
 
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 5edc7052f9f8..a5d5e3ae66f6 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -166,6 +166,10 @@ static int	kern_lognosys = 0;
 SYSCTL_INT(_kern, OID_AUTO, lognosys, CTLFLAG_RWTUN, &kern_lognosys, 0,
     "Log invalid syscalls");
 
+static int	kern_signosys = 1;
+SYSCTL_INT(_kern, OID_AUTO, signosys, CTLFLAG_RWTUN, &kern_signosys, 0,
+    "Send SIGSYS on return from invalid syscall");
+
 __read_frequently bool sigfastblock_fetch_always = false;
 SYSCTL_BOOL(_kern, OID_AUTO, sigfastblock_fetch_always, CTLFLAG_RWTUN,
     &sigfastblock_fetch_always, 0,
@@ -2796,7 +2800,8 @@ ptrace_syscallreq(struct thread *td, struct proc *p,
 	audited = AUDIT_SYSCALL_ENTER(sc, td) != 0;
 
 	if (!sy_thr_static) {
-		error = syscall_thread_enter(td, se);
+		error = syscall_thread_enter(td, &se);
+		sy_thr_static = (se->sy_thrcnt & SY_THR_STATIC) != 0;
 		if (error != 0) {
 			tsr->ts_ret.sr_error = error;
 			return;
@@ -4337,9 +4342,11 @@ nosys(struct thread *td, struct nosys_args *args)
 
 	p = td->td_proc;
 
-	PROC_LOCK(p);
-	tdsignal(td, SIGSYS);
-	PROC_UNLOCK(p);
+	if (SV_PROC_FLAG(p, SV_SIGSYS) != 0 && kern_signosys) {
+		PROC_LOCK(p);
+		tdsignal(td, SIGSYS);
+		PROC_UNLOCK(p);
+	}
 	if (kern_lognosys == 1 || kern_lognosys == 3) {
 		uprintf("pid %d comm %s: nosys %d\n", p->p_pid, p->p_comm,
 		    td->td_sa.code);
diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c
index 78014a36b34b..f923211cb6c8 100644
--- a/sys/kern/kern_syscalls.c
+++ b/sys/kern/kern_syscalls.c
@@ -61,6 +61,17 @@ lkmressys(struct thread *td, struct nosys_args *args)
 	return (nosys(td, args));
 }
 
+struct sysent nosys_sysent = {
+	.sy_call =	(sy_call_t *)nosys,
+	.sy_systrace_args_func = NULL,
+	.sy_narg =	0,
+	.sy_flags =	SYF_CAPENABLED,
+	.sy_auevent =	AUE_NULL,
+	.sy_entry =	0, /* DTRACE_IDNONE */
+	.sy_return =	0,
+	.sy_thrcnt =	SY_THR_STATIC,
+};
+
 static void
 syscall_thread_drain(struct sysent *se)
 {
@@ -78,19 +89,21 @@ syscall_thread_drain(struct sysent *se)
 }
 
 int
-syscall_thread_enter(struct thread *td, struct sysent *se)
+syscall_thread_enter(struct thread *td, struct sysent **se)
 {
 	uint32_t cnt, oldcnt;
 
-	KASSERT((se->sy_thrcnt & SY_THR_STATIC) == 0,
+	KASSERT(((*se)->sy_thrcnt & SY_THR_STATIC) == 0,
 	    ("%s: not a static syscall", __func__));
 
 	do {
-		oldcnt = se->sy_thrcnt;
-		if ((oldcnt & (SY_THR_DRAINING | SY_THR_ABSENT)) != 0)
-			return (ENOSYS);
+		oldcnt = (*se)->sy_thrcnt;
+		if ((oldcnt & (SY_THR_DRAINING | SY_THR_ABSENT)) != 0) {
+			*se = &nosys_sysent;
+			return (0);
+		}
 		cnt = oldcnt + SY_THR_INCR;
-	} while (atomic_cmpset_acq_32(&se->sy_thrcnt, oldcnt, cnt) == 0);
+	} while (atomic_cmpset_acq_32(&(*se)->sy_thrcnt, oldcnt, cnt) == 0);
 	return (0);
 }
 
diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c
index 44c96435a499..c3664d9cf6c2 100644
--- a/sys/kern/subr_asan.c
+++ b/sys/kern/subr_asan.c
@@ -92,7 +92,10 @@ SYSCTL_INT(_debug_kasan, OID_AUTO, panic_on_violation, CTLFLAG_RDTUN,
     &panic_on_violation, 0,
     "Panic if an invalid access is detected");
 
-static bool kasan_enabled __read_mostly = false;
+#define kasan_enabled (!kasan_disabled)
+static bool kasan_disabled __read_mostly = true;
+SYSCTL_BOOL(_debug_kasan, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+    &kasan_disabled, 0, "KASAN is disabled");
 
 /* -------------------------------------------------------------------------- */
 
@@ -136,7 +139,7 @@ kasan_init(void)
 	kasan_md_init();
 
 	/* Now officially enabled. */
-	kasan_enabled = true;
+	kasan_disabled = false;
 }
 
 void
@@ -180,7 +183,7 @@ kasan_code_name(uint8_t code)
 
 #define	REPORT(f, ...) do {				\
 	if (panic_on_violation) {			\
-		kasan_enabled = false;			\
+		kasan_disabled = true;			\
 		panic(f, __VA_ARGS__);			\
 	} else {					\
 		struct stack st;			\
diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c
index 4a2d05026007..c3bc40f80d13 100644
--- a/sys/kern/subr_msan.c
+++ b/sys/kern/subr_msan.c
@@ -108,15 +108,13 @@ static uint8_t msan_dummy_shad[PAGE_SIZE] __aligned(PAGE_SIZE);
 static uint8_t msan_dummy_write_shad[PAGE_SIZE] __aligned(PAGE_SIZE);
 static uint8_t msan_dummy_orig[PAGE_SIZE] __aligned(PAGE_SIZE);
 static msan_td_t msan_thread0;
-static bool kmsan_enabled __read_mostly;
-
 static bool kmsan_reporting = false;
 
 /*
  * Avoid clobbering any thread-local state before we panic.
  */
 #define	kmsan_panic(f, ...) do {			\
-	kmsan_enabled = false;				\
+	kmsan_disabled = true;				\
 	panic(f, __VA_ARGS__);				\
 } while (0)
 
@@ -142,6 +140,11 @@ SYSCTL_BOOL(_debug_kmsan, OID_AUTO, panic_on_violation, CTLFLAG_RWTUN,
     &panic_on_violation, 0,
     "Panic if an invalid access is detected");
 
+static bool kmsan_disabled __read_mostly = true;
+#define kmsan_enabled (!kmsan_disabled)
+SYSCTL_BOOL(_debug_kmsan, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+    &kmsan_disabled, 0, "KMSAN is disabled");
+
 static MALLOC_DEFINE(M_KMSAN, "kmsan", "Kernel memory sanitizer");
 
 /* -------------------------------------------------------------------------- */
@@ -599,7 +602,7 @@ kmsan_init(void)
 	thread0.td_kmsan = &msan_thread0;
 
 	/* Now officially enabled. */
-	kmsan_enabled = true;
+	kmsan_disabled = false;
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index f7d6cf848424..b7dbf606f492 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -170,9 +170,13 @@ init_param1(void)
 {
 
 	TSENTER();
-#if !defined(__arm64__)
+
+	/*
+	 * arm64 and riscv currently hard-code the thread0 kstack size
+	 * to KSTACK_PAGES, ignoring the tunable.
+	 */
 	TUNABLE_INT_FETCH("kern.kstack_pages", &kstack_pages);
-#endif
+
 	hz = -1;
 	TUNABLE_INT_FETCH("kern.hz", &hz);
 	if (hz == -1)
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 6b02450fe073..f5d1802c9395 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -392,7 +392,7 @@ log_console(struct uio *uio)
 		msglogstr(consbuffer, pri, /*filter_cr*/ 1);
 	}
 	msgbuftrigger = 1;
-	free(uio, M_IOV);
+	freeuio(uio);
 	free(consbuffer, M_TEMP);
 }
 
@@ -426,8 +426,10 @@ static void
 prf_putchar(int c, int flags, int pri)
 {
 
-	if (flags & TOLOG)
+	if (flags & TOLOG) {
 		msglogchar(c, pri);
+		msgbuftrigger = 1;
+	}
 
 	if (flags & TOCONS) {
 		if ((!KERNEL_PANICKED()) && (constty != NULL))
@@ -442,8 +444,10 @@ static void
 prf_putbuf(char *bufr, int flags, int pri)
 {
 
-	if (flags & TOLOG)
+	if (flags & TOLOG) {
 		msglogstr(bufr, pri, /*filter_cr*/1);
+		msgbuftrigger = 1;
+	}
 
 	if (flags & TOCONS) {
 		if ((!KERNEL_PANICKED()) && (constty != NULL))
diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c
index 9a6cca354eb5..cc5625e27585 100644
--- a/sys/kern/subr_syscall.c
+++ b/sys/kern/subr_syscall.c
@@ -159,7 +159,8 @@ syscallenter(struct thread *td)
 	    AUDIT_SYSCALL_ENTER(sa->code, td) ||
 	    !sy_thr_static)) {
 		if (!sy_thr_static) {
-			error = syscall_thread_enter(td, se);
+			error = syscall_thread_enter(td, &se);
+			sy_thr_static = (se->sy_thrcnt & SY_THR_STATIC) != 0;
 			if (error != 0) {
 				td->td_errno = error;
 				goto retval;
diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c
index 391fa4225cc7..48c580c8e89e 100644
--- a/sys/kern/subr_uio.c
+++ b/sys/kern/subr_uio.c
@@ -69,9 +69,19 @@
 SYSCTL_INT(_kern, KERN_IOV_MAX, iov_max, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, UIO_MAXIOV,
 	"Maximum number of elements in an I/O vector; sysconf(_SC_IOV_MAX)");
 
+static uma_zone_t uio_zone;
+
 static int uiomove_flags(void *cp, int n, struct uio *uio, bool nofault,
     bool preserve_tags);
 
+static void
+uio_init(void *arg __unused)
+{
+	uio_zone = uma_zcreate("UIO", sizeof(struct uio),
+	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
+}
+SYSINIT(uio_init, SI_SUB_SYSCALLS, SI_ORDER_ANY, uio_init, NULL);
+
 int
 copyin_nofault(const void * __capability udaddr, void *kaddr, size_t len)
 {
@@ -386,7 +396,7 @@ copyiniov(const struct iovec* __capability iovp, u_int iovcnt, struct iovec **io
 	*iov = NULL;
 	if (iovcnt > UIO_MAXIOV)
 		return (error);
-	iovlen = iovcnt * sizeof (struct iovec);
+	iovlen = iovcnt * sizeof(struct iovec);
 	iovs = malloc(iovlen, M_IOV, M_WAITOK);
 	error = copyincap(iovp, iovs, iovlen);
 	if (error != 0)
@@ -407,22 +417,21 @@ copyinuio(const struct iovec * __capability iovp, u_int iovcnt,
 	*uiop = NULL;
 	if (iovcnt > UIO_MAXIOV)
 		return (EINVAL);
-	iovlen = iovcnt * sizeof (struct iovec);
-	uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK);
-	iov = (struct iovec *)(uio + 1);
+	iovlen = iovcnt * sizeof(struct iovec);
+	uio = allocuio(iovcnt);
+	iov = uio->uio_iov;
 	error = copyincap(iovp, iov, iovlen);
 	if (error != 0) {
-		free(uio, M_IOV);
+		freeuio(uio);
 		return (error);
 	}
-	uio->uio_iov = cheri_kern_setbounds(iov, iovlen);
 	uio->uio_iovcnt = iovcnt;
 	uio->uio_segflg = UIO_USERSPACE;
 	uio->uio_offset = -1;
 	uio->uio_resid = 0;
 	for (i = 0; i < iovcnt; i++) {
 		if (iov->iov_len > IOSIZE_MAX - uio->uio_resid) {
-			free(uio, M_IOV);
+			freeuio(uio);
 			return (EINVAL);
 		}
 		uio->uio_resid += iov->iov_len;
@@ -449,16 +458,59 @@ updateiov(const struct uio *uiop, struct iovec * __capability iovp)
 	return (0);
 }
 
+struct uio *
+allocuio(u_int iovcnt)
+{
+	struct uio *uio;
+
+	KASSERT(iovcnt <= UIO_MAXIOV,
+	    ("Requested %u iovecs exceed UIO_MAXIOV", iovcnt));
+	uio = uma_zalloc_arg(uio_zone, (void *)(uintptr_t)iovcnt, M_WAITOK);
+#if defined(__CHERI_PURE_CAPABILITY__) && defined(__CHERI_SUBOBJECT_BOUNDS__)
+	KASSERT(cheri_getlen(uio->uio_inline_iov) ==
+	    UIO_INLINE_IOV * sizeof(struct iovec),
+	    ("Malformed UIO structure, uio_inline_iov is not representable"));
+#endif
+	uio->uio_iov = uio->uio_inline_iov;
+	uio->uio_flags = 0;
+	if (iovcnt > UIO_INLINE_IOV) {
+		uio->uio_ext_iov = malloc(iovcnt * sizeof(struct iovec), M_IOV,
+		    M_WAITOK);
+		uio->uio_iov = uio->uio_ext_iov;
+		uio->uio_flags |= UIO_EXT_IOVEC;
+	} else {
+		uio->uio_iov = cheri_kern_setboundsexact(uio->uio_iov,
+		    iovcnt * sizeof(struct iovec));
+	}
+	uio->uio_iovcnt = iovcnt;
+
+	return (uio);
+}
+
+void
+freeuio(struct uio *uio)
+{
+	if (uio->uio_flags & UIO_EXT_IOVEC) {
+#ifdef __CHERI_PURE_CAPABILITY__
+		KASSERT(cheri_is_address_inbounds(uio->uio_ext_iov,
+		    (ptraddr_t)uio->uio_iov),
+		    ("IOV pointer is not within the external iov allocation"));
+#endif
+		free(uio->uio_ext_iov, M_IOV);
+	}
+	uma_zfree(uio_zone, uio);
+}
+
 struct uio *
 cloneuio(struct uio *uiop)
 {
 	struct uio *uio;
 	int iovlen;
 
-	iovlen = uiop->uio_iovcnt * sizeof (struct iovec);
-	uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK);
-	*uio = *uiop;
-	uio->uio_iov = (struct iovec *)(uio + 1);
+	uio = allocuio(uiop->uio_iovcnt);
+	bcopy(&uiop->uio_startcopy, &uio->uio_startcopy,
+	    __rangeof(struct uio, uio_startcopy, uio_endcopy));
+	iovlen = uiop->uio_iovcnt * sizeof(struct iovec);
 	bcopy(uiop->uio_iov, uio->uio_iov, iovlen);
 	return (uio);
 }
@@ -575,7 +627,8 @@ casuword(volatile u_long * __capability addr, u_long old, u_long new)
 //   ],
 //   "changes_purecap": [
 //     "support",
-//     "pointer_as_integer"
+//     "pointer_as_integer",
+//     "bounds_compression"
 //   ]
 // }
 // CHERI CHANGES END
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index b007c8cc28d4..8b1135d5c40e 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -282,7 +282,7 @@ user_readv(struct thread *td, int fd, struct iovec * __capability iovp,
 	if (error)
 		return (error);
 	error = kern_readv(td, fd, auio);
-	free(auio, M_IOV);
+	freeuio(auio);
 	return (error);
 }
 
@@ -330,7 +330,7 @@ user_preadv(struct thread *td, int fd, struct iovec * __capability iovp,
 	if (error)
 		return (error);
 	error = kern_preadv(td, fd, auio, offset);
-	free(auio, M_IOV);
+	freeuio(auio);
 	return (error);
 }
 
@@ -507,7 +507,7 @@ user_writev(struct thread *td, int fd, struct iovec * __capability iovp,
 	if (error)
 		return (error);
 	error = kern_writev(td, fd, auio);
-	free(auio, M_IOV);
+	freeuio(auio);
 	return (error);
 }
 
@@ -555,7 +555,7 @@ user_pwritev(struct thread *td, int fd, struct iovec * __capability iovp,
 	if (error)
 		return (error);
 	error = kern_pwritev(td, fd, auio, offset);
-	free(auio, M_IOV);
+	freeuio(auio);
 	return (error);
 }
 
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index a385ab1133f6..2869ed1c7844 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -34,6 +34,7 @@
 ;	COMPAT11 included on COMPAT_FREEBSD11 #ifdef (FreeBSD 11 compat)
 ;	COMPAT12 included on COMPAT_FREEBSD12 #ifdef (FreeBSD 12 compat)
 ;	COMPAT13 included on COMPAT_FREEBSD13 #ifdef (FreeBSD 13 compat)
+;	COMPAT14 included on COMPAT_FREEBSD14 #ifdef (FreeBSD 14 compat)
 ;	OBSOL	obsolete, not included in system, only specifies name
 ;	RESERVED reserved for local or vendor use (not for FreeBSD)
 ;	UNIMPL	not implemented, placeholder only
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 9d398221d1f4..4155a11b1d6e 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -85,8 +85,8 @@ static const char	*dev_console_filename;
 /*
  * Flags that are supported and stored by this implementation.
  */
-#define TTYSUP_IFLAG	(IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|\
-			INLCR|IGNCR|ICRNL|IXON|IXOFF|IXANY|IMAXBEL)
+#define TTYSUP_IFLAG	(IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|INLCR|\
+			IGNCR|ICRNL|IXON|IXOFF|IXANY|IMAXBEL|IUTF8)
 #define TTYSUP_OFLAG	(OPOST|ONLCR|TAB3|ONOEOT|OCRNL|ONOCR|ONLRET)
 #define TTYSUP_LFLAG	(ECHOKE|ECHOE|ECHOK|ECHO|ECHONL|ECHOPRT|\
 			ECHOCTL|ISIG|ICANON|ALTWERASE|IEXTEN|TOSTOP|\
diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c
index 665275ee93e7..c46579cefbb1 100644
--- a/sys/kern/tty_ttydisc.c
+++ b/sys/kern/tty_ttydisc.c
@@ -43,6 +43,9 @@
 #include <sys/uio.h>
 #include <sys/vnode.h>
 
+#include <teken/teken.h>
+#include <teken/teken_wcwidth.h>
+
 /*
  * Standard TTYDISC `termios' line discipline.
  */
@@ -78,8 +81,13 @@ SYSCTL_ULONG(_kern, OID_AUTO, tty_nout, CTLFLAG_RD,
 /* Character is alphanumeric. */
 #define CTL_ALNUM(c)	(((c) >= '0' && (c) <= '9') || \
     ((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z'))
+/* Character is UTF8-encoded. */
+#define CTL_UTF8(c) (!!((c) & 0x80))
+/* Character is a UTF8 continuation byte. */
+#define CTL_UTF8_CONT(c) (((c) & 0xc0) == 0x80)
 
 #define	TTY_STACKBUF	256
+#define UTF8_STACKBUF 4
 
 void
 ttydisc_open(struct tty *tp)
@@ -800,6 +808,74 @@ ttydisc_rubchar(struct tty *tp)
 				ttyoutq_write_nofrag(&tp->t_outq,
 				    "\b\b\b\b\b\b\b\b", tablen);
 				return (0);
+			} else if ((tp->t_termios.c_iflag & IUTF8) != 0 &&
+			    CTL_UTF8(c)) {
+				uint8_t bytes[UTF8_STACKBUF] = { 0 };
+				int curidx = UTF8_STACKBUF - 1, cwidth = 1,
+				    nb = 0;
+				teken_char_t codepoint;
+
+				/* Save current byte. */
+				bytes[curidx] = c;
+				curidx--;
+				nb++;
+				/* Loop back through inq until we hit the
+				 * leading byte. */
+				while (CTL_UTF8_CONT(c) && nb < UTF8_STACKBUF) {
+					ttyinq_peekchar(&tp->t_inq, &c, &quote);
+					ttyinq_unputchar(&tp->t_inq);
+					bytes[curidx] = c;
+					curidx--;
+					nb++;
+				}
+				/*
+				 * Shift array so that the leading
+				 * byte ends up at idx 0.
+				 */
+				if (nb < UTF8_STACKBUF)
+					memmove(&bytes[0], &bytes[curidx + 1],
+					    nb * sizeof(uint8_t));
+				/* Check for malformed UTF8 characters. */
+				if (nb == UTF8_STACKBUF &&
+				    CTL_UTF8_CONT(bytes[0])) {
+					/*
+					 * Place all bytes back into the inq and
+					 * delete the last byte only.
+					 */
+					ttyinq_write(&tp->t_inq, bytes,
+					    UTF8_STACKBUF, 0);
+					ttyinq_unputchar(&tp->t_inq);
+				} else {
+					/* Find codepoint and width. */
+					codepoint =
+					    teken_utf8_bytes_to_codepoint(bytes,
+						nb);
+					if (codepoint ==
+						TEKEN_UTF8_INVALID_CODEPOINT ||
+					    (cwidth = teken_wcwidth(
+						 codepoint)) == -1) {
+						/*
+						 * Place all bytes back into the
+						 * inq and fall back to
+						 * default behaviour.
+						 */
+						cwidth = 1;
+						ttyinq_write(&tp->t_inq, bytes,
+						    nb, 0);
+						ttyinq_unputchar(&tp->t_inq);
+					}
+				}
+				tp->t_column -= cwidth;
+				/*
+				 * Delete character by punching
+				 * 'cwidth' spaces over it.
+				 */
+				if (cwidth == 1)
+					ttyoutq_write_nofrag(&tp->t_outq,
+					    "\b \b", 3);
+				else if (cwidth == 2)
+					ttyoutq_write_nofrag(&tp->t_outq,
+					    "\b\b  \b\b", 6);
 			} else {
 				/*
 				 * Remove a regular character by
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 45cf3967d6ba..3490a17e79af 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -367,8 +367,8 @@ sysctl_maxsockets(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 SYSCTL_PROC(_kern_ipc, OID_AUTO, maxsockets,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, &maxsockets, 0,
-    sysctl_maxsockets, "IU",
+    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE,
+    &maxsockets, 0, sysctl_maxsockets, "IU",
     "Maximum number of sockets available");
 
 /*
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 785146266fe0..527a56633f26 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -1467,7 +1467,7 @@ aiocb_free_kaiocb(struct kaiocb *kjob)
 		return;
 	if (refcount_release(&kjob->refcount)) {
 		if (kjob->uiop != &kjob->uio)
-			free(kjob->uiop, M_IOV);
+			freeuio(kjob->uiop);
 		uma_zfree(aiocb_zone, kjob);
 	}
 }
@@ -1788,7 +1788,7 @@ aio_aqueue(struct thread *td, struct aiocb * __capability ujob,
 	knlist_delete(&job->klist, curthread, 0);
 err2:
 	if (job->uiop != &job->uio)
-		free(job->uiop, M_IOV);
+		freeuio(job->uiop);
 	uma_zfree(aiocb_zone, job);
 err1:
 	ops->store_error(ujob, error);
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 4a6a6c3b036d..5a6ca54fd5c8 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -323,7 +323,8 @@ SYSCTL_COUNTER_U64(_vfs, OID_AUTO, notbufdflushes, CTLFLAG_RD, &notbufdflushes,
 static long barrierwrites;
 SYSCTL_LONG(_vfs, OID_AUTO, barrierwrites, CTLFLAG_RW | CTLFLAG_STATS,
     &barrierwrites, 0, "Number of barrier writes");
-SYSCTL_INT(_vfs, OID_AUTO, unmapped_buf_allowed, CTLFLAG_RD,
+SYSCTL_INT(_vfs, OID_AUTO, unmapped_buf_allowed,
+    CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
     &unmapped_buf_allowed, 0,
     "Permit the use of the unmapped i/o");
 int maxbcachebuf = MAXBCACHEBUF;
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 5f58b8061525..075dfd5775c7 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -197,10 +197,99 @@
  * - vnodes are subject to being recycled even if target inode is left in memory,
  *   which loses the name cache entries when it perhaps should not. in case of tmpfs
  *   names get duplicated -- kept by filesystem itself and namecache separately
- * - struct namecache has a fixed size and comes in 2 variants, often wasting space.
- *   now hard to replace with malloc due to dependence on SMR.
+ * - struct namecache has a fixed size and comes in 2 variants, often wasting
+ *   space.  now hard to replace with malloc due to dependence on SMR, which
+ *   requires UMA zones to opt in
  * - lack of better integration with the kernel also turns nullfs into a layered
  *   filesystem instead of something which can take advantage of caching
+ *
+ * Appendix A: where is the time lost, expanding on paragraph III
+ *
+ * While some care went into optimizing lookups, there is still plenty of
+ * performance left on the table, most notably from single-threaded standpoint.
+ * Below is a woefully incomplete list of changes which can help.  Ideas are
+ * mostly sketched out, no claim is made all kinks or prerequisites are laid
+ * out.
+ *
+ * Note there is performance lost all over VFS.
+ *
+ * === SMR-only lookup
+ *
+ * For commonly used ops like stat(2), when the terminal vnode *is* cached,
+ * lockless lookup could refrain from refing/locking the found vnode and
+ * instead return while within the SMR section. Then a call to, say,
+ * vop_stat_smr could do the work (or fail with EAGAIN), finally the result
+ * would be validated with seqc not changing. This would be faster
+ * single-threaded as it dodges atomics and would provide full scalability for
+ * multicore uses. This would *not* work for open(2) or other calls which need
+ * the vnode to hang around for the long haul, but would work for aforementioned
+ * stat(2) but also access(2), readlink(2), realpathat(2) and probably more.
+ *
+ * === hotpatching for sdt probes
+ *
+ * They result in *tons* of branches all over with rather regrettable codegen
+ * at times. Removing sdt probes altogether gives over 2% boost in lookup rate.
+ * Reworking the code to patch itself at runtime with asm goto would solve it.
+ * asm goto is fully supported by gcc and clang.
+ *
+ * === copyinstr
+ *
+ * On all architectures it operates one byte at a time, while it could be
+ * word-sized instead thanks to the Mycroft trick.
+ *
+ * API itself is rather pessimal for path lookup, accepting arbitrary sizes and
+ * *optionally* filling in the length parameter.
+ *
+ * Instead a new routine (copyinpath?) could be introduced, demanding a buffer
+ * size which is a multiply of the word (and never zero), with the length
+ * always returned. On top of it the routine could be allowed to transform the
+ * buffer in arbitrary ways, most notably writing past the found length (not to
+ * be confused with writing past buffer size) -- this would allow word-sized
+ * movs while checking for '\0' later.
+ *
+ * === detour through namei
+ *
+ * Currently one suffers being called from namei, which then has to check if
+ * things worked out locklessly. Instead the lockless lookup could be the
+ * actual entry point which calls what is currently namei as a fallback.
+ *
+ * === avoidable branches in cache_can_fplookup
+ *
+ * The cache_fast_lookup_enabled flag check could be hotpatchable (in fact if
+ * this is off, none of fplookup code should execute).
+ *
+ * Both audit and capsicum branches can be combined into one, but it requires
+ * paying off a lot of tech debt first.
+ *
+ * ni_startdir could be indicated with a flag in cn_flags, eliminating the
+ * branch.
+ *
+ * === mount stacks
+ *
+ * Crossing a mount requires checking if perhaps something is mounted on top.
+ * Instead, an additional entry could be added to struct mount with a pointer
+ * to the final mount on the stack. This would be recalculated on each
+ * mount/unmount.
+ *
+ * === root vnodes
+ *
+ * It could become part of the API contract to *always* have a rootvnode set in
+ * mnt_rootvnode. Such vnodes are annotated with VV_ROOT and vnlru would have
+ * to be modified to always skip them.
+ *
+ * === inactive on v_usecount reaching 0
+ *
+ * VOP_NEED_INACTIVE should not exist. Filesystems would indicate need for such
+ * processing with a bit in usecount.
+ *
+ * === v_holdcnt
+ *
+ * Hold count should probably get eliminated, but one can argue it is a useful
+ * feature. Even if so, handling of v_usecount could be decoupled from it --
+ * vnlru et al would consider the vnode not-freeable if has either hold or
+ * usecount on it.
+ *
+ * This would eliminate 2 atomics.
  */
 
 static SYSCTL_NODE(_vfs, OID_AUTO, cache, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
@@ -556,17 +645,14 @@ static SYSCTL_NODE(_vfs_cache, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
     "Name cache debugging");
 #define DEBUGNODE_ULONG(name, varname, descr)					\
 	SYSCTL_ULONG(_vfs_cache_debug, OID_AUTO, name, CTLFLAG_RD, &varname, 0, descr);
-#define DEBUGNODE_COUNTER(name, varname, descr)					\
-	static COUNTER_U64_DEFINE_EARLY(varname);				\
-	SYSCTL_COUNTER_U64(_vfs_cache_debug, OID_AUTO, name, CTLFLAG_RD, &varname, \
-	    descr);
-DEBUGNODE_COUNTER(zap_bucket_relock_success, zap_bucket_relock_success,
+static u_long zap_bucket_relock_success;
+DEBUGNODE_ULONG(zap_bucket_relock_success, zap_bucket_relock_success,
     "Number of successful removals after relocking");
-static long zap_bucket_fail;
+static u_long zap_bucket_fail;
 DEBUGNODE_ULONG(zap_bucket_fail, zap_bucket_fail, "");
-static long zap_bucket_fail2;
+static u_long zap_bucket_fail2;
 DEBUGNODE_ULONG(zap_bucket_fail2, zap_bucket_fail2, "");
-static long cache_lock_vnodes_cel_3_failures;
+static u_long cache_lock_vnodes_cel_3_failures;
 DEBUGNODE_ULONG(vnodes_cel_3_failures, cache_lock_vnodes_cel_3_failures,
     "Number of times 3-way vnode locking failed");
 
@@ -1651,6 +1737,7 @@ cache_zap_unlocked_bucket(struct namecache *ncp, struct componentname *cnp,
     struct mtx *blp)
 {
 	struct namecache *rncp;
+	struct mtx *rvlp;
 
 	cache_assert_bucket_unlocked(ncp);
 
@@ -1663,14 +1750,24 @@ cache_zap_unlocked_bucket(struct namecache *ncp, struct componentname *cnp,
 		    !bcmp(rncp->nc_name, cnp->cn_nameptr, rncp->nc_nlen))
 			break;
 	}
-	if (rncp != NULL) {
-		cache_zap_locked(rncp);
-		mtx_unlock(blp);
-		cache_unlock_vnodes(dvlp, vlp);
-		counter_u64_add(zap_bucket_relock_success, 1);
-		return (0);
-	}
 
+	if (rncp == NULL)
+		goto out_mismatch;
+
+	if (!(ncp->nc_flag & NCF_NEGATIVE))
+		rvlp = VP2VNODELOCK(rncp->nc_vp);
+	else
+		rvlp = NULL;
+	if (rvlp != vlp)
+		goto out_mismatch;
+
+	cache_zap_locked(rncp);
+	mtx_unlock(blp);
+	cache_unlock_vnodes(dvlp, vlp);
+	atomic_add_long(&zap_bucket_relock_success, 1);
+	return (0);
+
+out_mismatch:
 	mtx_unlock(blp);
 	cache_unlock_vnodes(dvlp, vlp);
 	return (EAGAIN);
@@ -1742,6 +1839,15 @@ cache_remove_cnp(struct vnode *dvp, struct componentname *cnp)
 		return (1);
 	}
 
+	/*
+	 * XXX note that access here is completely unlocked with no provisions
+	 * to keep the hash allocated. If one is sufficiently unlucky a
+	 * parallel cache resize can reallocate the hash, unmap backing pages
+	 * and cause the empty check below to fault.
+	 *
+	 * Fixing this has epsilon priority, but can be done with no overhead
+	 * for this codepath with sufficient effort.
+	 */
 	hash = cache_get_hash(cnp->cn_nameptr, cnp->cn_namelen, dvp);
 	blp = HASH2BUCKETLOCK(hash);
 retry:
@@ -1763,7 +1869,7 @@ cache_remove_cnp(struct vnode *dvp, struct componentname *cnp)
 
 	error = cache_zap_locked_bucket(ncp, cnp, hash, blp);
 	if (__predict_false(error != 0)) {
-		zap_bucket_fail++;
+		atomic_add_long(&zap_bucket_fail, 1);
 		goto retry;
 	}
 	counter_u64_add(numposzaps, 1);
@@ -1989,7 +2095,7 @@ cache_lookup_fallback(struct vnode *dvp, struct vnode **vpp, struct componentnam
 			counter_u64_add(numnegzaps, 1);
 			error = cache_zap_locked_bucket(ncp, cnp, hash, blp);
 			if (__predict_false(error != 0)) {
-				zap_bucket_fail2++;
+				atomic_add_long(&zap_bucket_fail2, 1);
 				goto retry;
 			}
 			cache_free(ncp);
@@ -2187,8 +2293,8 @@ cache_lock_vnodes_cel_3(struct celockstate *cel, struct vnode *vp)
 	} else {
 		if (mtx_trylock(vlp))
 			goto out;
-		cache_lock_vnodes_cel_3_failures++;
 		cache_unlock_vnodes_cel(cel);
+		atomic_add_long(&cache_lock_vnodes_cel_3_failures, 1);
 		if (vlp < cel->vlp[0]) {
 			mtx_lock(vlp);
 			mtx_lock(cel->vlp[0]);
@@ -4046,7 +4152,7 @@ syscal_vfs_cache_fast_lookup(SYSCTL_HANDLER_ARGS)
 		cache_fast_lookup_enabled_recalc();
 	return (error);
 }
-SYSCTL_PROC(_vfs, OID_AUTO, cache_fast_lookup, CTLTYPE_INT|CTLFLAG_RW|CTLFLAG_MPSAFE,
+SYSCTL_PROC(_vfs_cache_param, OID_AUTO, fast_lookup, CTLTYPE_INT|CTLFLAG_RW|CTLFLAG_MPSAFE,
     &cache_fast_lookup, 0, syscal_vfs_cache_fast_lookup, "IU", "");
 
 /*
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index a92fcc0fced0..8967f99c191d 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -483,7 +483,7 @@ kern_nmount(struct thread *td, struct iovec * __capability iovp, u_int iovcnt,
 	}
 	error = vfs_donmount(td, flags, auio);
 
-	free(auio, M_IOV);
+	freeuio(auio);
 	return (error);
 }
 
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 3b9f37651edd..70b2599f94f8 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -110,7 +110,7 @@ static void	delmntque(struct vnode *vp);
 static int	flushbuflist(struct bufv *bufv, int flags, struct bufobj *bo,
 		    int slpflag, int slptimeo);
 static void	syncer_shutdown(void *arg, int howto);
-static int	vtryrecycle(struct vnode *vp);
+static int	vtryrecycle(struct vnode *vp, bool isvnlru);
 static void	v_init_counters(struct vnode *);
 static void	vn_seqc_init(struct vnode *);
 static void	vn_seqc_write_end_free(struct vnode *vp);
@@ -199,18 +199,26 @@ static long wantfreevnodes;
 static long __exclusive_cache_line freevnodes;
 static long freevnodes_old;
 
-static counter_u64_t recycles_count;
-SYSCTL_COUNTER_U64(_vfs, OID_AUTO, recycles, CTLFLAG_RD, &recycles_count,
+static u_long recycles_count;
+SYSCTL_ULONG(_vfs, OID_AUTO, recycles, CTLFLAG_RD | CTLFLAG_STATS, &recycles_count, 0,
     "Number of vnodes recycled to meet vnode cache targets (legacy)");
-SYSCTL_COUNTER_U64(_vfs_vnode_vnlru, OID_AUTO, recycles, CTLFLAG_RD, &recycles_count,
+SYSCTL_ULONG(_vfs_vnode_vnlru, OID_AUTO, recycles, CTLFLAG_RD | CTLFLAG_STATS,
+    &recycles_count, 0,
     "Number of vnodes recycled to meet vnode cache targets");
 
-static counter_u64_t recycles_free_count;
-SYSCTL_COUNTER_U64(_vfs, OID_AUTO, recycles_free, CTLFLAG_RD, &recycles_free_count,
+static u_long recycles_free_count;
+SYSCTL_ULONG(_vfs, OID_AUTO, recycles_free, CTLFLAG_RD | CTLFLAG_STATS,
+    &recycles_free_count, 0,
     "Number of free vnodes recycled to meet vnode cache targets (legacy)");
-SYSCTL_COUNTER_U64(_vfs_vnode_vnlru, OID_AUTO, recycles_free, CTLFLAG_RD, &recycles_free_count,
+SYSCTL_ULONG(_vfs_vnode_vnlru, OID_AUTO, recycles_free, CTLFLAG_RD | CTLFLAG_STATS,
+    &recycles_free_count, 0,
     "Number of free vnodes recycled to meet vnode cache targets");
 
+static counter_u64_t direct_recycles_free_count;
+SYSCTL_COUNTER_U64(_vfs_vnode_vnlru, OID_AUTO, direct_recycles_free, CTLFLAG_RD,
+    &direct_recycles_free_count,
+    "Number of free vnodes recycled by vn_alloc callers to meet vnode cache targets");
+
 static counter_u64_t vnode_skipped_requeues;
 SYSCTL_COUNTER_U64(_vfs_vnode_stats, OID_AUTO, skipped_requeues, CTLFLAG_RD, &vnode_skipped_requeues,
     "Number of times LRU requeue was skipped due to lock contention");
@@ -453,7 +461,6 @@ sysctl_try_reclaim_vnode(SYSCTL_HANDLER_ARGS)
 		goto putvnode;
 	}
 
-	counter_u64_add(recycles_count, 1);
 	vgone(vp);
 putvnode:
 	vput(vp);
@@ -487,7 +494,6 @@ sysctl_ftry_reclaim_vnode(SYSCTL_HANDLER_ARGS)
 	if (error != 0)
 		goto drop;
 
-	counter_u64_add(recycles_count, 1);
 	vgone(vp);
 	VOP_UNLOCK(vp);
 drop:
@@ -773,8 +779,7 @@ vntblinit(void *dummy __unused)
 	uma_prealloc(buf_trie_zone, nbuf);
 
 	vnodes_created = counter_u64_alloc(M_WAITOK);
-	recycles_count = counter_u64_alloc(M_WAITOK);
-	recycles_free_count = counter_u64_alloc(M_WAITOK);
+	direct_recycles_free_count = counter_u64_alloc(M_WAITOK);
 	vnode_skipped_requeues = counter_u64_alloc(M_WAITOK);
 
 	/*
@@ -1280,7 +1285,7 @@ vlrureclaim(bool reclaim_nc_src, int trigger, u_long target)
 			vn_finished_write(mp);
 			goto next_iter_unlocked;
 		}
-		counter_u64_add(recycles_count, 1);
+		recycles_count++;
 		vgonel(vp);
 		VOP_UNLOCK(vp);
 		vdropl_recycle(vp);
@@ -1310,16 +1315,18 @@ vlrureclaim(bool reclaim_nc_src, int trigger, u_long target)
 	return (done);
 }
 
-static int max_vnlru_free = 10000; /* limit on vnode free requests per call */
-SYSCTL_INT(_debug, OID_AUTO, max_vnlru_free, CTLFLAG_RW, &max_vnlru_free,
-    0,
+static int max_free_per_call = 10000;
+SYSCTL_INT(_debug, OID_AUTO, max_vnlru_free, CTLFLAG_RW, &max_free_per_call, 0,
+    "limit on vnode free requests per call to the vnlru_free routine (legacy)");
+SYSCTL_INT(_vfs_vnode_vnlru, OID_AUTO, max_free_per_call, CTLFLAG_RW,
+    &max_free_per_call, 0,
     "limit on vnode free requests per call to the vnlru_free routine");
 
 /*
  * Attempt to reduce the free list by the requested amount.
  */
 static int
-vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp)
+vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp, bool isvnlru)
 {
 	struct vnode *vp;
 	struct mount *mp;
@@ -1327,8 +1334,8 @@ vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp)
 	bool retried;
 
 	mtx_assert(&vnode_list_mtx, MA_OWNED);
-	if (count > max_vnlru_free)
-		count = max_vnlru_free;
+	if (count > max_free_per_call)
+		count = max_free_per_call;
 	if (count == 0) {
 		mtx_unlock(&vnode_list_mtx);
 		return (0);
@@ -1405,7 +1412,7 @@ vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp)
 		 *
 		 * Check nullfs for one example (null_getwritemount).
 		 */
-		vtryrecycle(vp);
+		vtryrecycle(vp, isvnlru);
 		count--;
 		if (count == 0) {
 			break;
@@ -1421,16 +1428,35 @@ vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp)
  * XXX: returns without vnode_list_mtx locked!
  */
 static int
-vnlru_free_locked(int count)
+vnlru_free_locked_direct(int count)
 {
 	int ret;
 
 	mtx_assert(&vnode_list_mtx, MA_OWNED);
-	ret = vnlru_free_impl(count, NULL, vnode_list_free_marker);
+	ret = vnlru_free_impl(count, NULL, vnode_list_free_marker, false);
 	mtx_assert(&vnode_list_mtx, MA_NOTOWNED);
 	return (ret);
 }
 
+static int
+vnlru_free_locked_vnlru(int count)
+{
+	int ret;
+
+	mtx_assert(&vnode_list_mtx, MA_OWNED);
+	ret = vnlru_free_impl(count, NULL, vnode_list_free_marker, true);
+	mtx_assert(&vnode_list_mtx, MA_NOTOWNED);
+	return (ret);
+}
+
+static int
+vnlru_free_vnlru(int count)
+{
+
+	mtx_lock(&vnode_list_mtx);
+	return (vnlru_free_locked_vnlru(count));
+}
+
 void
 vnlru_free_vfsops(int count, struct vfsops *mnt_op, struct vnode *mvp)
 {
@@ -1439,7 +1465,7 @@ vnlru_free_vfsops(int count, struct vfsops *mnt_op, struct vnode *mvp)
 	MPASS(mvp != NULL);
 	VNPASS(mvp->v_type == VMARKER, mvp);
 	mtx_lock(&vnode_list_mtx);
-	vnlru_free_impl(count, mnt_op, mvp);
+	vnlru_free_impl(count, mnt_op, mvp, true);
 	mtx_assert(&vnode_list_mtx, MA_NOTOWNED);
 }
 
@@ -1486,6 +1512,8 @@ static u_long vnlruproc_kicks;
 SYSCTL_ULONG(_vfs_vnode_vnlru, OID_AUTO, kicks, CTLFLAG_RD, &vnlruproc_kicks, 0,
     "Number of times vnlru got woken up due to vnode shortage");
 
+#define VNLRU_COUNT_SLOP 100
+
 /*
  * The main freevnodes counter is only updated when a counter local to CPU
  * diverges from 0 by more than VNLRU_FREEVNODES_SLOP. CPUs are conditionally
@@ -1588,6 +1616,9 @@ static void
 vnlru_kick_cond(void)
 {
 
+	if (vnlru_read_freevnodes() > wantfreevnodes)
+		return;
+
 	if (vnlruproc_sig)
 		return;
 	mtx_lock(&vnode_list_mtx);
@@ -1595,6 +1626,115 @@ vnlru_kick_cond(void)
 	mtx_unlock(&vnode_list_mtx);
 }
 
+static void
+vnlru_proc_sleep(void)
+{
+
+	if (vnlruproc_sig) {
+		vnlruproc_sig = 0;
+		wakeup(&vnlruproc_sig);
+	}
+	msleep(vnlruproc, &vnode_list_mtx, PVFS|PDROP, "vlruwt", hz);
+}
+
+/*
+ * A lighter version of the machinery below.
+ *
+ * Tries to reach goals only by recycling free vnodes and does not invoke
+ * uma_reclaim(UMA_RECLAIM_DRAIN).
+ *
+ * This works around pathological behavior in vnlru in presence of tons of free
+ * vnodes, but without having to rewrite the machinery at this time. Said
+ * behavior boils down to continuously trying to reclaim all kinds of vnodes
+ * (cycling through all levels of "force") when the count is transiently above
+ * limit. This happens a lot when all vnodes are used up and vn_alloc
+ * speculatively increments the counter.
+ *
+ * Sample testcase: vnode limit 8388608, 20 separate directory trees each with
+ * 1 million files in total and 20 find(1) processes stating them in parallel
+ * (one per each tree).
+ *
+ * On a kernel with only stock machinery this needs anywhere between 60 and 120
+ * seconds to execute (time varies *wildly* between runs). With the workaround
+ * it consistently stays around 20 seconds [it got further down with later
+ * changes].
+ *
+ * That is to say the entire thing needs a fundamental redesign (most notably
+ * to accommodate faster recycling), the above only tries to get it ouf the way.
+ *
+ * Return values are:
+ * -1 -- fallback to regular vnlru loop
+ *  0 -- do nothing, go to sleep
+ * >0 -- recycle this many vnodes
+ */
+static long
+vnlru_proc_light_pick(void)
+{
+	u_long rnumvnodes, rfreevnodes;
+
+	if (vstir || vnlruproc_sig == 1)
+		return (-1);
+
+	rnumvnodes = atomic_load_long(&numvnodes);
+	rfreevnodes = vnlru_read_freevnodes();
+
+	/*
+	 * vnode limit might have changed and now we may be at a significant
+	 * excess. Bail if we can't sort it out with free vnodes.
+	 *
+	 * Due to atomic updates the count can legitimately go above
+	 * the limit for a short period, don't bother doing anything in
+	 * that case.
+	 */
+	if (rnumvnodes > desiredvnodes + VNLRU_COUNT_SLOP + 10) {
+		if (rnumvnodes - rfreevnodes >= desiredvnodes ||
+		    rfreevnodes <= wantfreevnodes) {
+			return (-1);
+		}
+
+		return (rnumvnodes - desiredvnodes);
+	}
+
+	/*
+	 * Don't try to reach wantfreevnodes target if there are too few vnodes
+	 * to begin with.
+	 */
+	if (rnumvnodes < wantfreevnodes) {
+		return (0);
+	}
+
+	if (rfreevnodes < wantfreevnodes) {
+		return (-1);
+	}
+
+	return (0);
+}
+
+static bool
+vnlru_proc_light(void)
+{
+	long freecount;
+
+	mtx_assert(&vnode_list_mtx, MA_NOTOWNED);
+
+	freecount = vnlru_proc_light_pick();
+	if (freecount == -1)
+		return (false);
+
+	if (freecount != 0) {
+		vnlru_free_vnlru(freecount);
+	}
+
+	mtx_lock(&vnode_list_mtx);
+	vnlru_proc_sleep();
+	mtx_assert(&vnode_list_mtx, MA_NOTOWNED);
+	return (true);
+}
+
+static u_long uma_reclaim_calls;
+SYSCTL_ULONG(_vfs_vnode_vnlru, OID_AUTO, uma_reclaim_calls, CTLFLAG_RD | CTLFLAG_STATS,
+    &uma_reclaim_calls, 0, "Number of calls to uma_reclaim");
+
 static void
 vnlru_proc(void)
 {
@@ -1610,6 +1750,10 @@ vnlru_proc(void)
 	want_reread = false;
 	for (;;) {
 		kproc_suspend_check(vnlruproc);
+
+		if (force == 0 && vnlru_proc_light())
+			continue;
+
 		mtx_lock(&vnode_list_mtx);
 		rnumvnodes = atomic_load_long(&numvnodes);
 
@@ -1623,8 +1767,8 @@ vnlru_proc(void)
 		 * adjusted using its sysctl, or emergency growth), first
 		 * try to reduce it by discarding from the free list.
 		 */
-		if (rnumvnodes > desiredvnodes) {
-			vnlru_free_locked(rnumvnodes - desiredvnodes);
+		if (rnumvnodes > desiredvnodes + 10) {
+			vnlru_free_locked_vnlru(rnumvnodes - desiredvnodes);
 			mtx_lock(&vnode_list_mtx);
 			rnumvnodes = atomic_load_long(&numvnodes);
 		}
@@ -1640,10 +1784,7 @@ vnlru_proc(void)
 			vstir = false;
 		}
 		if (force == 0 && !vnlru_under(rnumvnodes, vlowat)) {
-			vnlruproc_sig = 0;
-			wakeup(&vnlruproc_sig);
-			msleep(vnlruproc, &vnode_list_mtx,
-			    PVFS|PDROP, "vlruwt", hz);
+			vnlru_proc_sleep();
 			continue;
 		}
 		rfreevnodes = vnlru_read_freevnodes();
@@ -1678,8 +1819,16 @@ vnlru_proc(void)
 		target = target / 10 + 1;
 		done = vlrureclaim(reclaim_nc_src, trigger, target);
 		mtx_unlock(&vnode_list_mtx);
-		if (onumvnodes > desiredvnodes && numvnodes <= desiredvnodes)
+		/*
+		 * Total number of vnodes can transiently go slightly above the
+		 * limit (see vn_alloc_hard), no need to call uma_reclaim if
+		 * this happens.
+		 */
+		if (onumvnodes + VNLRU_COUNT_SLOP + 1000 > desiredvnodes &&
+		    numvnodes <= desiredvnodes) {
+			uma_reclaim_calls++;
 			uma_reclaim(UMA_RECLAIM_DRAIN);
+		}
 		if (done == 0) {
 			if (force == 0 || force == 1) {
 				force = 2;
@@ -1719,7 +1868,7 @@ SYSINIT(vnlru, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start,
  * through vgone().
  */
 static int
-vtryrecycle(struct vnode *vp)
+vtryrecycle(struct vnode *vp, bool isvnlru)
 {
 	struct mount *vnmp;
 
@@ -1764,7 +1913,10 @@ vtryrecycle(struct vnode *vp)
 		return (EBUSY);
 	}
 	if (!VN_IS_DOOMED(vp)) {
-		counter_u64_add(recycles_free_count, 1);
+		if (isvnlru)
+			recycles_free_count++;
+		else
+			counter_u64_add(direct_recycles_free_count, 1);
 		vgonel(vp);
 	}
 	VOP_UNLOCK(vp);
@@ -1795,22 +1947,38 @@ SYSCTL_ULONG(_vfs_vnode_stats, OID_AUTO, alloc_sleeps, CTLFLAG_RD, &vn_alloc_sle
     "Number of times vnode allocation blocked waiting on vnlru");
 
 static struct vnode * __noinline
-vn_alloc_hard(struct mount *mp)
+vn_alloc_hard(struct mount *mp, u_long rnumvnodes, bool bumped)
 {
-	u_long rnumvnodes, rfreevnodes;
+	u_long rfreevnodes;
 
-	mtx_lock(&vnode_list_mtx);
-	rnumvnodes = atomic_load_long(&numvnodes);
-	if (rnumvnodes + 1 < desiredvnodes) {
-		vn_alloc_cyclecount = 0;
-		mtx_unlock(&vnode_list_mtx);
-		goto alloc;
+	if (bumped) {
+		if (rnumvnodes > desiredvnodes + VNLRU_COUNT_SLOP) {
+			atomic_subtract_long(&numvnodes, 1);
+			bumped = false;
+		}
 	}
-	rfreevnodes = vnlru_read_freevnodes();
-	if (vn_alloc_cyclecount++ >= rfreevnodes) {
-		vn_alloc_cyclecount = 0;
-		vstir = true;
+
+	mtx_lock(&vnode_list_mtx);
+
+	if (vn_alloc_cyclecount != 0) {
+		rnumvnodes = atomic_load_long(&numvnodes);
+		if (rnumvnodes + 1 < desiredvnodes) {
+			vn_alloc_cyclecount = 0;
+			mtx_unlock(&vnode_list_mtx);
+			goto alloc;
+		}
+
+		rfreevnodes = vnlru_read_freevnodes();
+		if (rfreevnodes < wantfreevnodes) {
+			if (vn_alloc_cyclecount++ >= rfreevnodes) {
+				vn_alloc_cyclecount = 0;
+				vstir = true;
+			}
+		} else {
+			vn_alloc_cyclecount = 0;
+		}
 	}
+
 	/*
 	 * Grow the vnode cache if it will not be above its target max
 	 * after growing.  Otherwise, if the free list is nonempty, try
@@ -1821,28 +1989,32 @@ vn_alloc_hard(struct mount *mp)
 	 * should be chosen so that we never wait or even reclaim from
 	 * the free list to below its target minimum.
 	 */
-	if (vnlru_free_locked(1) > 0)
+	if (vnlru_free_locked_direct(1) > 0)
 		goto alloc;
 	mtx_assert(&vnode_list_mtx, MA_NOTOWNED);
 	if (mp == NULL || (mp->mnt_kern_flag & MNTK_SUSPEND) == 0) {
 		/*
 		 * Wait for space for a new vnode.
 		 */
+		if (bumped) {
+			atomic_subtract_long(&numvnodes, 1);
+			bumped = false;
+		}
 		mtx_lock(&vnode_list_mtx);
 		vnlru_kick_locked();
 		vn_alloc_sleeps++;
 		msleep(&vnlruproc_sig, &vnode_list_mtx, PVFS, "vlruwk", hz);
 		if (atomic_load_long(&numvnodes) + 1 > desiredvnodes &&
 		    vnlru_read_freevnodes() > 1)
-			vnlru_free_locked(1);
+			vnlru_free_locked_direct(1);
 		else
 			mtx_unlock(&vnode_list_mtx);
 	}
 alloc:
 	mtx_assert(&vnode_list_mtx, MA_NOTOWNED);
-	rnumvnodes = atomic_fetchadd_long(&numvnodes, 1) + 1;
-	if (vnlru_under(rnumvnodes, vlowat))
-		vnlru_kick_cond();
+	if (!bumped)
+		atomic_add_long(&numvnodes, 1);
+	vnlru_kick_cond();
 	return (uma_zalloc_smr(vnode_zone, M_WAITOK));
 }
 
@@ -1852,11 +2024,10 @@ vn_alloc(struct mount *mp)
 	u_long rnumvnodes;
 
 	if (__predict_false(vn_alloc_cyclecount != 0))
-		return (vn_alloc_hard(mp));
+		return (vn_alloc_hard(mp, 0, false));
 	rnumvnodes = atomic_fetchadd_long(&numvnodes, 1) + 1;
 	if (__predict_false(vnlru_under(rnumvnodes, vlowat))) {
-		atomic_subtract_long(&numvnodes, 1);
-		return (vn_alloc_hard(mp));
+		return (vn_alloc_hard(mp, rnumvnodes, true));
 	}
 
 	return (uma_zalloc_smr(vnode_zone, M_WAITOK));
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 053ec6390701..3269f1923854 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -1428,7 +1428,7 @@ vn_io_fault1(struct vnode *vp, struct uio *uio, struct vn_io_fault_args *args,
 	td->td_ma_cnt = prev_td_ma_cnt;
 	curthread_pflags_restore(saveheld);
 out:
-	free(uio_clone, M_IOV);
+	freeuio(uio_clone);
 	return (error);
 }
 
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 1b53be1fd451..87530e988fe1 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -569,7 +569,7 @@ _iwlwififw=	iwlwififw
 .if !${MACHINE_ABI:Mpurecap}
 _ossl=		ossl
 .endif
-#_rtw88=		rtw88
+_rtw88=		rtw88
 _vmware=	vmware
 .endif
 
diff --git a/sys/modules/ath12k/Makefile b/sys/modules/ath12k/Makefile
index e72d061d0c08..674a68e12813 100644
--- a/sys/modules/ath12k/Makefile
+++ b/sys/modules/ath12k/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 DEVATH12KDIR=	${SRCTOP}/sys/contrib/dev/athk/ath12k
 
 .PATH: ${DEVATH12KDIR}
diff --git a/sys/modules/carp/Makefile b/sys/modules/carp/Makefile
index 5506d1aaec23..d7a85043539f 100644
--- a/sys/modules/carp/Makefile
+++ b/sys/modules/carp/Makefile
@@ -5,6 +5,6 @@
 KMOD=	carp
 SRCS=	ip_carp.c sha1.c
 SRCS+=	device_if.h bus_if.h vnode_if.h
-SRCS+=	opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h opt_netlink.h
+SRCS+=	opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/Makefile b/sys/modules/i2c/Makefile
index b0b002b2309a..6c976e9303f1 100644
--- a/sys/modules/i2c/Makefile
+++ b/sys/modules/i2c/Makefile
@@ -28,7 +28,9 @@ SUBDIR = \
 	smbus \
 
 .if !empty(OPT_FDT)
-SUBDIR += rx8803 \
+SUBDIR += hym8563 \
+	  rv3032 \
+	  rx8803 \
 	  tca64xx \
 	  tmp461
 .endif
diff --git a/sys/modules/i2c/ads111x/Makefile b/sys/modules/i2c/ads111x/Makefile
index 05e2d1c0da0e..d02cb704146c 100644
--- a/sys/modules/i2c/ads111x/Makefile
+++ b/sys/modules/i2c/ads111x/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/adc
 
 KMOD=	ads111x
 SRCS=	ads111x.c
diff --git a/sys/modules/i2c/controllers/iicoc/Makefile b/sys/modules/i2c/controllers/iicoc/Makefile
index f6902f1f864a..f86a6513ad22 100644
--- a/sys/modules/i2c/controllers/iicoc/Makefile
+++ b/sys/modules/i2c/controllers/iicoc/Makefile
@@ -1,4 +1,4 @@
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/controller/opencores
 
 KMOD		= iicoc
 SRCS		= device_if.h bus_if.h iicbus_if.h \
diff --git a/sys/modules/i2c/ds1307/Makefile b/sys/modules/i2c/ds1307/Makefile
index 9699a1057dc3..363aa412cbdc 100644
--- a/sys/modules/i2c/ds1307/Makefile
+++ b/sys/modules/i2c/ds1307/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= ds1307
 SRCS		= ds1307.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/i2c/ds13rtc/Makefile b/sys/modules/i2c/ds13rtc/Makefile
index ffeab1c12dd7..a9616765b7a5 100644
--- a/sys/modules/i2c/ds13rtc/Makefile
+++ b/sys/modules/i2c/ds13rtc/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= ds13rtc
 SRCS		= ds13rtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/i2c/ds1672/Makefile b/sys/modules/i2c/ds1672/Makefile
index 1b1fd9ab038c..c160e317c36d 100644
--- a/sys/modules/i2c/ds1672/Makefile
+++ b/sys/modules/i2c/ds1672/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:	${SRCTOP}/sys/dev/iicbus
+.PATH:	${SRCTOP}/sys/dev/iicbus/rtc
 KMOD	= ds1672
 SRCS	= ds1672.c 
 
diff --git a/sys/modules/i2c/ds3231/Makefile b/sys/modules/i2c/ds3231/Makefile
index 7548f6ef8282..4c6a7241bf76 100644
--- a/sys/modules/i2c/ds3231/Makefile
+++ b/sys/modules/i2c/ds3231/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= ds3231
 SRCS		= ds3231.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/i2c/htu21/Makefile b/sys/modules/i2c/htu21/Makefile
index a7108d62fd0b..e049139c20cf 100644
--- a/sys/modules/i2c/htu21/Makefile
+++ b/sys/modules/i2c/htu21/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:	${SRCTOP}/sys/dev/iicbus
+.PATH:	${SRCTOP}/sys/dev/iicbus/sensor
 KMOD=	htu21
 SRCS=	htu21.c
 
diff --git a/sys/modules/i2c/hym8563/Makefile b/sys/modules/i2c/hym8563/Makefile
new file mode 100644
index 000000000000..e64190887610
--- /dev/null
+++ b/sys/modules/i2c/hym8563/Makefile
@@ -0,0 +1,13 @@
+
+.PATH:	${SRCTOP}/sys/dev/iicbus/rtc
+KMOD=	hym8563
+SRCS=	hym8563.c
+
+SRCS+=	bus_if.h \
+	clock_if.h \
+	device_if.h \
+	iicbus_if.h \
+	opt_platform.h \
+	ofw_bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/isl12xx/Makefile b/sys/modules/i2c/isl12xx/Makefile
index 98411b78aae6..be0b409eeff2 100644
--- a/sys/modules/i2c/isl12xx/Makefile
+++ b/sys/modules/i2c/isl12xx/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= isl12xx
 SRCS		= isl12xx.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/i2c/max44009/Makefile b/sys/modules/i2c/max44009/Makefile
index 42c96bbbf883..c4342b5819aa 100644
--- a/sys/modules/i2c/max44009/Makefile
+++ b/sys/modules/i2c/max44009/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:	${SRCTOP}/sys/dev/iicbus
+.PATH:	${SRCTOP}/sys/dev/iicbus/sensor
 KMOD=	max44009
 SRCS=	max44009.c
 
diff --git a/sys/modules/i2c/nxprtc/Makefile b/sys/modules/i2c/nxprtc/Makefile
index 23efdcfe7754..3501909f6ea4 100644
--- a/sys/modules/i2c/nxprtc/Makefile
+++ b/sys/modules/i2c/nxprtc/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= nxprtc
 SRCS		= nxprtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/i2c/pcf8591/Makefile b/sys/modules/i2c/pcf8591/Makefile
index c944a2c8c66d..8f17f3dc3ae1 100644
--- a/sys/modules/i2c/pcf8591/Makefile
+++ b/sys/modules/i2c/pcf8591/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:	${SRCTOP}/sys/dev/iicbus
+.PATH:	${SRCTOP}/sys/dev/iicbus/adc
 KMOD=	pcf8591
 SRCS=	pcf8591.c
 
diff --git a/sys/modules/i2c/rtc8583/Makefile b/sys/modules/i2c/rtc8583/Makefile
index 23cb48afd33c..a474da20685e 100644
--- a/sys/modules/i2c/rtc8583/Makefile
+++ b/sys/modules/i2c/rtc8583/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:	${SRCTOP}/sys/dev/iicbus
+.PATH:	${SRCTOP}/sys/dev/iicbus/rtc
 KMOD	= rtc8583
 SRCS	= rtc8583.c 
 
diff --git a/sys/modules/i2c/rv3032/Makefile b/sys/modules/i2c/rv3032/Makefile
new file mode 100644
index 000000000000..7d3f8ac47aa6
--- /dev/null
+++ b/sys/modules/i2c/rv3032/Makefile
@@ -0,0 +1,13 @@
+
+.PATH:	${SRCTOP}/sys/dev/iicbus/rtc
+KMOD=	rv3032
+SRCS=	rv3032.c
+
+SRCS+=	bus_if.h \
+	clock_if.h \
+	device_if.h \
+	iicbus_if.h \
+	opt_platform.h \
+	ofw_bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/s35390a/Makefile b/sys/modules/i2c/s35390a/Makefile
index d1091db58abc..e12ddeece2ec 100644
--- a/sys/modules/i2c/s35390a/Makefile
+++ b/sys/modules/i2c/s35390a/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= s35390a
 SRCS		= s35390a.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/i2c/tmp461/Makefile b/sys/modules/i2c/tmp461/Makefile
index 4cd5be59fd18..9c4d6518d596 100644
--- a/sys/modules/i2c/tmp461/Makefile
+++ b/sys/modules/i2c/tmp461/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/sensor
 KMOD		= tmp461
 SRCS		= tmp461.c bus_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/ktest/ktest/Makefile b/sys/modules/ktest/ktest/Makefile
index f72aa5d820db..264eb7b9f443 100644
--- a/sys/modules/ktest/ktest/Makefile
+++ b/sys/modules/ktest/ktest/Makefile
@@ -8,6 +8,5 @@ SYSDIR?=${SRCTOP}/sys
 
 KMOD=	ktest
 SRCS=	ktest.c
-SRCS+=	opt_netlink.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ktest/ktest_example/Makefile b/sys/modules/ktest/ktest_example/Makefile
index 5b0c9b41f9c8..a5fe6d6d7843 100644
--- a/sys/modules/ktest/ktest_example/Makefile
+++ b/sys/modules/ktest/ktest_example/Makefile
@@ -8,6 +8,5 @@ SYSDIR?=${SRCTOP}/sys
 
 KMOD=	ktest_example
 SRCS=	ktest_example.c
-SRCS+=	opt_netlink.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ktest/ktest_netlink_message_writer/Makefile b/sys/modules/ktest/ktest_netlink_message_writer/Makefile
index cdcd1d2c190f..2f84b2fecd72 100644
--- a/sys/modules/ktest/ktest_netlink_message_writer/Makefile
+++ b/sys/modules/ktest/ktest_netlink_message_writer/Makefile
@@ -8,7 +8,6 @@ SYSDIR?=${SRCTOP}/sys
 
 KMOD=	ktest_netlink_message_writer
 SRCS=	ktest_netlink_message_writer.c
-SRCS+=	opt_netlink.h
 
 .include <bsd.kmod.mk>
 
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 51b434d91b00..d1035445ccfb 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -70,8 +70,7 @@ SRCS+=	imgact_linux.c \
 	linux_vdso_selector_x86.c \
 	linux_x86.c \
 	linux_copyout.c \
-	linux_netlink.c \
-	opt_netlink.h
+	linux_netlink.c
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386"
diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile
index 07df4555d1ee..374bc32215a2 100644
--- a/sys/modules/linux_common/Makefile
+++ b/sys/modules/linux_common/Makefile
@@ -7,8 +7,7 @@
 KMOD=	linux_common
 SRCS=	linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \
 	linux_dummy.c linux_errno.c linux_netlink.c \
-	linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h \
-	opt_netlink.h
+	linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h
 
 .if ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	linux_x86.c linux_vdso_selector_x86.c
diff --git a/sys/modules/mt76/mt7996/Makefile b/sys/modules/mt76/mt7996/Makefile
index 3a4a56d839a5..a43721b6079e 100644
--- a/sys/modules/mt76/mt7996/Makefile
+++ b/sys/modules/mt76/mt7996/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 DEVDIR=	${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7996
 
 .PATH: ${DEVDIR}
diff --git a/sys/modules/netlink/Makefile b/sys/modules/netlink/Makefile
index 667c0b2475fe..6835be6e7bd7 100644
--- a/sys/modules/netlink/Makefile
+++ b/sys/modules/netlink/Makefile
@@ -5,7 +5,7 @@ SRCS =	netlink_module.c netlink_domain.c netlink_io.c \
 	netlink_message_writer.c  netlink_generic.c \
 	netlink_route.c route/iface.c route/iface_drivers.c route/neigh.c \
 	route/nexthop.c route/rt.c
-SRCS+=	opt_inet.h opt_inet6.h opt_route.h opt_netlink.h
+SRCS+=	opt_inet.h opt_inet6.h opt_route.h
 
 CFLAGS+=	-DNETLINK_MODULE
 
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index 918cc78bad5e..6158943139cf 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -3,7 +3,7 @@
 
 KMOD=	pf
 SRCS=	pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \
-	pf_ruleset.c pf_nv.c pf_syncookies.c in4_cksum.c \
+	pf_ruleset.c pf_nl.c pf_nv.c pf_syncookies.c in4_cksum.c \
 	bus_if.h device_if.h \
 	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_sctp.h opt_global.h \
 	opt_kern_tls.h
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index b77a32e4754c..a41af071ec5d 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -1110,7 +1110,7 @@
 /* #undef ZFS_IS_GPL_COMPATIBLE */
 
 /* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_ge13538856"
+#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_g8a7407012"
 
 /* Define the project author. */
 #define ZFS_META_AUTHOR "OpenZFS"
@@ -1140,7 +1140,7 @@
 #define ZFS_META_NAME "zfs"
 
 /* Define the project release. */
-#define ZFS_META_RELEASE "FreeBSD_ge13538856"
+#define ZFS_META_RELEASE "FreeBSD_g8a7407012"
 
 /* Define the project version. */
 #define ZFS_META_VERSION "2.2.99"
diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h
index d3c3225a609c..0dfff6b0c883 100644
--- a/sys/modules/zfs/zfs_gitrev.h
+++ b/sys/modules/zfs/zfs_gitrev.h
@@ -1 +1 @@
-#define	ZFS_META_GITREV "zfs-2.2.99-118-ge13538856"
+#define	ZFS_META_GITREV "zfs-2.2.99-151-g8a7407012"
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 30183eec56ef..621dcec11ef3 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -2890,6 +2890,14 @@ bpfdetach(struct ifnet *ifp)
 	BPF_UNLOCK();
 }
 
+bool
+bpf_peers_present_if(struct ifnet *ifp)
+{
+	struct bpf_if *bp = ifp->if_bpf;
+
+	return (bpf_peers_present(bp) > 0);
+}
+
 static u_int * __capability
 bfl_list_get_ptr(void *bflp)
 {
@@ -3200,6 +3208,12 @@ bpfdetach(struct ifnet *ifp)
 {
 }
 
+bool
+bpf_peers_present_if(struct ifnet *ifp)
+{
+	return (false);
+}
+
 u_int
 bpf_filter(const struct bpf_insn *pc, u_char *p, u_int wirelen, u_int buflen)
 {
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 6631d9fab8dc..357a05069459 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -435,6 +435,7 @@ void	 bpf_mtap2_if(struct ifnet *, void *, u_int, struct mbuf *);
 void	 bpfattach(struct ifnet *, u_int, u_int);
 void	 bpfattach2(struct ifnet *, u_int, u_int, struct bpf_if **);
 void	 bpfdetach(struct ifnet *);
+bool	 bpf_peers_present_if(struct ifnet *);
 #ifdef VIMAGE
 int	 bpf_get_bp_params(struct bpf_if *, u_int *, u_int *);
 #endif
diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c
index 7003fb3708e1..7d673f678526 100644
--- a/sys/net/if_clone.c
+++ b/sys/net/if_clone.c
@@ -32,8 +32,6 @@
  *	@(#)if.c	8.5 (Berkeley) 1/9/95
  */
 
-#include "opt_netlink.h"
-
 #include <sys/param.h>
 #include <sys/eventhandler.h>
 #include <sys/malloc.h>
diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c
index f4dbf685fba6..a01bc11aa64c 100644
--- a/sys/net/if_tuntap.c
+++ b/sys/net/if_tuntap.c
@@ -548,6 +548,7 @@ tun_clone_create(struct if_clone *ifc, char *name, size_t len,
 	if (i != 0)
 		i = tun_create_device(drv, unit, NULL, &dev, name);
 	if (i == 0) {
+		dev_ref(dev);
 		tuncreate(dev);
 		struct tuntap_softc *tp = dev->si_drv1;
 		*ifpp = tp->tun_ifp;
@@ -611,8 +612,10 @@ tunclone(void *arg, struct ucred *cred, char *name, int namelen,
 
 		i = tun_create_device(drv, u, cred, dev, name);
 	}
-	if (i == 0)
+	if (i == 0) {
+		dev_ref(*dev);
 		if_clone_create(name, namelen, NULL);
+	}
 out:
 	CURVNET_RESTORE();
 }
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 5627ecfb63d4..55d451bb4462 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -46,7 +46,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_kern_tls.h"
-#include "opt_netlink.h"
 #include "opt_vlan.h"
 #include "opt_ratelimit.h"
 
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index b136b3c19323..c85c23588cfe 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1953,7 +1953,9 @@ struct pfioc_iface {
 #define DIOCCLRSTATUS	_IO  ('D', 22)
 #define DIOCNATLOOK	_IOWR('D', 23, struct pfioc_natlook)
 #define DIOCSETDEBUG	_IOWR('D', 24, u_int32_t)
+#ifdef COMPAT_FREEBSD14
 #define DIOCGETSTATES	_IOWR('D', 25, struct pfioc_states)
+#endif
 #define DIOCCHANGERULE	_IOWR('D', 26, struct pfioc_rule)
 /* XXX cut 26 - 28 */
 #define DIOCSETTIMEOUT	_IOWR('D', 29, struct pfioc_tm)
@@ -2014,7 +2016,9 @@ struct pfioc_iface {
 #define	DIOCKILLSRCNODES	_IOWR('D', 91, struct pfioc_src_node_kill)
 #define	DIOCGIFSPEEDV0	_IOWR('D', 92, struct pf_ifspeed_v0)
 #define	DIOCGIFSPEEDV1	_IOWR('D', 92, struct pf_ifspeed_v1)
+#ifdef COMPAT_FREEBSD14
 #define DIOCGETSTATESV2	_IOWR('D', 93, struct pfioc_states_v2)
+#endif
 #define	DIOCGETSYNCOOKIES	_IOWR('D', 94, struct pfioc_nv)
 #define	DIOCSETSYNCOOKIES	_IOWR('D', 95, struct pfioc_nv)
 #define	DIOCKEEPCOUNTERS	_IOWR('D', 96, struct pfioc_nv)
@@ -2164,6 +2168,8 @@ VNET_DECLARE(struct pf_krule *, pf_rulemarker);
 #define V_pf_rulemarker     VNET(pf_rulemarker)
 #endif
 
+int				 pf_start(void);
+int				 pf_stop(void);
 void				 pf_initialize(void);
 void				 pf_mtag_initialize(void);
 void				 pf_mtag_cleanup(void);
diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c
index 87063a4627ed..6d2db19496c6 100644
--- a/sys/net80211/ieee80211_ddb.c
+++ b/sys/net80211/ieee80211_ddb.c
@@ -48,6 +48,7 @@
 #include <net/vnet.h>
 
 #include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_ratectl.h>
 #ifdef IEEE80211_SUPPORT_TDMA
 #include <net80211/ieee80211_tdma.h>
 #endif
@@ -329,6 +330,31 @@ _db_show_sta(const struct ieee80211_node *ni)
 	    ni->ni_vht_pad1, ni->ni_vht_spare[0], ni->ni_vht_spare[1],
 	    ni->ni_vht_spare[2], ni->ni_vht_spare[3], ni->ni_vht_spare[4],
 	    ni->ni_vht_spare[5], ni->ni_vht_spare[6], ni->ni_vht_spare[7]);
+
+	db_printf("\tni_tx_superg[] = {");
+	for (i = 0; i < WME_NUM_TID; i++)
+		db_printf(" %p%s", ni->ni_tx_superg[i], (i == 0) ? "" : ",");
+	db_printf(" }\n");
+
+	db_printf("\tni_rctls = %p", ni->ni_rctls);
+	db_printf("\tni_drv_data = %p", ni->ni_drv_data);
+	db_printf("\n");
+
+	db_printf("\tni_spare[3] = { %#jx %#jx %#jx }",
+	    ni->ni_spare[0], ni->ni_spare[1], ni->ni_spare[2]);
+	db_printf("\n");
+
+#ifdef __notyet__
+	struct ieee80211_psq	ni_psq;		/* power save queue */
+	struct ieee80211_nodestats ni_stats;	/* per-node statistics */
+
+	/* quiet time IE state for the given node */
+	uint32_t		ni_quiet_ie_set;	/* Quiet time IE was seen */
+	struct			ieee80211_quiet_ie ni_quiet_ie;	/* last seen quiet IE */
+
+	/* U-APSD */
+	uint8_t			ni_uapsd;	/* U-APSD per-node flags matching WMM STA QoS Info field */
+#endif
 }
 
 #ifdef IEEE80211_SUPPORT_TDMA
@@ -405,6 +431,31 @@ _db_show_scan(const struct ieee80211_scan_state *ss, int showprocs)
 	db_printf("\n");
 }
 
+static void
+_db_show_rate(const struct ieee80211_ratectl *rate, const void *rs,
+    const int showprocs)
+{
+
+	db_printf("\tiv_rate %p", rate);
+	db_printf(" iv_rs %p", rs);
+	db_printf("\n");
+	if (showprocs) {
+		db_printf("\t  ir_name %s", rate->ir_name);
+		db_printf("\n");
+		DB_PRINTSYM("\t  ", "ir_attach", rate->ir_attach);
+		DB_PRINTSYM("\t  ", "ir_detach", rate->ir_detach);
+		DB_PRINTSYM("\t  ", "ir_init", rate->ir_init);
+		DB_PRINTSYM("\t  ", "ir_deinit", rate->ir_deinit);
+		DB_PRINTSYM("\t  ", "ir_node_init", rate->ir_node_init);
+		DB_PRINTSYM("\t  ", "ir_node_deinit", rate->ir_node_deinit);
+		DB_PRINTSYM("\t  ", "ir_rate", rate->ir_rate);
+		DB_PRINTSYM("\t  ", "ir_tx_complete", rate->ir_tx_complete);
+		DB_PRINTSYM("\t  ", "ir_tx_update", rate->ir_tx_update);
+		DB_PRINTSYM("\t  ", "ir_setinterval", rate->ir_setinterval);
+		DB_PRINTSYM("\t  ", "ir_node_stats", rate->ir_node_stats);
+	}
+}
+
 static void
 _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs)
 {
@@ -571,6 +622,8 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs)
 	db_printf(" lastnonerp %d", vap->iv_lastnonerp);
 	db_printf(" lastnonht %d", vap->iv_lastnonht);
 	db_printf("\n");
+	if (vap->iv_rate != NULL)
+		_db_show_rate(vap->iv_rate, vap->iv_rs, showprocs);
 
 	if (showprocs) {
 		DB_PRINTSYM("\t", "iv_key_alloc", vap->iv_key_alloc);
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 39b411059cf1..e451b03d8dac 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -82,6 +82,9 @@ CTASSERT((IEEE80211_NODE_HASHSIZE & (IEEE80211_NODE_HASHSIZE-1)) == 0);
 
 static int ieee80211_sta_join1(struct ieee80211_node *);
 
+static struct ieee80211_node *ieee80211_alloc_node(
+	struct ieee80211_node_table *, struct ieee80211vap *,
+	const uint8_t macaddr[IEEE80211_ADDR_LEN], const char *, int);
 static struct ieee80211_node *node_alloc(struct ieee80211vap *,
 	const uint8_t [IEEE80211_ADDR_LEN]);
 static int node_init(struct ieee80211_node *);
@@ -345,7 +348,8 @@ ieee80211_create_ibss(struct ieee80211vap* vap, struct ieee80211_channel *chan)
 		ieee80211_channel_type_char(chan),
 		chan->ic_flags);
 
-	ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr);
+	ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr,
+	    __func__, __LINE__);
 	if (ni == NULL) {
 		/* XXX recovery? */
 		return;
@@ -455,7 +459,8 @@ ieee80211_reset_bss(struct ieee80211vap *vap)
 	/* XXX multi-bss: wrong */
 	ieee80211_vap_reset_erp(vap);
 
-	ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr);
+	ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr,
+	    __func__, __LINE__);
 	KASSERT(ni != NULL, ("unable to setup initial BSS node"));
 	obss = vap->iv_update_bss(vap, ieee80211_ref_node(ni));
 	if (obss != NULL) {
@@ -918,7 +923,8 @@ ieee80211_sta_join(struct ieee80211vap *vap, struct ieee80211_channel *chan,
 	struct ieee80211_node *ni;
 	int do_ht = 0;
 
-	ni = ieee80211_alloc_node(&ic->ic_sta, vap, se->se_macaddr);
+	ni = ieee80211_alloc_node(&ic->ic_sta, vap, se->se_macaddr,
+	    __func__, __LINE__);
 	if (ni == NULL) {
 		/* XXX msg */
 		return 0;
@@ -1396,9 +1402,10 @@ ieee80211_del_node_nt(struct ieee80211_node_table *nt,
 	ni->ni_table = NULL;
 }
 
-struct ieee80211_node *
+static struct ieee80211_node *
 ieee80211_alloc_node(struct ieee80211_node_table *nt,
-	struct ieee80211vap *vap, const uint8_t macaddr[IEEE80211_ADDR_LEN])
+	struct ieee80211vap *vap, const uint8_t macaddr[IEEE80211_ADDR_LEN],
+	const char *func __debrefcnt_used, int line __debrefcnt_used)
 {
 	struct ieee80211com *ic = nt->nt_ic;
 	struct ieee80211_node *ni;
@@ -1415,6 +1422,11 @@ ieee80211_alloc_node(struct ieee80211_node_table *nt,
 
 	IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr);
 	ieee80211_node_initref(ni);		/* mark referenced */
+#ifdef IEEE80211_DEBUG_REFCNT
+	IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
+	    "%s (%s:%u) %p<%s> refcnt %d\n", __func__, func, line, ni,
+	    ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni));
+#endif
 	ni->ni_chan = IEEE80211_CHAN_ANYC;
 	ni->ni_authmode = IEEE80211_AUTH_OPEN;
 	ni->ni_txpower = ic->ic_txpowlimit;	/* max power */
@@ -1477,6 +1489,12 @@ ieee80211_tmp_node(struct ieee80211vap *vap,
 		IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr);
 		IEEE80211_ADDR_COPY(ni->ni_bssid, bss->ni_bssid);
 		ieee80211_node_initref(ni);		/* mark referenced */
+#ifdef IEEE80211_DEBUG_REFCNT
+		/* Only one caller so we skip func/line passing into the func. */
+		IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
+		    "%s (%s:%u) %p<%s> refcnt %d\n", __func__, "", -1, ni,
+		    ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni));
+#endif
 		/* NB: required by ieee80211_fix_rate */
 		ieee80211_node_set_chan(ni, bss->ni_chan);
 		ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey,
@@ -1510,7 +1528,7 @@ ieee80211_dup_bss(struct ieee80211vap *vap,
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_node *ni;
 
-	ni = ieee80211_alloc_node(&ic->ic_sta, vap, macaddr);
+	ni = ieee80211_alloc_node(&ic->ic_sta, vap, macaddr, __func__, __LINE__);
 	if (ni != NULL) {
 		struct ieee80211_node *bss = vap->iv_bss;
 		/*
@@ -1538,7 +1556,7 @@ ieee80211_node_create_wds(struct ieee80211vap *vap,
 	struct ieee80211_node *ni;
 
 	/* XXX check if node already in sta table? */
-	ni = ieee80211_alloc_node(&ic->ic_sta, vap, bssid);
+	ni = ieee80211_alloc_node(&ic->ic_sta, vap, bssid, __func__, __LINE__);
 	if (ni != NULL) {
 		ni->ni_wdsvap = vap;
 		IEEE80211_ADDR_COPY(ni->ni_bssid, bssid);
@@ -2053,6 +2071,20 @@ _ieee80211_find_txnode(struct ieee80211vap *vap,
 	return ni;
 }
 
+struct ieee80211_node *
+_ieee80211_ref_node(struct ieee80211_node *ni,
+    const char *func __debrefcnt_used, int line __debrefcnt_used)
+{
+
+#ifdef IEEE80211_DEBUG_REFCNT
+	IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE,
+	    "%s (%s:%u) %p<%s> refcnt %d\n", __func__, func, line, ni,
+	    ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)+1);
+#endif
+	ieee80211_node_incref(ni);
+	return (ni);
+}
+
 static void
 __ieee80211_free_node(struct ieee80211_node *ni)
 {
diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h
index 7c9ff70bcb71..954e8e03563f 100644
--- a/sys/net80211/ieee80211_node.h
+++ b/sys/net80211/ieee80211_node.h
@@ -319,20 +319,6 @@ MALLOC_DECLARE(M_80211_NODE_IE);
 #define	IEEE80211_RSSI_GET(x) \
 	IEEE80211_RSSI_EP_RND(x, IEEE80211_RSSI_EP_MULTIPLIER)
 
-static __inline struct ieee80211_node *
-ieee80211_ref_node(struct ieee80211_node *ni)
-{
-	ieee80211_node_incref(ni);
-	return ni;
-}
-
-static __inline void
-ieee80211_unref_node(struct ieee80211_node **ni)
-{
-	ieee80211_node_decref(*ni);
-	*ni = NULL;			/* guard against use */
-}
-
 void	ieee80211_node_attach(struct ieee80211com *);
 void	ieee80211_node_lateattach(struct ieee80211com *);
 void	ieee80211_node_detach(struct ieee80211com *);
@@ -395,9 +381,6 @@ struct ieee80211_node_table {
 	int			nt_inact_init;	/* initial node inact setting */
 };
 
-struct ieee80211_node *ieee80211_alloc_node(struct ieee80211_node_table *,
-		struct ieee80211vap *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 struct ieee80211_node *ieee80211_tmp_node(struct ieee80211vap *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 struct ieee80211_node *ieee80211_dup_bss(struct ieee80211vap *,
@@ -407,6 +390,8 @@ struct ieee80211_node *ieee80211_node_create_wds(struct ieee80211vap *,
 		struct ieee80211_channel *);
 
 /* These functions are taking __func__, __LINE__ for IEEE80211_DEBUG_REFCNT */
+struct ieee80211_node *_ieee80211_ref_node(struct ieee80211_node *,
+		const char *func, int line);
 void	_ieee80211_free_node(struct ieee80211_node *,
 		const char *func, int line);
 struct ieee80211_node *_ieee80211_find_node_locked(
@@ -436,6 +421,8 @@ struct ieee80211_node *_ieee80211_find_rxnode_withkey(
 struct ieee80211_node *_ieee80211_find_txnode(struct ieee80211vap *,
 		const uint8_t macaddr[IEEE80211_ADDR_LEN],
 		const char *func, int line);
+#define	ieee80211_ref_node(ni) \
+	_ieee80211_ref_node(ni, __func__, __LINE__)
 #define	ieee80211_free_node(ni) \
 	_ieee80211_free_node(ni, __func__, __LINE__)
 #define	ieee80211_find_node_locked(nt, mac) \
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 100c074e1623..2e0f2201e207 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1104,7 +1104,7 @@ ieee80211_send_nulldata(struct ieee80211_node *ni)
 	if (vap->iv_state == IEEE80211_S_CAC) {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_OUTPUT | IEEE80211_MSG_DOTH,
 		    ni, "block %s frame in CAC state", "null data");
-		ieee80211_unref_node(&ni);
+		ieee80211_node_decref(ni);
 		vap->iv_stats.is_tx_badstate++;
 		return EIO;		/* XXX */
 	}
@@ -1122,7 +1122,7 @@ ieee80211_send_nulldata(struct ieee80211_node *ni)
 	m = ieee80211_getmgtframe(&frm, ic->ic_headroom + hdrlen, 0);
 	if (m == NULL) {
 		/* XXX debug msg */
-		ieee80211_unref_node(&ni);
+		ieee80211_node_decref(ni);
 		vap->iv_stats.is_tx_nobuf++;
 		return ENOMEM;
 	}
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 704482d9db73..9c4c3f14f78c 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -28,8 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <sys/cdefs.h>
 #include "opt_bpf.h"
 #include "opt_inet.h"
diff --git a/sys/netinet/netdump/netdump_client.c b/sys/netinet/netdump/netdump_client.c
index 5cce1955bbb5..05ed724c7cbe 100644
--- a/sys/netinet/netdump/netdump_client.c
+++ b/sys/netinet/netdump/netdump_client.c
@@ -451,6 +451,8 @@ netdump_configure(struct diocskerneldump_arg *conf, struct thread *td)
 		CURVNET_SET(vnet0);
 		ifp = ifunit_ref(conf->kda_iface);
 		CURVNET_RESTORE();
+		if (ifp == NULL)
+			return (ENODEV);
 		if (!DEBUGNET_SUPPORTED_NIC(ifp)) {
 			if_rele(ifp);
 			return (ENODEV);
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 16cde18c4c1d..a1742b2fffca 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -5676,6 +5676,11 @@ sctp_startup_mcore_threads(void)
 }
 #endif
 
+#define VALIDATE_LOADER_TUNABLE(var_name, prefix)		\
+	if (SCTP_BASE_SYSCTL(var_name) < prefix##_MIN ||	\
+	    SCTP_BASE_SYSCTL(var_name) > prefix##_MAX)		\
+		SCTP_BASE_SYSCTL(var_name) = prefix##_DEFAULT
+
 void
 sctp_pcb_init(void)
 {
@@ -5717,6 +5722,9 @@ sctp_pcb_init(void)
 	TUNABLE_INT_FETCH("net.inet.sctp.tcbhashsize", &SCTP_BASE_SYSCTL(sctp_hashtblsize));
 	TUNABLE_INT_FETCH("net.inet.sctp.pcbhashsize", &SCTP_BASE_SYSCTL(sctp_pcbtblsize));
 	TUNABLE_INT_FETCH("net.inet.sctp.chunkscale", &SCTP_BASE_SYSCTL(sctp_chunkscale));
+	VALIDATE_LOADER_TUNABLE(sctp_hashtblsize, SCTPCTL_TCBHASHSIZE);
+	VALIDATE_LOADER_TUNABLE(sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE);
+	VALIDATE_LOADER_TUNABLE(sctp_chunkscale, SCTPCTL_CHUNKSCALE);
 	SCTP_BASE_INFO(sctp_asochash) = SCTP_HASH_INIT((SCTP_BASE_SYSCTL(sctp_hashtblsize) * 31),
 	    &SCTP_BASE_INFO(hashasocmark));
 	SCTP_BASE_INFO(sctp_ephash) = SCTP_HASH_INIT(SCTP_BASE_SYSCTL(sctp_hashtblsize),
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c
index 851ed408092b..2c2cc58ee086 100644
--- a/sys/netinet/sctp_sysctl.c
+++ b/sys/netinet/sctp_sysctl.c
@@ -867,6 +867,14 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS)
 #endif
 
 #define SCTP_UINT_SYSCTL(mib_name, var_name, prefix)			\
+	SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix,		\
+	    CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW);
+
+#define SCTP_UINT_SYSCTL_TUN(mib_name, var_name, prefix)		\
+	SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix,		\
+	    CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RWTUN|CTLFLAG_NOFETCH);
+
+#define SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, flags)	\
 	static int							\
 	sctp_sysctl_handle_##mib_name(SYSCTL_HANDLER_ARGS)		\
 	{								\
@@ -885,9 +893,13 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS)
 		}							\
 		return (error);						\
 	}								\
-	SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name,			\
-	                 CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW, NULL, 0,	\
-	                 sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC);
+	SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name, flags,		\
+	    NULL, 0, sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC)
+
+#define SCTP_UINT_SYSCTL_RDTUN(mib_name, var_name, prefix)		\
+	SYSCTL_UINT(_net_inet_sctp, OID_AUTO, mib_name,			\
+	    CTLFLAG_VNET|CTLFLAG_RDTUN|CTLFLAG_NOFETCH,			\
+	    &VNET_NAME(system_base_info.sctpsysctl.var_name), 0, prefix##_DESC);
 
 /*
  * sysctl definitions
@@ -909,10 +921,10 @@ SCTP_UINT_SYSCTL(peer_chkoh, sctp_peer_chunk_oh, SCTPCTL_PEER_CHKOH)
 SCTP_UINT_SYSCTL(maxburst, sctp_max_burst_default, SCTPCTL_MAXBURST)
 SCTP_UINT_SYSCTL(fr_maxburst, sctp_fr_max_burst_default, SCTPCTL_FRMAXBURST)
 SCTP_UINT_SYSCTL(maxchunks, sctp_max_chunks_on_queue, SCTPCTL_MAXCHUNKS)
-SCTP_UINT_SYSCTL(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE)
-SCTP_UINT_SYSCTL(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE)
+SCTP_UINT_SYSCTL_RDTUN(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE)
+SCTP_UINT_SYSCTL_TUN(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE)
 SCTP_UINT_SYSCTL(min_split_point, sctp_min_split_point, SCTPCTL_MIN_SPLIT_POINT)
-SCTP_UINT_SYSCTL(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE)
+SCTP_UINT_SYSCTL_RDTUN(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE)
 SCTP_UINT_SYSCTL(delayed_sack_time, sctp_delayed_sack_time_default, SCTPCTL_DELAYED_SACK_TIME)
 SCTP_UINT_SYSCTL(sack_freq, sctp_sack_freq_default, SCTPCTL_SACK_FREQ)
 SCTP_UINT_SYSCTL(sys_resource, sctp_system_free_resc_limit, SCTPCTL_SYS_RESOURCE)
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index e153f1267ff4..a9035a8c46af 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -4048,7 +4048,8 @@ tcp_compute_pipe(struct tcpcb *tp)
 	if (tp->t_fb->tfb_compute_pipe == NULL) {
 		return (tp->snd_max - tp->snd_una +
 			tp->sackhint.sack_bytes_rexmit -
-			tp->sackhint.sacked_bytes);
+			tp->sackhint.sacked_bytes -
+			tp->sackhint.lost_bytes);
 	} else {
 		return((*tp->t_fb->tfb_compute_pipe)(tp));
 	}
diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
index fca4b99ee83b..8647630bb6bc 100644
--- a/sys/netinet/tcp_sack.c
+++ b/sys/netinet/tcp_sack.c
@@ -555,6 +555,11 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 	int i, j, num_sack_blks, sack_changed;
 	int delivered_data, left_edge_delta;
 
+	tcp_seq loss_hiack = 0;
+	int loss_thresh = 0;
+	int loss_sblks = 0;
+	int notlost_bytes = 0;
+
 	INP_WLOCK_ASSERT(tptoinpcb(tp));
 
 	num_sack_blks = 0;
@@ -637,6 +642,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 		 */
 		tp->snd_fack = SEQ_MAX(tp->snd_una, th_ack);
 		tp->sackhint.sacked_bytes = 0;	/* reset */
+		tp->sackhint.hole_bytes = 0;
 	}
 	/*
 	 * In the while-loop below, incoming SACK blocks (sack_blocks[]) and
@@ -661,13 +667,17 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 		 */
 		if (((temp = TAILQ_LAST(&tp->snd_holes, sackhole_head)) != NULL) &&
 		    SEQ_LEQ(tp->snd_fack,temp->end)) {
+			tp->sackhint.hole_bytes -= temp->end - temp->start;
 			temp->start = SEQ_MAX(tp->snd_fack, SEQ_MAX(tp->snd_una, th_ack));
 			temp->end = sblkp->start;
 			temp->rxmit = temp->start;
 			delivered_data += sblkp->end - sblkp->start;
+			tp->sackhint.hole_bytes += temp->end - temp->start;
+			KASSERT(tp->sackhint.hole_bytes >= 0,
+			    ("sackhint hole bytes >= 0"));
 			tp->snd_fack = sblkp->end;
-			sblkp--;
 			sack_changed = 1;
+			sblkp--;
 		} else {
 			/*
 			 * Append a new SACK hole at the tail.  If the
@@ -678,10 +688,11 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 			temp = tcp_sackhole_insert(tp, tp->snd_fack,sblkp->start,NULL);
 			if (temp != NULL) {
 				delivered_data += sblkp->end - sblkp->start;
+				tp->sackhint.hole_bytes += temp->end - temp->start;
 				tp->snd_fack = sblkp->end;
+				sack_changed = 1;
 				/* Go to the previous sack block. */
 				sblkp--;
-				sack_changed = 1;
 			} else {
 				/*
 				 * We failed to add a new hole based on the current
@@ -709,11 +720,29 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 		sack_changed = 1;
 	}
 	cur = TAILQ_LAST(&tp->snd_holes, sackhole_head); /* Last SACK hole. */
+	loss_hiack = tp->snd_fack;
+
 	/*
 	 * Since the incoming sack blocks are sorted, we can process them
 	 * making one sweep of the scoreboard.
 	 */
-	while (sblkp >= sack_blocks  && cur != NULL) {
+	while (cur != NULL) {
+		if (!(sblkp >= sack_blocks)) {
+			if (((loss_sblks >= tcprexmtthresh) ||
+			    (loss_thresh > (tcprexmtthresh-1)*tp->t_maxseg))) 
+				break;
+			loss_thresh += loss_hiack - cur->end;
+			loss_hiack = cur->start;
+			loss_sblks++;
+			if (!((loss_sblks >= tcprexmtthresh) ||
+			    (loss_thresh > (tcprexmtthresh-1)*tp->t_maxseg))) {
+				notlost_bytes += cur->end - cur->start;
+			} else {
+				break;
+			}
+			cur = TAILQ_PREV(cur, sackhole_head, scblink);
+			continue;
+		}
 		if (SEQ_GEQ(sblkp->start, cur->end)) {
 			/*
 			 * SACKs data beyond the current hole.  Go to the
@@ -727,6 +756,12 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 			 * SACKs data before the current hole.  Go to the
 			 * previous hole.
 			 */
+			loss_thresh += loss_hiack - cur->end;
+			loss_hiack = cur->start;
+			loss_sblks++;
+			if (!((loss_sblks >= tcprexmtthresh) ||
+			    (loss_thresh > (tcprexmtthresh-1)*tp->t_maxseg)))
+				notlost_bytes += cur->end - cur->start;
 			cur = TAILQ_PREV(cur, sackhole_head, scblink);
 			continue;
 		}
@@ -742,6 +777,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 				delivered_data += (cur->end - cur->start);
 				temp = cur;
 				cur = TAILQ_PREV(cur, sackhole_head, scblink);
+				tp->sackhint.hole_bytes -= temp->end - temp->start;
 				tcp_sackhole_remove(tp, temp);
 				/*
 				 * The sack block may ack all or part of the
@@ -752,6 +788,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 			} else {
 				/* Move start of hole forward. */
 				delivered_data += (sblkp->end - cur->start);
+				tp->sackhint.hole_bytes -= sblkp->end - cur->start;
 				cur->start = sblkp->end;
 				cur->rxmit = SEQ_MAX(cur->rxmit, cur->start);
 			}
@@ -760,6 +797,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 			if (SEQ_GEQ(sblkp->end, cur->end)) {
 				/* Move end of hole backward. */
 				delivered_data += (cur->end - sblkp->start);
+				tp->sackhint.hole_bytes -= cur->end - sblkp->start;
 				cur->end = sblkp->start;
 				cur->rxmit = SEQ_MIN(cur->rxmit, cur->end);
 				if ((tp->t_flags & TF_LRD) && SEQ_GEQ(cur->rxmit, cur->end))
@@ -778,6 +816,13 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 						    (SEQ_MIN(temp->rxmit,
 						    temp->end) - temp->start);
 					}
+					tp->sackhint.hole_bytes -= sblkp->end - sblkp->start;
+					loss_thresh += loss_hiack - temp->end;
+					loss_hiack = temp->start;
+					loss_sblks++;
+					if (!((loss_sblks >= tcprexmtthresh) ||
+					    (loss_thresh > (tcprexmtthresh-1)*tp->t_maxseg)))
+						notlost_bytes += temp->end - temp->start;
 					cur->end = sblkp->start;
 					cur->rxmit = SEQ_MIN(cur->rxmit,
 					    cur->end);
@@ -794,11 +839,25 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 		 * we're done with the sack block or the sack hole.
 		 * Accordingly, we advance one or the other.
 		 */
-		if (SEQ_LEQ(sblkp->start, cur->start))
+		if (SEQ_LEQ(sblkp->start, cur->start)) {
+			loss_thresh += loss_hiack - cur->end;
+			loss_hiack = cur->start;
+			loss_sblks++;
+			if (!((loss_sblks >= tcprexmtthresh) ||
+			    (loss_thresh > (tcprexmtthresh-1)*tp->t_maxseg)))
+				notlost_bytes += cur->end - cur->start;
 			cur = TAILQ_PREV(cur, sackhole_head, scblink);
-		else
+		} else {
 			sblkp--;
+		}
 	}
+
+	KASSERT(!(TAILQ_EMPTY(&tp->snd_holes) && (tp->sackhint.hole_bytes != 0)),
+	    ("SACK scoreboard empty, but accounting non-zero\n"));
+
+	KASSERT(notlost_bytes <= tp->sackhint.hole_bytes,
+	    ("SACK: more bytes marked notlost than in scoreboard holes"));
+
 	if (!(to->to_flags & TOF_SACK))
 		/*
 		 * If this ACK did not contain any
@@ -811,6 +870,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack)
 		sack_changed = 0;
 	tp->sackhint.delivered_data = delivered_data;
 	tp->sackhint.sacked_bytes += delivered_data - left_edge_delta;
+	tp->sackhint.lost_bytes = tp->sackhint.hole_bytes - notlost_bytes;
 	KASSERT((delivered_data >= 0), ("delivered_data < 0"));
 	KASSERT((tp->sackhint.sacked_bytes >= 0), ("sacked_bytes < 0"));
 	return (sack_changed);
@@ -828,6 +888,10 @@ tcp_free_sackholes(struct tcpcb *tp)
 	while ((q = TAILQ_FIRST(&tp->snd_holes)) != NULL)
 		tcp_sackhole_remove(tp, q);
 	tp->sackhint.sack_bytes_rexmit = 0;
+	tp->sackhint.sacked_bytes = 0;
+	tp->sackhint.delivered_data = 0;
+	tp->sackhint.lost_bytes = 0;
+	tp->sackhint.hole_bytes = 0;
 
 	KASSERT(tp->snd_numholes == 0, ("tp->snd_numholes == 0"));
 	KASSERT(tp->sackhint.nexthole == NULL,
@@ -845,6 +909,7 @@ tcp_free_sackholes(struct tcpcb *tp)
 void
 tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th)
 {
+	struct sackhole *temp;
 	int num_segs = 1;
 	u_int maxseg = tcp_maxseg(tp);
 
@@ -891,8 +956,10 @@ tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th)
 		highdata = SEQ_MIN(highdata, tp->snd_recover);
 		if (th->th_ack != highdata) {
 			tp->snd_fack = th->th_ack;
-			(void)tcp_sackhole_insert(tp, SEQ_MAX(th->th_ack,
-			    highdata - maxseg), highdata, NULL);
+			if ((temp = tcp_sackhole_insert(tp, SEQ_MAX(th->th_ack,
+			    highdata - maxseg), highdata, NULL)) != NULL)
+				tp->sackhint.hole_bytes += temp->end -
+								temp->start;
 		}
 	}
 	(void) tcp_output(tp);
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
index a6e649f78c10..5c16cb9ed23b 100644
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -12342,8 +12342,8 @@ rack_process_ack(struct mbuf *m, struct tcphdr *th, struct socket *so,
 	if (SEQ_GT(tp->snd_una, tp->snd_recover))
 		tp->snd_recover = tp->snd_una;
 
-	if (SEQ_LT(tp->snd_nxt, tp->snd_una)) {
-		tp->snd_nxt = tp->snd_una;
+	if (SEQ_LT(tp->snd_nxt, tp->snd_max)) {
+		tp->snd_nxt = tp->snd_max;
 	}
 	if (under_pacing &&
 	    (rack->use_fixed_rate == 0) &&
@@ -16363,8 +16363,8 @@ rack_do_compressed_ack_processing(struct tcpcb *tp, struct socket *so, struct mb
 		/* Send recover and snd_nxt must be dragged along */
 		if (SEQ_GT(tp->snd_una, tp->snd_recover))
 			tp->snd_recover = tp->snd_una;
-		if (SEQ_LT(tp->snd_nxt, tp->snd_una))
-			tp->snd_nxt = tp->snd_una;
+		if (SEQ_LT(tp->snd_nxt, tp->snd_max))
+			tp->snd_nxt = tp->snd_max;
 		/*
 		 * If the RXT timer is running we want to
 		 * stop it, so we can restart a TLP (or new RXT).
@@ -19112,6 +19112,8 @@ rack_fast_rsm_output(struct tcpcb *tp, struct tcp_rack *rack, struct rack_sendma
 		lgb->tlb_errno = error;
 		lgb = NULL;
 	}
+	/* Move snd_nxt to snd_max so we don't have false retransmissions */
+	tp->snd_nxt = tp->snd_max;
 	if (error) {
 		goto failed;
 	} else if (rack->rc_hw_nobuf && (ip_sendflag != IP_NO_SND_TAG_RL)) {
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 61ed7ce1cd7a..e0255ef35adb 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -305,8 +305,17 @@ static int	tcp_log_debug = 0;
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_debug, CTLFLAG_RW,
     &tcp_log_debug, 0, "Log errors caused by incoming TCP segments");
 
-static int	tcp_tcbhashsize;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+/*
+ * Target size of TCP PCB hash tables. Must be a power of two.
+ *
+ * Note that this can be overridden by the kernel environment
+ * variable net.inet.tcp.tcbhashsize
+ */
+#ifndef TCBHASHSIZE
+#define TCBHASHSIZE	0
+#endif
+static int	tcp_tcbhashsize = TCBHASHSIZE;
+SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN,
     &tcp_tcbhashsize, 0, "Size of TCP control-block hashtable");
 
 static int	do_tcpdrain = 1;
@@ -1152,16 +1161,6 @@ tcp_default_fb_fini(struct tcpcb *tp, int tcb_is_purged)
 	return;
 }
 
-/*
- * Target size of TCP PCB hash tables. Must be a power of two.
- *
- * Note that this can be overridden by the kernel environment
- * variable net.inet.tcp.tcbhashsize
- */
-#ifndef TCBHASHSIZE
-#define TCBHASHSIZE	0
-#endif
-
 MALLOC_DEFINE(M_TCPLOG, "tcplog", "TCP address and flags print buffers");
 MALLOC_DEFINE(M_TCPFUNCTIONS, "tcpfunc", "TCP function set memory");
 
@@ -1508,7 +1507,6 @@ VNET_SYSINIT(tcp_vnet_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH,
 static void
 tcp_init(void *arg __unused)
 {
-	const char *tcbhash_tuneable;
 	int hashsize;
 
 	tcp_reass_global_init();
@@ -1576,9 +1574,7 @@ tcp_init(void *arg __unused)
 	tcp_pcap_init();
 #endif
 
-	hashsize = TCBHASHSIZE;
-	tcbhash_tuneable = "net.inet.tcp.tcbhashsize";
-	TUNABLE_INT_FETCH(tcbhash_tuneable, &hashsize);
+	hashsize = tcp_tcbhashsize;
 	if (hashsize == 0) {
 		/*
 		 * Auto tune the hash size based on maxsockets.
@@ -1595,7 +1591,7 @@ tcp_init(void *arg __unused)
 			hashsize = 512;
 		if (bootverbose)
 			printf("%s: %s auto tuned to %d\n", __func__,
-			    tcbhash_tuneable, hashsize);
+			    "net.inet.tcp.tcbhashsize", hashsize);
 	}
 	/*
 	 * We require a hashsize to be a power of two.
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 087492c37f88..97c0394c30d8 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -128,6 +128,8 @@ struct sackhint {
 	uint32_t	recover_fs;	/* Flight Size at the start of Loss recovery */
 	uint32_t	prr_delivered;	/* Total bytes delivered using PRR */
 	uint32_t	prr_out;	/* Bytes sent during IN_RECOVERY */
+	uint32_t	hole_bytes;	/* current number of bytes in scoreboard holes */
+	uint32_t	lost_bytes;	/* number of rfc6675 IsLost() bytes */
 };
 
 #define SEGQ_EMPTY(tp) TAILQ_EMPTY(&(tp)->t_segq)
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 346868f26a52..c4aef2efb437 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1053,7 +1053,7 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
 	int cscov_partial = 0;
 	int ipflags = 0;
 	u_short fport, lport;
-	u_char tos;
+	u_char tos, vflagsav;
 	uint8_t pr;
 	uint16_t cscov = 0;
 	uint32_t flowid = 0;
@@ -1095,7 +1095,8 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
 	 * pcb hash.
 	 */
 	if (sin == NULL ||
-	    (inp->inp_laddr.s_addr == INADDR_ANY && inp->inp_lport == 0))
+	    (inp->inp_laddr.s_addr == INADDR_ANY && inp->inp_lport == 0) ||
+	    (flags & PRUS_IPV6) != 0)
 		INP_WLOCK(inp);
 	else
 		INP_RLOCK(inp);
@@ -1206,10 +1207,17 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
 			error = EINVAL;
 			goto release;
 		}
+		if ((flags & PRUS_IPV6) != 0) {
+			vflagsav = inp->inp_vflag;
+			inp->inp_vflag |= INP_IPV4;
+			inp->inp_vflag &= ~INP_IPV6;
+		}
 		INP_HASH_WLOCK(pcbinfo);
 		error = in_pcbbind_setup(inp, &src, &laddr.s_addr, &lport,
 		    td->td_ucred);
 		INP_HASH_WUNLOCK(pcbinfo);
+		if ((flags & PRUS_IPV6) != 0)
+			inp->inp_vflag = vflagsav;
 		if (error)
 			goto release;
 	}
@@ -1252,9 +1260,16 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
 		    inp->inp_lport == 0 ||
 		    sin->sin_addr.s_addr == INADDR_ANY ||
 		    sin->sin_addr.s_addr == INADDR_BROADCAST) {
+			if ((flags & PRUS_IPV6) != 0) {
+				vflagsav = inp->inp_vflag;
+				inp->inp_vflag |= INP_IPV4;
+				inp->inp_vflag &= ~INP_IPV6;
+			}
 			INP_HASH_WLOCK(pcbinfo);
 			error = in_pcbconnect_setup(inp, sin, &laddr.s_addr,
 			    &lport, &faddr.s_addr, &fport, td->td_ucred);
+			if ((flags & PRUS_IPV6) != 0)
+				inp->inp_vflag = vflagsav;
 			if (error) {
 				INP_HASH_WUNLOCK(pcbinfo);
 				goto release;
diff --git a/sys/netlink/ktest_netlink_message_writer.c b/sys/netlink/ktest_netlink_message_writer.c
index c13a25e05a70..e46065dd4bd2 100644
--- a/sys/netlink/ktest_netlink_message_writer.c
+++ b/sys/netlink/ktest_netlink_message_writer.c
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <tests/ktest.h>
 #include <sys/cdefs.h>
 #include <sys/systm.h>
diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c
index 262361773fbb..7b2bbd39447d 100644
--- a/sys/netlink/netlink_domain.c
+++ b/sys/netlink/netlink_domain.c
@@ -30,7 +30,6 @@
  * This file contains socket and protocol bindings for netlink.
  */
 
-#include "opt_netlink.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c
index b28b206a7ace..b7600b2b6b71 100644
--- a/sys/netlink/netlink_generic.c
+++ b/sys/netlink/netlink_generic.c
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ck.h>
diff --git a/sys/netlink/netlink_glue.c b/sys/netlink/netlink_glue.c
index 29eac82aaffd..e7649c6b13dc 100644
--- a/sys/netlink/netlink_glue.c
+++ b/sys/netlink/netlink_glue.c
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
diff --git a/sys/netlink/netlink_io.c b/sys/netlink/netlink_io.c
index 0745f7fdcb77..0ca71fb6219b 100644
--- a/sys/netlink/netlink_io.c
+++ b/sys/netlink/netlink_io.c
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ck.h>
diff --git a/sys/netlink/netlink_message_writer.c b/sys/netlink/netlink_message_writer.c
index 9fc0eddc78ec..8443cc59d9e0 100644
--- a/sys/netlink/netlink_message_writer.c
+++ b/sys/netlink/netlink_message_writer.c
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/netlink/netlink_module.c b/sys/netlink/netlink_module.c
index ba56ac6d6a17..b4073721fdc4 100644
--- a/sys/netlink/netlink_module.c
+++ b/sys/netlink/netlink_module.c
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c
index e1939c7681de..0587b478431e 100644
--- a/sys/netlink/route/iface.c
+++ b/sys/netlink/route/iface.c
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <sys/cdefs.h>
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -292,6 +290,7 @@ static bool
 dump_iface(struct nl_writer *nw, if_t ifp, const struct nlmsghdr *hdr,
     int if_flags_mask)
 {
+	struct epoch_tracker et;
         struct ifinfomsg *ifinfo;
 
         NL_LOG(LOG_DEBUG3, "dumping interface %s data", if_name(ifp));
@@ -321,11 +320,15 @@ dump_iface(struct nl_writer *nw, if_t ifp, const struct nlmsghdr *hdr,
         nlattr_add_u8(nw, IFLA_PROTO_DOWN, val);
         nlattr_add_u8(nw, IFLA_LINKMODE, val);
 */
-        if (if_getaddrlen(ifp) != 0) {
-		struct ifaddr *ifa = if_getifaddr(ifp);
+	if (if_getaddrlen(ifp) != 0) {
+		struct ifaddr *ifa;
 
-                dump_sa(nw, IFLA_ADDRESS, ifa->ifa_addr);
-        }
+		NET_EPOCH_ENTER(et);
+		ifa = CK_STAILQ_FIRST(&ifp->if_addrhead);
+		if (ifa != NULL)
+			dump_sa(nw, IFLA_ADDRESS, ifa->ifa_addr);
+		NET_EPOCH_EXIT(et);
+	}
 
         if ((if_getbroadcastaddr(ifp) != NULL)) {
 		nlattr_add(nw, IFLA_BROADCAST, if_getaddrlen(ifp),
diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c
index 1a7aaffa7dd7..4bf913d9c978 100644
--- a/sys/netlink/route/iface_drivers.c
+++ b/sys/netlink/route/iface_drivers.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
 #include <sys/cdefs.h>
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c
index 4168b5936ddc..9914e7febf57 100644
--- a/sys/netlink/route/neigh.c
+++ b/sys/netlink/route/neigh.c
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <sys/cdefs.h>
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netlink/route/nexthop.c b/sys/netlink/route/nexthop.c
index 722dc5fdee4e..0d6bb5c9ec84 100644
--- a/sys/netlink/route/nexthop.c
+++ b/sys/netlink/route/nexthop.c
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <sys/cdefs.h>
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c
index 2a6a0bc54e85..cfaa2167b0d2 100644
--- a/sys/netlink/route/rt.c
+++ b/sys/netlink/route/rt.c
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <sys/cdefs.h>
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 3e1c8d32add9..39d240f49dbd 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -4731,6 +4731,11 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif,
 			return (action);
 		}
 	} else {
+		while ((ri = SLIST_FIRST(&match_rules))) {
+			SLIST_REMOVE_HEAD(&match_rules, entry);
+			free(ri, M_PF_RULE_ITEM);
+		}
+
 		uma_zfree(V_pf_state_key_z, sk);
 		uma_zfree(V_pf_state_key_z, nk);
 	}
@@ -4776,6 +4781,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a,
 	struct tcphdr		*th = &pd->hdr.tcp;
 	u_int16_t		 mss = V_tcp_mssdflt;
 	u_short			 reason, sn_reason;
+	struct pf_krule_item	*ri;
 
 	/* check maximums */
 	if (r->max_states &&
@@ -4986,6 +4992,11 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a,
 	return (PF_PASS);
 
 csfailed:
+	while ((ri = SLIST_FIRST(match_rules))) {
+		SLIST_REMOVE_HEAD(match_rules, entry);
+		free(ri, M_PF_RULE_ITEM);
+	}
+
 	uma_zfree(V_pf_state_key_z, sk);
 	uma_zfree(V_pf_state_key_z, nk);
 
@@ -5943,7 +5954,7 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif,
 			ret = pf_test_rule(&r, &sm, kif,
 			    j->m, off, &j->pd, &ra, &rs, NULL);
 			PF_RULES_RUNLOCK();
-			SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, action);
+			SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, ret);
 			if (sm) {
 				/* Inherit v_tag values. */
 				sm->src.scrub->pfss_v_tag = s->src.scrub->pfss_flags;
@@ -6978,7 +6989,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp,
 			} else {
 				ifp = s->rt_kif ? s->rt_kif->pfik_ifp : NULL;
 				/* If pfsync'd */
-				if (ifp == NULL)
+				if (ifp == NULL && r->rpool.cur != NULL)
 					ifp = r->rpool.cur->kif ?
 					    r->rpool.cur->kif->pfik_ifp : NULL;
 				PF_STATE_UNLOCK(s);
@@ -7035,9 +7046,10 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp,
 			    s->rt_addr.v4.s_addr;
 		ifp = s->rt_kif ? s->rt_kif->pfik_ifp : NULL;
 		/* If pfsync'd */
-		if (ifp == NULL)
+		if (ifp == NULL && r->rpool.cur != NULL) {
 			ifp = r->rpool.cur->kif ?
 			    r->rpool.cur->kif->pfik_ifp : NULL;
+		}
 		PF_STATE_UNLOCK(s);
 	}
 
@@ -7191,7 +7203,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp,
 			} else {
 				ifp = s->rt_kif ? s->rt_kif->pfik_ifp : NULL;
 				/* If pfsync'd */
-				if (ifp == NULL)
+				if (ifp == NULL && r->rpool.cur != NULL)
 					ifp = r->rpool.cur->kif ?
 					    r->rpool.cur->kif->pfik_ifp : NULL;
 				PF_STATE_UNLOCK(s);
@@ -7249,7 +7261,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp,
 			    &s->rt_addr, AF_INET6);
 		ifp = s->rt_kif ? s->rt_kif->pfik_ifp : NULL;
 		/* If pfsync'd */
-		if (ifp == NULL)
+		if (ifp == NULL && r->rpool.cur != NULL)
 			ifp = r->rpool.cur->kif ?
 			    r->rpool.cur->kif->pfik_ifp : NULL;
 	}
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index ebec61d2d711..bc235bf4da2d 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -83,6 +83,7 @@
 #include <netinet/ip_var.h>
 #include <netinet6/ip6_var.h>
 #include <netinet/ip_icmp.h>
+#include <netpfil/pf/pf_nl.h>
 #include <netpfil/pf/pf_nv.h>
 
 #ifdef INET6
@@ -2336,6 +2337,49 @@ pf_killstates_row(struct pf_kstate_kill *psk, struct pf_idhash *ih)
 	return (killed);
 }
 
+int
+pf_start(void)
+{
+	int error = 0;
+
+	sx_xlock(&V_pf_ioctl_lock);
+	if (V_pf_status.running)
+		error = EEXIST;
+	else {
+		hook_pf();
+		if (! TAILQ_EMPTY(V_pf_keth->active.rules))
+			hook_pf_eth();
+		V_pf_status.running = 1;
+		V_pf_status.since = time_second;
+		new_unrhdr64(&V_pf_stateid, time_second);
+
+		DPFPRINTF(PF_DEBUG_MISC, ("pf: started\n"));
+	}
+	sx_xunlock(&V_pf_ioctl_lock);
+
+	return (error);
+}
+
+int
+pf_stop(void)
+{
+	int error = 0;
+
+	sx_xlock(&V_pf_ioctl_lock);
+	if (!V_pf_status.running)
+		error = ENOENT;
+	else {
+		V_pf_status.running = 0;
+		dehook_pf();
+		dehook_pf_eth();
+		V_pf_status.since = time_second;
+		DPFPRINTF(PF_DEBUG_MISC, ("pf: stopped\n"));
+	}
+	sx_xunlock(&V_pf_ioctl_lock);
+
+	return (error);
+}
+
 static int
 pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
 {
@@ -2364,8 +2408,10 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td
 		case DIOCCLRSTATUS:
 		case DIOCNATLOOK:
 		case DIOCSETDEBUG:
+#ifdef COMPAT_FREEBSD14
 		case DIOCGETSTATES:
 		case DIOCGETSTATESV2:
+#endif
 		case DIOCGETTIMEOUT:
 		case DIOCCLRRULECTRS:
 		case DIOCGETLIMIT:
@@ -2422,8 +2468,10 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td
 		case DIOCGETSTATE:
 		case DIOCGETSTATENV:
 		case DIOCGETSTATUSNV:
+#ifdef COMPAT_FREEBSD14
 		case DIOCGETSTATES:
 		case DIOCGETSTATESV2:
+#endif
 		case DIOCGETTIMEOUT:
 		case DIOCGETLIMIT:
 		case DIOCGETALTQSV0:
@@ -2474,34 +2522,15 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td
 	CURVNET_SET(TD_TO_VNET(td));
 
 	switch (cmd) {
+#ifdef COMPAT_FREEBSD14
 	case DIOCSTART:
-		sx_xlock(&V_pf_ioctl_lock);
-		if (V_pf_status.running)
-			error = EEXIST;
-		else {
-			hook_pf();
-			if (! TAILQ_EMPTY(V_pf_keth->active.rules))
-				hook_pf_eth();
-			V_pf_status.running = 1;
-			V_pf_status.since = time_second;
-			new_unrhdr64(&V_pf_stateid, time_second);
-
-			DPFPRINTF(PF_DEBUG_MISC, ("pf: started\n"));
-		}
+		error = pf_start();
 		break;
 
 	case DIOCSTOP:
-		sx_xlock(&V_pf_ioctl_lock);
-		if (!V_pf_status.running)
-			error = ENOENT;
-		else {
-			V_pf_status.running = 0;
-			dehook_pf();
-			dehook_pf_eth();
-			V_pf_status.since = time_second;
-			DPFPRINTF(PF_DEBUG_MISC, ("pf: stopped\n"));
-		}
+		error = pf_stop();
 		break;
+#endif
 
 	case DIOCGETETHRULES: {
 		struct pfioc_nv		*nv = (struct pfioc_nv *)addr;
@@ -3545,6 +3574,7 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td
 		break;
 	}
 
+#ifdef COMPAT_FREEBSD14
 	case DIOCGETSTATES: {
 		struct pfioc_states	*ps = (struct pfioc_states *)addr;
 		struct pf_kstate	*s;
@@ -3696,7 +3726,7 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td
 
 		break;
 	}
-
+#endif
 	case DIOCGETSTATUSNV: {
 		error = pf_getstatus((struct pfioc_nv *)addr);
 		break;
@@ -5416,8 +5446,6 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td
 		break;
 	}
 fail:
-	if (sx_xlocked(&V_pf_ioctl_lock))
-		sx_xunlock(&V_pf_ioctl_lock);
 	CURVNET_RESTORE();
 
 #undef ERROUT_IOCTL
@@ -6654,6 +6682,8 @@ pf_unload(void)
 	}
 	sx_xunlock(&pf_end_lock);
 
+	pf_nl_unregister();
+
 	if (pf_dev != NULL)
 		destroy_dev(pf_dev);
 
@@ -6689,6 +6719,7 @@ pf_modevent(module_t mod, int type, void *data)
 	switch(type) {
 	case MOD_LOAD:
 		error = pf_load();
+		pf_nl_register();
 		break;
 	case MOD_UNLOAD:
 		/* Handled in SYSUNINIT(pf_unload) to ensure it's done after
@@ -6709,4 +6740,5 @@ static moduledata_t pf_mod = {
 };
 
 DECLARE_MODULE(pf, pf_mod, SI_SUB_PROTO_FIREWALL, SI_ORDER_SECOND);
+MODULE_DEPEND(pf, netlink, 1, 1, 1);
 MODULE_VERSION(pf, PF_MODVER);
diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c
new file mode 100644
index 000000000000..e079edcc166d
--- /dev/null
+++ b/sys/netpfil/pf/pf_nl.c
@@ -0,0 +1,394 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2023 Alexander V. Chernikov <melifaro@FreeBSD.org>
+ * Copyright (c) 2023 Rubicon Communications, LLC (Netgate)
+ *
+ * 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.
+ *
+ */
+
+#include <sys/cdefs.h>
+
+#include <sys/param.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+
+#include <net/pfvar.h>
+
+#include <netlink/netlink.h>
+#include <netlink/netlink_ctl.h>
+#include <netlink/netlink_generic.h>
+#include <netlink/netlink_message_writer.h>
+
+#include <netpfil/pf/pf_nl.h>
+
+#define	DEBUG_MOD_NAME	nl_pf
+#define	DEBUG_MAX_LEVEL	LOG_DEBUG3
+#include <netlink/netlink_debug.h>
+_DECLARE_DEBUG(LOG_DEBUG);
+
+struct nl_parsed_state {
+	uint8_t		version;
+	uint32_t	id;
+	uint32_t	creatorid;
+};
+
+#define	_IN(_field)	offsetof(struct genlmsghdr, _field)
+#define	_OUT(_field)	offsetof(struct nl_parsed_state, _field)
+static const struct nlattr_parser nla_p_state[] = {
+	{ .type = PF_ST_ID, .off = _OUT(id), .cb = nlattr_get_uint32 },
+	{ .type = PF_ST_CREATORID, .off = _OUT(creatorid), .cb = nlattr_get_uint32 },
+};
+static const struct nlfield_parser nlf_p_generic[] = {
+	{ .off_in = _IN(version), .off_out = _OUT(version), .cb = nlf_get_u8 },
+};
+#undef _IN
+#undef _OUT
+NL_DECLARE_PARSER(state_parser, struct genlmsghdr, nlf_p_generic, nla_p_state);
+
+static void
+dump_addr(struct nl_writer *nw, int attr, const struct pf_addr *addr, int af)
+{
+	switch (af) {
+	case AF_INET:
+		nlattr_add(nw, attr, 4, &addr->v4);
+		break;
+	case AF_INET6:
+		nlattr_add(nw, attr, 16, &addr->v6);
+		break;
+	};
+}
+
+static bool
+dump_state_peer(struct nl_writer *nw, int attr, const struct pf_state_peer *peer)
+{
+	int off = nlattr_add_nested(nw, attr);
+	if (off == 0)
+		return (false);
+
+	nlattr_add_u32(nw, PF_STP_SEQLO, peer->seqlo);
+	nlattr_add_u32(nw, PF_STP_SEQHI, peer->seqhi);
+	nlattr_add_u32(nw, PF_STP_SEQDIFF, peer->seqdiff);
+	nlattr_add_u16(nw, PF_STP_MAX_WIN, peer->max_win);
+	nlattr_add_u16(nw, PF_STP_MSS, peer->mss);
+	nlattr_add_u8(nw, PF_STP_STATE, peer->state);
+	nlattr_add_u8(nw, PF_STP_WSCALE, peer->wscale);
+
+	if (peer->scrub != NULL) {
+		struct pf_state_scrub *sc = peer->scrub;
+		uint16_t pfss_flags = sc->pfss_flags & PFSS_TIMESTAMP;
+
+		nlattr_add_u16(nw, PF_STP_PFSS_FLAGS, pfss_flags);
+		nlattr_add_u32(nw, PF_STP_PFSS_TS_MOD, sc->pfss_ts_mod);
+		nlattr_add_u8(nw, PF_STP_PFSS_TTL, sc->pfss_ttl);
+		nlattr_add_u8(nw, PF_STP_SCRUB_FLAG, PFSYNC_SCRUB_FLAG_VALID);
+	}
+	nlattr_set_len(nw, off);
+
+	return (true);
+}
+
+static bool
+dump_state_key(struct nl_writer *nw, int attr, const struct pf_state_key *key)
+{
+	int off = nlattr_add_nested(nw, attr);
+	if (off == 0)
+		return (false);
+
+	dump_addr(nw, PF_STK_ADDR0, &key->addr[0], key->af);
+	dump_addr(nw, PF_STK_ADDR1, &key->addr[1], key->af);
+	nlattr_add_u16(nw, PF_STK_PORT0, key->port[0]);
+	nlattr_add_u16(nw, PF_STK_PORT1, key->port[1]);
+
+	nlattr_set_len(nw, off);
+
+	return (true);
+}
+
+static int
+dump_state(struct nlpcb *nlp, const struct nlmsghdr *hdr, struct pf_kstate *s,
+    struct nl_pstate *npt)
+{
+	struct nl_writer *nw = npt->nw;
+	int error = 0;
+	int af;
+	struct pf_state_key *key;
+
+	if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr)))
+		goto enomem;
+
+	struct genlmsghdr *ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr);
+	ghdr_new->cmd = PFNL_CMD_GETSTATES;
+	ghdr_new->version = 0;
+	ghdr_new->reserved = 0;
+
+	nlattr_add_u64(nw, PF_ST_VERSION, PF_STATE_VERSION);
+
+	key = s->key[PF_SK_WIRE];
+	if (!dump_state_key(nw, PF_ST_KEY_WIRE, key))
+		goto enomem;
+	key = s->key[PF_SK_STACK];
+	if (!dump_state_key(nw, PF_ST_KEY_STACK, key))
+		goto enomem;
+
+	af = s->key[PF_SK_WIRE]->af;
+	nlattr_add_u8(nw, PF_ST_PROTO, s->key[PF_SK_WIRE]->proto);
+	nlattr_add_u8(nw, PF_ST_AF, af);
+
+	nlattr_add_string(nw, PF_ST_IFNAME, s->kif->pfik_name);
+	nlattr_add_string(nw, PF_ST_ORIG_IFNAME, s->orig_kif->pfik_name);
+	dump_addr(nw, PF_ST_RT_ADDR, &s->rt_addr, af);
+	nlattr_add_u32(nw, PF_ST_CREATION, time_uptime - s->creation);
+	uint32_t expire = pf_state_expires(s);
+	if (expire > time_uptime)
+		expire = expire - time_uptime;
+	nlattr_add_u32(nw, PF_ST_EXPIRE, expire);
+	nlattr_add_u8(nw, PF_ST_DIRECTION, s->direction);
+	nlattr_add_u8(nw, PF_ST_LOG, s->act.log);
+	nlattr_add_u8(nw, PF_ST_TIMEOUT, s->timeout);
+	nlattr_add_u16(nw, PF_ST_STATE_FLAGS, s->state_flags);
+	uint8_t sync_flags = 0;
+	if (s->src_node)
+		sync_flags |= PFSYNC_FLAG_SRCNODE;
+	if (s->nat_src_node)
+		sync_flags |= PFSYNC_FLAG_NATSRCNODE;
+	nlattr_add_u8(nw, PF_ST_SYNC_FLAGS, sync_flags);
+	nlattr_add_u64(nw, PF_ST_ID, s->id);
+	nlattr_add_u32(nw, PF_ST_CREATORID, htonl(s->creatorid));
+
+	nlattr_add_u32(nw, PF_ST_RULE, s->rule.ptr ? s->rule.ptr->nr : -1);
+	nlattr_add_u32(nw, PF_ST_ANCHOR, s->anchor.ptr ? s->anchor.ptr->nr : -1);
+	nlattr_add_u32(nw, PF_ST_NAT_RULE, s->nat_rule.ptr ? s->nat_rule.ptr->nr : -1);
+
+	nlattr_add_u64(nw, PF_ST_PACKETS0, s->packets[0]);
+	nlattr_add_u64(nw, PF_ST_PACKETS1, s->packets[1]);
+	nlattr_add_u64(nw, PF_ST_BYTES0, s->bytes[0]);
+	nlattr_add_u64(nw, PF_ST_BYTES1, s->bytes[1]);
+
+	if (!dump_state_peer(nw, PF_ST_PEER_SRC, &s->src))
+		goto enomem;
+	if (!dump_state_peer(nw, PF_ST_PEER_DST, &s->dst))
+		goto enomem;
+
+	if (nlmsg_end(nw))
+		return (0);
+
+enomem:
+	error = ENOMEM;
+	nlmsg_abort(nw);
+	return (error);
+}
+
+static int
+handle_dumpstates(struct nlpcb *nlp, struct nl_parsed_state *attrs,
+    struct nlmsghdr *hdr, struct nl_pstate *npt)
+{
+	int error = 0;
+
+	hdr->nlmsg_flags |= NLM_F_MULTI;
+
+	for (int i = 0; i <= pf_hashmask; i++) {
+		struct pf_idhash *ih = &V_pf_idhash[i];
+		struct pf_kstate *s;
+
+		if (LIST_EMPTY(&ih->states))
+			continue;
+
+		PF_HASHROW_LOCK(ih);
+		LIST_FOREACH(s, &ih->states, entry) {
+			if (s->timeout != PFTM_UNLINKED) {
+				error = dump_state(nlp, hdr, s, npt);
+				if (error != 0)
+					break;
+			}
+		}
+		PF_HASHROW_UNLOCK(ih);
+	}
+
+	if (!nlmsg_end_dump(npt->nw, error, hdr)) {
+		NL_LOG(LOG_DEBUG, "Unable to finalize the dump");
+		return (ENOMEM);
+	}
+
+	return (error);
+}
+
+static int
+handle_getstate(struct nlpcb *nlp, struct nl_parsed_state *attrs,
+    struct nlmsghdr *hdr, struct nl_pstate *npt)
+{
+	struct pf_kstate *s = pf_find_state_byid(attrs->id, attrs->creatorid);
+	if (s == NULL)
+		return (ENOENT);
+	return (dump_state(nlp, hdr, s, npt));
+}
+
+static int
+dump_creatorid(struct nlpcb *nlp, const struct nlmsghdr *hdr, uint32_t creator,
+    struct nl_pstate *npt)
+{
+	struct nl_writer *nw = npt->nw;
+
+	if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr)))
+		goto enomem;
+
+	struct genlmsghdr *ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr);
+	ghdr_new->cmd = PFNL_CMD_GETCREATORS;
+	ghdr_new->version = 0;
+	ghdr_new->reserved = 0;
+
+	nlattr_add_u32(nw, PF_ST_CREATORID, htonl(creator));
+
+	if (nlmsg_end(nw))
+		return (0);
+
+enomem:
+	nlmsg_abort(nw);
+	return (ENOMEM);
+}
+
+static int
+pf_handle_getstates(struct nlmsghdr *hdr, struct nl_pstate *npt)
+{
+	int error;
+
+	struct nl_parsed_state attrs = {};
+	error = nl_parse_nlmsg(hdr, &state_parser, npt, &attrs);
+	if (error != 0)
+		return (error);
+
+	if (attrs.id != 0)
+		error = handle_getstate(npt->nlp, &attrs, hdr, npt);
+	else
+		error = handle_dumpstates(npt->nlp, &attrs, hdr, npt);
+
+	return (error);
+}
+
+static int
+pf_handle_getcreators(struct nlmsghdr *hdr, struct nl_pstate *npt)
+{
+	uint32_t creators[16];
+	int error = 0;
+
+	bzero(creators, sizeof(creators));
+
+	for (int i = 0; i < pf_hashmask; i++) {
+		struct pf_idhash *ih = &V_pf_idhash[i];
+		struct pf_kstate *s;
+
+		if (LIST_EMPTY(&ih->states))
+			continue;
+
+		PF_HASHROW_LOCK(ih);
+		LIST_FOREACH(s, &ih->states, entry) {
+			int j;
+			if (s->timeout == PFTM_UNLINKED)
+				continue;
+
+			for (j = 0; j < nitems(creators); j++) {
+				if (creators[j] == s->creatorid)
+					break;
+				if (creators[j] == 0) {
+					creators[j] = s->creatorid;
+					break;
+				}
+			}
+			if (j == nitems(creators))
+				printf("Warning: too many creators!\n");
+		}
+		PF_HASHROW_UNLOCK(ih);
+	}
+
+	hdr->nlmsg_flags |= NLM_F_MULTI;
+	for (int i = 0; i < nitems(creators); i++) {
+		if (creators[i] == 0)
+			break;
+		error = dump_creatorid(npt->nlp, hdr, creators[i], npt);
+	}
+
+	if (!nlmsg_end_dump(npt->nw, error, hdr)) {
+		NL_LOG(LOG_DEBUG, "Unable to finalize the dump");
+		return (ENOMEM);
+	}
+
+	return (error);
+}
+
+static int
+pf_handle_start(struct nlmsghdr *hdr __unused, struct nl_pstate *npt __unused)
+{
+	return (pf_start());
+}
+
+static int
+pf_handle_stop(struct nlmsghdr *hdr __unused, struct nl_pstate *npt __unused)
+{
+	return (pf_stop());
+}
+
+static const struct nlhdr_parser *all_parsers[] = { &state_parser };
+
+static int family_id;
+
+static const struct genl_cmd pf_cmds[] = {
+	{
+		.cmd_num = PFNL_CMD_GETSTATES,
+		.cmd_name = "GETSTATES",
+		.cmd_cb = pf_handle_getstates,
+		.cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL,
+	},
+	{
+		.cmd_num = PFNL_CMD_GETCREATORS,
+		.cmd_name = "GETCREATORS",
+		.cmd_cb = pf_handle_getcreators,
+		.cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL,
+	},
+	{
+		.cmd_num = PFNL_CMD_START,
+		.cmd_name = "START",
+		.cmd_cb = pf_handle_start,
+		.cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL,
+	},
+	{
+		.cmd_num = PFNL_CMD_STOP,
+		.cmd_name = "STOP",
+		.cmd_cb = pf_handle_stop,
+		.cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL,
+	},
+};
+
+void
+pf_nl_register(void)
+{
+	NL_VERIFY_PARSERS(all_parsers);
+	family_id = genl_register_family(PFNL_FAMILY_NAME, 0, 2, PFNL_CMD_MAX);
+	genl_register_cmds(PFNL_FAMILY_NAME, pf_cmds, NL_ARRAY_LEN(pf_cmds));
+}
+
+void
+pf_nl_unregister(void)
+{
+	genl_unregister_family(PFNL_FAMILY_NAME);
+}
diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h
new file mode 100644
index 000000000000..3c8c6d3b8ed4
--- /dev/null
+++ b/sys/netpfil/pf/pf_nl.h
@@ -0,0 +1,108 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2023 Alexander V. Chernikov <melifaro@FreeBSD.org>
+ * Copyright (c) 2023 Rubicon Communications, LLC (Netgate)
+ *
+ * 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.
+ *
+ */
+
+#ifndef _NETPFIL_PF_PF_NL_H_
+#define _NETPFIL_PF_PF_NL_H_
+
+/* Genetlink family */
+#define PFNL_FAMILY_NAME	"pfctl"
+
+/* available commands */
+enum {
+	PFNL_CMD_UNSPEC = 0,
+	PFNL_CMD_GETSTATES = 1,
+	PFNL_CMD_GETCREATORS = 2,
+	PFNL_CMD_START = 3,
+	PFNL_CMD_STOP = 4,
+	__PFNL_CMD_MAX,
+};
+#define PFNL_CMD_MAX (__PFNL_CMD_MAX -1)
+
+enum pfstate_key_type_t {
+	PF_STK_UNSPEC,
+	PF_STK_ADDR0		= 1, /* ip */
+	PF_STK_ADDR1		= 2, /* ip */
+	PF_STK_PORT0		= 3, /* u16 */
+	PF_STK_PORT1		= 4, /* u16 */
+};
+
+enum pfstate_peer_type_t {
+	PF_STP_UNSPEC,
+	PF_STP_PFSS_FLAGS	= 1, /* u16 */
+	PF_STP_PFSS_TTL		= 2, /* u8 */
+	PF_STP_SCRUB_FLAG	= 3, /* u8 */
+	PF_STP_PFSS_TS_MOD	= 4, /* u32 */
+	PF_STP_SEQLO		= 5, /* u32 */
+	PF_STP_SEQHI		= 6, /* u32 */
+	PF_STP_SEQDIFF		= 7, /* u32 */
+	PF_STP_MAX_WIN		= 8, /* u16 */
+	PF_STP_MSS		= 9, /* u16 */
+	PF_STP_STATE		= 10, /* u8 */
+	PF_STP_WSCALE		= 11, /* u8 */
+};
+
+enum pfstate_type_t {
+	PF_ST_UNSPEC,
+	PF_ST_ID		= 1, /* u32, state id */
+	PF_ST_CREATORID		= 2, /* u32, */
+	PF_ST_IFNAME		= 3, /* string */
+	PF_ST_ORIG_IFNAME	= 4, /* string */
+	PF_ST_KEY_WIRE		= 5, /* nested, pfstate_key_type_t */
+	PF_ST_KEY_STACK		= 6, /* nested, pfstate_key_type_t */
+	PF_ST_PEER_SRC		= 7, /* nested, pfstate_peer_type_t*/
+	PF_ST_PEER_DST		= 8, /* nested, pfstate_peer_type_t */
+	PF_ST_RT_ADDR		= 9, /* ip */
+	PF_ST_RULE		= 10, /* u32 */
+	PF_ST_ANCHOR		= 11, /* u32 */
+	PF_ST_NAT_RULE		= 12, /* u32 */
+	PF_ST_CREATION		= 13, /* u32 */
+	PF_ST_EXPIRE		= 14, /* u32 */
+	PF_ST_PACKETS0		= 15, /* u64 */
+	PF_ST_PACKETS1		= 16, /* u64 */
+	PF_ST_BYTES0		= 17, /* u64 */
+	PF_ST_BYTES1		= 18, /* u64 */
+	PF_ST_AF		= 19, /* u8 */
+	PF_ST_PROTO		= 21, /* u8 */
+	PF_ST_DIRECTION		= 22, /* u8 */
+	PF_ST_LOG		= 23, /* u8 */
+	PF_ST_TIMEOUT		= 24, /* u8 */
+	PF_ST_STATE_FLAGS	= 25, /* u8 */
+	PF_ST_SYNC_FLAGS	= 26, /* u8 */
+	PF_ST_UPDATES		= 27, /* u8 */
+	PF_ST_VERSION		= 28, /* u64 */
+};
+
+#ifdef _KERNEL
+
+void	pf_nl_register(void);
+void	pf_nl_unregister(void);
+
+#endif
+
+#endif
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index b01a88d34138..47c84956facd 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -67,6 +67,7 @@ options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI 
 options 	KTRACE			# ktrace(1) syscall trace support
 options 	STACK			# stack(9) support
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 45897555791a..ac041c420ee0 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -76,6 +76,7 @@ options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI 
 options 	KTRACE			# ktrace(1) syscall trace support
 options 	STACK			# stack(9) support
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index 2cd53b860126..d90018802d37 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -71,6 +71,7 @@ options 	GEOM_LABEL		# Provides labelization
 options         COMPAT_FREEBSD11        # Compatible with FreeBSD11 (required by ports)
 options         COMPAT_FREEBSD12        # Compatible with FreeBSD12 (required by ports)
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI 
 options 	KTRACE			# ktrace(1) syscall trace support
diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX
index e44a35377355..c31f892a4208 100644
--- a/sys/powerpc/conf/MPC85XX
+++ b/sys/powerpc/conf/MPC85XX
@@ -63,6 +63,7 @@ options 	COMPAT_FREEBSD10
 options 	COMPAT_FREEBSD11
 options 	COMPAT_FREEBSD12
 options 	COMPAT_FREEBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 options 	HWPMC_HOOKS
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data
diff --git a/sys/powerpc/conf/MPC85XXSPE b/sys/powerpc/conf/MPC85XXSPE
index 3665da656ed1..8ebc4a41bcb2 100644
--- a/sys/powerpc/conf/MPC85XXSPE
+++ b/sys/powerpc/conf/MPC85XXSPE
@@ -69,6 +69,7 @@ options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 
 options 	HWPMC_HOOKS
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
diff --git a/sys/powerpc/powerpc/elf32_machdep.c b/sys/powerpc/powerpc/elf32_machdep.c
index cbb936aef5a2..4209ad9f9571 100644
--- a/sys/powerpc/powerpc/elf32_machdep.c
+++ b/sys/powerpc/powerpc/elf32_machdep.c
@@ -122,7 +122,7 @@ struct sysentvec elf32_freebsd_sysvec = {
 #endif
 	.sv_maxssiz	= NULL,
 	.sv_flags	= SV_ABI_FREEBSD | SV_ILP32 | SV_SHP | SV_ASLR |
-			    SV_TIMEKEEP | SV_RNG_SEED_VER,
+			    SV_TIMEKEEP | SV_RNG_SEED_VER | SV_SIGSYS,
 	.sv_set_syscall_retval = cpu_set_syscall_retval,
 	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
 	.sv_shared_page_base = FREEBSD32_SHAREDPAGE,
diff --git a/sys/powerpc/powerpc/elf64_machdep.c b/sys/powerpc/powerpc/elf64_machdep.c
index d5deb04800e9..e40366f612bd 100644
--- a/sys/powerpc/powerpc/elf64_machdep.c
+++ b/sys/powerpc/powerpc/elf64_machdep.c
@@ -85,7 +85,7 @@ struct sysentvec elf64_freebsd_sysvec_v1 = {
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
 	.sv_flags	= SV_ABI_FREEBSD | SV_LP64 | SV_SHP | SV_ASLR |
-			    SV_TIMEKEEP | SV_RNG_SEED_VER,
+			    SV_TIMEKEEP | SV_RNG_SEED_VER | SV_SIGSYS,
 	.sv_set_syscall_retval = cpu_set_syscall_retval,
 	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
 	.sv_syscallnames = syscallnames,
@@ -126,7 +126,7 @@ struct sysentvec elf64_freebsd_sysvec_v2 = {
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
 	.sv_flags	= SV_ABI_FREEBSD | SV_LP64 | SV_SHP |
-			    SV_TIMEKEEP | SV_RNG_SEED_VER,
+			    SV_TIMEKEEP | SV_RNG_SEED_VER | SV_SIGSYS,
 	.sv_set_syscall_retval = cpu_set_syscall_retval,
 	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
 	.sv_syscallnames = syscallnames,
diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c
index 1527e813647d..7f1a267f5cf2 100644
--- a/sys/powerpc/powerpc/trap.c
+++ b/sys/powerpc/powerpc/trap.c
@@ -694,7 +694,7 @@ cpu_fetch_syscall_args(struct thread *td)
 	}
 
 	if (sa->code >= p->p_sysent->sv_size)
-		sa->callp = &p->p_sysent->sv_table[0];
+		sa->callp = &nosys_sysent;
 	else
 		sa->callp = &p->p_sysent->sv_table[sa->code];
 
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
index 60b96c52f661..fd871315b27e 100644
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -54,6 +54,7 @@ options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
+options 	COMPAT_FREEBSD14	# Compatible with FreeBSD14
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
diff --git a/sys/riscv/riscv/elf_machdep.c b/sys/riscv/riscv/elf_machdep.c
index df192167375c..0c337f527f02 100644
--- a/sys/riscv/riscv/elf_machdep.c
+++ b/sys/riscv/riscv/elf_machdep.c
@@ -94,7 +94,7 @@ static struct sysentvec elf_freebsd_sysvec = {
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
 	.sv_flags	= SV_ABI_FREEBSD | SV_LP64 | SV_SHP | SV_TIMEKEEP |
-	    SV_RNG_SEED_VER |
+	    SV_RNG_SEED_VER | SV_SIGSYS |
 #if __has_feature(capabilities)
 	    SV_CHERI,
 #else
diff --git a/sys/riscv/riscv/freebsd64_machdep.c b/sys/riscv/riscv/freebsd64_machdep.c
index 0517106f8717..b62154ea7ba0 100644
--- a/sys/riscv/riscv/freebsd64_machdep.c
+++ b/sys/riscv/riscv/freebsd64_machdep.c
@@ -102,7 +102,7 @@ struct sysentvec elf_freebsd_freebsd64_sysvec = {
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
 	.sv_flags	= SV_ABI_FREEBSD | SV_LP64 | SV_SHP | SV_TIMEKEEP |
-	    SV_ASLR | SV_RNG_SEED_VER,
+	    SV_ASLR | SV_RNG_SEED_VER | SV_SIGSYS,
 	.sv_set_syscall_retval = cpu_set_syscall_retval,
 	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
 	.sv_syscallnames = freebsd64_syscallnames,
diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c
index 45a52ae1d8fb..d41e2cbf588b 100644
--- a/sys/riscv/riscv/machdep.c
+++ b/sys/riscv/riscv/machdep.c
@@ -34,6 +34,7 @@
  */
 
 #include "opt_ddb.h"
+#include "opt_kstack_pages.h"
 #include "opt_platform.h"
 
 #include <sys/cdefs.h>
@@ -344,7 +345,7 @@ init_proc0(vm_pointer_t kstack)
 
 	proc_linkup0(&proc0, &thread0);
 	thread0.td_kstack = kstack;
-	thread0.td_kstack_pages = kstack_pages;
+	thread0.td_kstack_pages = KSTACK_PAGES;
 	thread0.td_pcb = (struct pcb *)(thread0.td_kstack +
 	    thread0.td_kstack_pages * PAGE_SIZE) - 1;
 	thread0.td_pcb->pcb_fpflags = 0;
@@ -698,6 +699,10 @@ initriscv(struct riscv_bootparams *rvbp)
 
 	early_boot = 0;
 
+	if (bootverbose && kstack_pages != KSTACK_PAGES)
+		printf("kern.kstack_pages = %d ignored for thread0\n",
+		    kstack_pages);
+
 	TSEXIT();
 }
 
diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c
index f8a291e99c6f..bb6f3e0178ca 100644
--- a/sys/riscv/riscv/pmap.c
+++ b/sys/riscv/riscv/pmap.c
@@ -1033,6 +1033,12 @@ pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot)
 	return (m);
 }
 
+/*
+ *	Routine:	pmap_kextract
+ *	Function:
+ *		Extract the physical page address associated with the given kernel
+ *		virtual address.
+ */
 vm_paddr_t
 pmap_kextract(vm_offset_t va)
 {
diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c
index 36590ace40a0..8daba5a1e63e 100644
--- a/sys/riscv/riscv/trap.c
+++ b/sys/riscv/riscv/trap.c
@@ -155,7 +155,7 @@ cpu_fetch_syscall_args(struct thread *td)
 	}
 
 	if (__predict_false(sa->code >= p->p_sysent->sv_size))
-		sa->callp = &p->p_sysent->sv_table[0];
+		sa->callp = &nosys_sysent;
 	else
 		sa->callp = &p->p_sysent->sv_table[sa->code];
 
@@ -461,8 +461,8 @@ page_fault_handler(struct trapframe *frame, int usermode)
 			return;
 	}
 #endif
-	panic("Fatal page fault at %#lx: %#016lx",
-	    (unsigned long)frame->tf_sepc, stval);
+	panic("Fatal page fault at %#lx: %#lx", (unsigned long)frame->tf_sepc,
+	    stval);
 }
 
 void
@@ -489,7 +489,7 @@ do_trap_supervisor(struct trapframe *frame)
 		return;
 #endif
 
-	CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__,
+	CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%#lx, stval=%#lx", __func__,
 	    exception, (unsigned long)frame->tf_sepc, frame->tf_stval);
 
 	switch (exception) {
@@ -497,16 +497,15 @@ do_trap_supervisor(struct trapframe *frame)
 	case SCAUSE_STORE_ACCESS_FAULT:
 	case SCAUSE_INST_ACCESS_FAULT:
 		dump_regs(frame);
-		panic("Memory access exception at 0x%016lx\n",
-		    (unsigned long)frame->tf_sepc);
+		panic("Memory access exception at %#lx: %#lx",
+		    (unsigned long)frame->tf_sepc, frame->tf_stval);
 		break;
 	case SCAUSE_LOAD_MISALIGNED:
 	case SCAUSE_STORE_MISALIGNED:
 	case SCAUSE_INST_MISALIGNED:
 		dump_regs(frame);
-		panic("Misaligned address exception at %#016lx: %#016lx\n",
-		    (unsigned long)frame->tf_sepc,
-		    frame->tf_stval);
+		panic("Misaligned address exception at %#lx: %#lx",
+		    (unsigned long)frame->tf_sepc, frame->tf_stval);
 		break;
 	case SCAUSE_STORE_PAGE_FAULT:
 	case SCAUSE_LOAD_PAGE_FAULT:
@@ -526,13 +525,14 @@ do_trap_supervisor(struct trapframe *frame)
 		kdb_trap(exception, 0, frame);
 #else
 		dump_regs(frame);
-		panic("No debugger in kernel.\n");
+		panic("No debugger in kernel.");
 #endif
 		break;
 	case SCAUSE_ILLEGAL_INSTRUCTION:
 		dump_regs(frame);
-		panic("Illegal instruction at 0x%016lx\n",
-		    (unsigned long)frame->tf_sepc);
+		panic("Illegal instruction 0x%0*lx at %#lx",
+		    (frame->tf_stval & 0x3) != 0x3 ? 4 : 8,
+		    frame->tf_stval, (unsigned long)frame->tf_sepc);
 		break;
 #if __has_feature(capabilities)
 	case SCAUSE_CHERI:
@@ -564,7 +564,7 @@ do_trap_supervisor(struct trapframe *frame)
 #endif
 	default:
 		dump_regs(frame);
-		panic("Unknown kernel exception %lx trap value %lx\n",
+		panic("Unknown kernel exception %#lx trap value %#lx",
 		    exception, frame->tf_stval);
 	}
 }
@@ -597,7 +597,7 @@ do_trap_user(struct trapframe *frame)
 	}
 	intr_enable();
 
-	CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__,
+	CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%#lx, stval=%#lx", __func__,
 	    exception, (unsigned long)frame->tf_sepc, frame->tf_stval);
 
 	switch (exception) {
@@ -661,7 +661,7 @@ do_trap_user(struct trapframe *frame)
 #endif
 	default:
 		dump_regs(frame);
-		panic("Unknown userland exception %lx, trap value %lx\n",
+		panic("Unknown userland exception %#lx, trap value %#lx",
 		    exception, frame->tf_stval);
 	}
 }
diff --git a/sys/sys/_termios.h b/sys/sys/_termios.h
index 327ffcb2f98b..823752732ee2 100644
--- a/sys/sys/_termios.h
+++ b/sys/sys/_termios.h
@@ -97,6 +97,7 @@
 #endif
 #if __BSD_VISIBLE
 #define	IMAXBEL		0x00002000	/* ring bell on input queue full */
+#define IUTF8		0x00004000	/* assume input is utf-8 encoded */
 #endif
 
 /*
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index f3a0a528ecf9..1fe3abece72e 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -169,7 +169,7 @@ struct sysentvec {
 #define	SV_IA32		0x004000	/* Intel 32-bit executable. */
 #define	SV_AOUT		0x008000	/* a.out executable. */
 #define	SV_SHP		0x010000	/* Shared page. */
-#define	SV_AVAIL1	0x020000	/* Unused */
+#define	SV_SIGSYS	0x020000	/* SIGSYS for non-existing syscall */
 #define	SV_TIMEKEEP	0x040000	/* Shared page timehands. */
 #define	SV_ASLR		0x080000	/* ASLR allowed. */
 #define	SV_RNG_SEED_VER	0x100000	/* random(4) reseed generation. */
@@ -198,6 +198,7 @@ struct sysentvec {
 extern struct sysentvec aout_sysvec;
 extern struct sysent sysent[];
 extern const char *syscallnames[];
+extern struct sysent nosys_sysent;
 
 struct nosys_args {
 	register_t dummy;
@@ -229,7 +230,7 @@ struct syscall_module_data {
 	.sy_return = 0,						\
 	.sy_flags = 0,						\
 	.sy_thrcnt = 0						\
-}							
+}
 
 #define	MAKE_SYSENT(syscallname)				\
 static struct sysent syscallname##_sysent = SYSENT_INIT_VALS(syscallname);
@@ -326,7 +327,7 @@ struct nosys_args;
 int	lkmnosys(struct thread *, struct nosys_args *);
 int	lkmressys(struct thread *, struct nosys_args *);
 
-int	syscall_thread_enter(struct thread *td, struct sysent *se);
+int	syscall_thread_enter(struct thread *td, struct sysent **se);
 void	syscall_thread_exit(struct thread *td, struct sysent *se);
 
 int shared_page_alloc(int size, int align);
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index 32163935694a..cbe4ff4e2d1b 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -50,15 +50,40 @@ typedef	__off_t	off_t;
 #endif
 
 #ifdef _KERNEL
+/*
+ * The number of inlined iovecs can be measured by looking at the
+ * distribution of M_IOV allocations with dtrace.
+ * The number of inlined iovecs is tuned to capture the majority of
+ * allocations during a kernel build, measured using the dtrace dtmalloc
+ * provider as in
+ * dtrace -n 'dtmalloc::iov:malloc {@ = lquantize(args[3], 16, 4096, 8);}'
+ *
+ * It is possible to check whethe this value is well-tuned by computing the
+ * ratio of M_IOV allocations over the number of uio_zone allocations.
+ * This ratio should be << 1, if not this value may require tuning.
+ */
+#define	UIO_INLINE_IOV	2
+/*
+ * Mark an UIO with an externally allocated iovec array.
+ */
+#define	UIO_EXT_IOVEC	1
 
 struct uio {
 	struct iovec	*uio_iov;	/* scatter/gather list */
+	int	uio_flags;		/* uio iovec buffer flags */
+#define	uio_startcopy uio_iovcnt
 	int	uio_iovcnt;		/* length of scatter/gather list */
 	off_t	uio_offset;		/* offset in target object */
 	ssize_t	uio_resid;		/* remaining bytes to process */
 	enum	uio_seg uio_segflg;	/* address space */
 	enum	uio_rw uio_rw;		/* operation */
 	struct	thread *uio_td;		/* owner */
+#define	uio_endcopy uio_ext_iov
+	union {
+		struct iovec	uio_inline_iov[UIO_INLINE_IOV];	/* inline iovec
+								   array */
+		struct iovec	*uio_ext_iov;	/* external iovec array */
+	};
 } __aligned(sizeof(void * __capability));
 
 /*
@@ -78,6 +103,8 @@ struct vm_object;
 struct vm_page;
 struct bus_dma_segment;
 
+struct uio *allocuio(u_int iovcnt);
+void	freeuio(struct uio *uio);
 struct uio *cloneuio(struct uio *uiop);
 int	copyiniov(const struct iovec * __capability iovp, u_int iovcnt,
 	    struct iovec **iov, int error);
@@ -123,7 +150,8 @@ __END_DECLS
 //   ],
 //   "changes_purecap": [
 //     "pointer_as_integer",
-//     "pointer_shape"
+//     "pointer_shape",
+//     "bounds_compression"
 //   ]
 // }
 // CHERI CHANGES END
diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h
index f57a185c2433..72df62704d73 100644
--- a/sys/teken/teken_wcwidth.h
+++ b/sys/teken/teken_wcwidth.h
@@ -8,111 +8,163 @@
  * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
  */
 
+#define TEKEN_UTF8_INVALID_CODEPOINT -1
+
 struct interval {
-  teken_char_t first;
-  teken_char_t last;
+	teken_char_t first;
+	teken_char_t last;
 };
 
-/* auxiliary function for binary search in interval table */
-static int bisearch(teken_char_t ucs, const struct interval *table, int max) {
-  int min = 0;
-  int mid;
+/* Auxiliary function for binary search in interval table */
+static inline int
+bisearch(teken_char_t ucs, const struct interval *table, int max)
+{
+	int min = 0;
+	int mid;
 
-  if (ucs < table[0].first || ucs > table[max].last)
-    return 0;
-  while (max >= min) {
-    mid = (min + max) / 2;
-    if (ucs > table[mid].last)
-      min = mid + 1;
-    else if (ucs < table[mid].first)
-      max = mid - 1;
-    else
-      return 1;
-  }
+	if (ucs < table[0].first || ucs > table[max].last)
+		return (0);
+	while (max >= min) {
+		mid = (min + max) / 2;
+		if (ucs > table[mid].last)
+			min = mid + 1;
+		else if (ucs < table[mid].first)
+			max = mid - 1;
+		else
+			return (1);
+	}
 
-  return 0;
+	return (0);
 }
 
-static int teken_wcwidth(teken_char_t ucs)
+static inline int
+teken_wcwidth(teken_char_t ucs)
 {
-  /* sorted list of non-overlapping intervals of non-spacing characters */
-  /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
-  static const struct interval combining[] = {
-    { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
-    { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
-    { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
-    { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
-    { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
-    { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
-    { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
-    { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
-    { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
-    { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
-    { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
-    { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
-    { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
-    { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
-    { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
-    { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
-    { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
-    { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
-    { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
-    { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
-    { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
-    { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
-    { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
-    { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
-    { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
-    { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
-    { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
-    { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
-    { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
-    { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
-    { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
-    { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
-    { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
-    { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
-    { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
-    { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
-    { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
-    { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
-    { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
-    { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },
-    { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },
-    { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
-    { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
-    { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
-    { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },
-    { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
-    { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
-    { 0xE0100, 0xE01EF }
-  };
+	/*
+	 * Sorted list of non-overlapping intervals of non-spacing characters.
+	 * Generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c"
+	 */
+	static const struct interval combining[] = {
+		{ 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
+		{ 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
+		{ 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
+		{ 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
+		{ 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
+		{ 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
+		{ 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
+		{ 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
+		{ 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
+		{ 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
+		{ 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
+		{ 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
+		{ 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
+		{ 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
+		{ 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
+		{ 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
+		{ 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
+		{ 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
+		{ 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
+		{ 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
+		{ 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
+		{ 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
+		{ 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
+		{ 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
+		{ 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
+		{ 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
+		{ 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
+		{ 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
+		{ 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
+		{ 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
+		{ 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
+		{ 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
+		{ 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
+		{ 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
+		{ 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
+		{ 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
+		{ 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
+		{ 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
+		{ 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
+		{ 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },
+		{ 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },
+		{ 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
+		{ 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
+		{ 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
+		{ 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },
+		{ 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
+		{ 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
+		{ 0xE0100, 0xE01EF }
+	};
 
-  /* test for 8-bit control characters */
-  if (ucs == 0)
-    return 0;
-  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
-    return -1;
+	/* Test for 8-bit control characters */
+	if (ucs == 0)
+		return (0);
+	if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
+		return (-1);
 
-  /* binary search in table of non-spacing characters */
-  if (bisearch(ucs, combining,
-	       sizeof(combining) / sizeof(struct interval) - 1))
-    return 0;
+	/* Binary search in table of non-spacing characters */
+	if (bisearch(ucs, combining, sizeof(combining) /
+	    sizeof(struct interval) - 1))
+		return (0);
+
+	/*
+	 * If we arrive here, ucs is not a combining or C0/C1 control character
+	 */
+	return (1 +
+	    (ucs >= 0x1100 &&
+	    (ucs <= 0x115f ||			/* Hangul Jamo init. consonants */
+	    ucs == 0x2329 || ucs == 0x232a ||
+	    (ucs >= 0x2e80 && ucs <= 0xa4cf &&
+	    ucs != 0x303f) ||			/* CJK ... Yi */
+	    (ucs >= 0xac00 && ucs <= 0xd7a3) ||	/* Hangul Syllables */
+	    (ucs >= 0xf900 && ucs <= 0xfaff) ||	/* CJK Compatibility Ideographs */
+	    (ucs >= 0xfe10 && ucs <= 0xfe19) ||	/* Vertical forms */
+	    (ucs >= 0xfe30 && ucs <= 0xfe6f) ||	/* CJK Compatibility Forms */
+	    (ucs >= 0xff00 && ucs <= 0xff60) ||	/* Fullwidth Forms */
+	    (ucs >= 0xffe0 && ucs <= 0xffe6) ||
+	    (ucs >= 0x20000 && ucs <= 0x2fffd) ||
+	    (ucs >= 0x30000 && ucs <= 0x3fffd))));
+}
 
-  /* if we arrive here, ucs is not a combining or C0/C1 control character */
+/*
+ * Converts an UTF-8 byte sequence to a codepoint as specified in
+ * https://datatracker.ietf.org/doc/html/rfc3629#section-3 . The function
+ * expects the 'bytes' array to start with the leading character.
+ */
+static inline teken_char_t
+teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes)
+{
+	/*
+	 * Check for malformed characters by comparing 'nbytes' to the byte
+	 * length of the character.
+	 *
+	 * The table in section 3 of RFC 3629 defines 4 different values
+	 * indicating the length of a UTF-8 byte sequence.
+	 *
+	 * 0xxxxxxx -> 1 byte
+	 * 110xxxxx -> 2 bytes
+	 * 1110xxxx -> 3 bytes
+	 * 11110xxx -> 4 bytes
+	 *
+	 * The length is determined by the higher-order bits in the leading
+	 * octet (except in the first case, where an MSB of 0 means a byte
+	 * length of 1). Here we flip the 4 upper bits and count the leading
+	 * zeros using __builtin_clz() to determine the number of bytes.
+	 */
+	if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes)
+		return (TEKEN_UTF8_INVALID_CODEPOINT);
 
-  return 1 +
-    (ucs >= 0x1100 &&
-     (ucs <= 0x115f ||                    /* Hangul Jamo init. consonants */
-      ucs == 0x2329 || ucs == 0x232a ||
-      (ucs >= 0x2e80 && ucs <= 0xa4cf &&
-       ucs != 0x303f) ||                  /* CJK ... Yi */
-      (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
-      (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
-      (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
-      (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
-      (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
-      (ucs >= 0xffe0 && ucs <= 0xffe6) ||
-      (ucs >= 0x20000 && ucs <= 0x2fffd) ||
-      (ucs >= 0x30000 && ucs <= 0x3fffd)));
+	switch (nbytes) {
+	case 1:
+		return (bytes[0] & 0x7f);
+	case 2:
+		return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f);
+	case 3:
+		return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 |
+		    (bytes[2] & 0x3f);
+	case 4:
+		return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 |
+		    (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f);
+	default:
+		return (TEKEN_UTF8_INVALID_CODEPOINT);
+	}
 }
diff --git a/sys/tests/ktest.c b/sys/tests/ktest.c
index 495fedf95dde..cd83a6aaaa3f 100644
--- a/sys/tests/ktest.c
+++ b/sys/tests/ktest.c
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_netlink.h"
-
 #include <sys/param.h>
 #include <sys/refcount.h>
 #include <sys/types.h>
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 502666252476..562fd7d289a5 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -1964,8 +1964,8 @@ swap_pager_swapoff_object(struct swdevt *sp, vm_object_t object)
 			if (rv != VM_PAGER_OK)
 				panic("%s: read from swap failed: %d",
 				    __func__, rv);
-			vm_object_pip_wakeupn(object, 1);
 			VM_OBJECT_WLOCK(object);
+			vm_object_pip_wakeupn(object, 1);
 			vm_page_xunbusy(m);
 
 			/*
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index be75ba89d224..a787240f4d99 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -198,6 +198,11 @@ vm_page_init(void *dummy)
 	bogus_page = vm_page_alloc_noobj(VM_ALLOC_WIRED);
 }
 
+static int pgcache_zone_max_pcpu;
+SYSCTL_INT(_vm, OID_AUTO, pgcache_zone_max_pcpu,
+    CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &pgcache_zone_max_pcpu, 0,
+    "Per-CPU page cache size");
+
 /*
  * The cache page zone is initialized later since we need to be able to allocate
  * pages before UMA is fully initialized.
@@ -209,9 +214,8 @@ vm_page_init_cache_zones(void *dummy __unused)
 	struct vm_pgcache *pgcache;
 	int cache, domain, maxcache, pool;
 
-	maxcache = 0;
-	TUNABLE_INT_FETCH("vm.pgcache_zone_max_pcpu", &maxcache);
-	maxcache *= mp_ncpus;
+	TUNABLE_INT_FETCH("vm.pgcache_zone_max_pcpu", &pgcache_zone_max_pcpu);
+	maxcache = pgcache_zone_max_pcpu * mp_ncpus;
 	for (domain = 0; domain < vm_ndomains; domain++) {
 		vmd = VM_DOMAIN(domain);
 		for (pool = 0; pool < VM_NFREEPOOL; pool++) {
diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c
index 108297caac49..bc992bdfc58b 100644
--- a/sys/vm/vm_phys.c
+++ b/sys/vm/vm_phys.c
@@ -76,6 +76,12 @@ _Static_assert(sizeof(long long) >= sizeof(vm_paddr_t),
 #ifdef NUMA
 struct mem_affinity __read_mostly *mem_affinity;
 int __read_mostly *mem_locality;
+
+static int numa_disabled;
+static SYSCTL_NODE(_vm, OID_AUTO, numa, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
+    "NUMA options");
+SYSCTL_INT(_vm_numa, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+    &numa_disabled, 0, "NUMA-awareness in the allocators is disabled");
 #endif
 
 int __read_mostly vm_ndomains = 1;
@@ -627,15 +633,14 @@ vm_phys_register_domains(int ndomains, struct mem_affinity *affinity,
     int *locality)
 {
 #ifdef NUMA
-	int d, i;
+	int i;
 
 	/*
 	 * For now the only override value that we support is 1, which
 	 * effectively disables NUMA-awareness in the allocators.
 	 */
-	d = 0;
-	TUNABLE_INT_FETCH("vm.numa.disabled", &d);
-	if (d)
+	TUNABLE_INT_FETCH("vm.numa.disabled", &numa_disabled);
+	if (numa_disabled)
 		ndomains = 1;
 
 	if (ndomains > 1) {
diff --git a/sys/x86/include/fpu.h b/sys/x86/include/fpu.h
index e1ec6a592d21..0debf65d6fb9 100644
--- a/sys/x86/include/fpu.h
+++ b/sys/x86/include/fpu.h
@@ -213,4 +213,13 @@ struct savefpu_ymm {
  */
 #define	X86_XSTATE_XCR0_OFFSET	464
 
+#ifdef _KERNEL
+/*
+ * CR0_MP and CR0_EM are always set.  Use CR0_TS to force traps when
+ * FPU access is disabled.
+ */
+#define	fpu_enable()	clts()
+#define	fpu_disable()	load_cr0(rcr0() | CR0_TS)
+#endif
+
 #endif /* !_X86_FPU_H_ */
diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h
index f45990a056c8..4886430c84b6 100644
--- a/sys/x86/include/specialreg.h
+++ b/sys/x86/include/specialreg.h
@@ -1172,6 +1172,7 @@
 /* MSR_DE_CFG */
 #define DE_CFG_10H_12H_STACK_POINTER_JUMP_FIX_BIT	0x1
 #define DE_CFG_ZEN_LOAD_STALE_DATA_FIX_BIT		0x2000
+#define DE_CFG_ZEN2_FP_BACKUP_FIX_BIT			0x200
 
 /* VIA ACE crypto featureset: for via_feature_rng */
 #define	VIA_HAS_RNG		1	/* cpu has RNG */
diff --git a/sys/x86/include/x86_var.h b/sys/x86/include/x86_var.h
index 1629236c5928..44314456d8bf 100644
--- a/sys/x86/include/x86_var.h
+++ b/sys/x86/include/x86_var.h
@@ -90,6 +90,7 @@ extern	int	hw_ssb_active;
 extern	int	x86_taa_enable;
 extern	int	cpu_flush_rsb_ctxsw;
 extern	int	x86_rngds_mitg_enable;
+extern	int	zenbleed_enable;
 extern	int	cpu_amdc1e_bug;
 extern	char	bootmethod[16];
 
@@ -140,6 +141,8 @@ void	hw_mds_recalculate(void);
 void	hw_ssb_recalculate(bool all_cpus);
 void	x86_taa_recalculate(void);
 void	x86_rngds_mitg_recalculate(bool all_cpus);
+void	zenbleed_sanitize_enable(void);
+void	zenbleed_check_and_apply(bool all_cpus);
 void	nmi_call_kdb(u_int cpu, u_int type, struct trapframe *frame);
 void	nmi_call_kdb_smp(u_int type, struct trapframe *frame);
 void	nmi_handle_intr(u_int type, struct trapframe *frame);
diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c
index 8fa642295611..a0bf60159e78 100644
--- a/sys/x86/isa/clock.c
+++ b/sys/x86/isa/clock.c
@@ -411,7 +411,6 @@ startrtclock(void)
 void
 cpu_initclocks(void)
 {
-#ifdef EARLY_AP_STARTUP
 	struct thread *td;
 	int i;
 
@@ -434,13 +433,6 @@ cpu_initclocks(void)
 	if (sched_is_bound(td))
 		sched_unbind(td);
 	thread_unlock(td);
-#else
-	tsc_calibrate();
-#ifdef DEV_APIC
-	lapic_calibrate_timer();
-#endif
-	cpu_initclocks_bsp();
-#endif
 }
 
 static int
diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c
index c80284cf2987..6062b4e85e16 100644
--- a/sys/x86/x86/cpu_machdep.c
+++ b/sys/x86/x86/cpu_machdep.c
@@ -688,7 +688,7 @@ cpu_idle(int busy)
 }
 
 static int cpu_idle_apl31_workaround;
-SYSCTL_INT(_machdep, OID_AUTO, idle_apl31, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, idle_apl31, CTLFLAG_RWTUN | CTLFLAG_NOFETCH,
     &cpu_idle_apl31_workaround, 0,
     "Apollo Lake APL31 MWAIT bug workaround");
 
@@ -802,7 +802,7 @@ cpu_idle_sysctl(SYSCTL_HANDLER_ARGS)
 }
 
 SYSCTL_PROC(_machdep, OID_AUTO, idle,
-    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE,
+    CTLTYPE_STRING | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE,
     0, 0, cpu_idle_sysctl, "A",
     "currently selected idle function");
 
@@ -1477,6 +1477,129 @@ SYSCTL_PROC(_machdep_mitigations_rngds, OID_AUTO, state,
     sysctl_rngds_state_handler, "A",
     "MCU Optimization state");
 
+
+/*
+ * Zenbleed.
+ *
+ * No corresponding errata is publicly listed.  AMD has issued a security
+ * bulletin (AMD-SB-7008), entitled "Cross-Process Information Leak".  This
+ * document lists (as of August 2023) platform firmware's availability target
+ * dates, with most being November/December 2023.  It will then be up to
+ * motherboard manufacturers to produce corresponding BIOS updates, which will
+ * happen with an inevitable lag.  Additionally, for a variety of reasons,
+ * operators might not be able to apply them everywhere due.  On the side of
+ * standalone CPU microcodes, no plans for availability have been published so
+ * far.  However, a developer appearing to be an AMD employee has hardcoded in
+ * Linux revision numbers of future microcodes that are presumed to fix the
+ * vulnerability.
+ *
+ * Given the stability issues encountered with early microcode releases for Rome
+ * (the only microcode publicly released so far) and the absence of official
+ * communication on standalone CPU microcodes, we have opted instead for
+ * matching by default all AMD Zen2 processors which, according to the
+ * vulnerability's discoverer, are all affected (see
+ * https://lock.cmpxchg8b.com/zenbleed.html).  This policy, also adopted by
+ * OpenBSD, may be overriden using the tunable/sysctl
+ * 'machdep.mitigations.zenbleed.enable'.  We might revise it later depending on
+ * official statements, microcode updates' public availability and community
+ * assessment that they actually fix the vulnerability without any instability
+ * side effects.
+ */
+
+SYSCTL_NODE(_machdep_mitigations, OID_AUTO, zenbleed,
+    CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
+    "Zenbleed OS-triggered prevention (via chicken bit)");
+
+/* 2 is auto, see below. */
+int zenbleed_enable = 2;
+
+void
+zenbleed_sanitize_enable(void)
+{
+	/* Default to auto (2). */
+	if (zenbleed_enable < 0 || zenbleed_enable > 2)
+		zenbleed_enable = 2;
+}
+
+static bool
+zenbleed_chicken_bit_applicable(void)
+{
+	/* Concerns only bare-metal AMD Zen2 processors. */
+	return (cpu_vendor_id == CPU_VENDOR_AMD &&
+	    CPUID_TO_FAMILY(cpu_id) == 0x17 &&
+	    CPUID_TO_MODEL(cpu_id) >= 0x30 &&
+	    vm_guest == VM_GUEST_NO);
+}
+
+static bool
+zenbleed_chicken_bit_should_enable(void)
+{
+	/*
+	 * Obey tunable/sysctl.
+	 *
+	 * As explained above, currently, the automatic setting (2) and the "on"
+	 * one (1) have the same effect.  In the future, we might additionally
+	 * check for specific microcode revisions as part of the automatic
+	 * determination.
+	 */
+	return (zenbleed_enable != 0);
+}
+
+void
+zenbleed_check_and_apply(bool all_cpus)
+{
+	bool set;
+
+	if (!zenbleed_chicken_bit_applicable())
+		return;
+
+	set = zenbleed_chicken_bit_should_enable();
+
+	x86_msr_op(MSR_DE_CFG,
+	    (set ? MSR_OP_OR : MSR_OP_ANDNOT) |
+	    (all_cpus ? MSR_OP_RENDEZVOUS_ALL : MSR_OP_LOCAL),
+	    DE_CFG_ZEN2_FP_BACKUP_FIX_BIT, NULL);
+}
+
+static int
+sysctl_zenbleed_enable_handler(SYSCTL_HANDLER_ARGS)
+{
+	int error, val;
+
+	val = zenbleed_enable;
+	error = sysctl_handle_int(oidp, &val, 0, req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+	zenbleed_enable = val;
+	zenbleed_sanitize_enable();
+	zenbleed_check_and_apply(true);
+	return (0);
+}
+SYSCTL_PROC(_machdep_mitigations_zenbleed, OID_AUTO, enable, CTLTYPE_INT |
+    CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE, NULL, 0,
+    sysctl_zenbleed_enable_handler, "I",
+    "Enable Zenbleed OS-triggered mitigation (chicken bit) "
+    "(0: Force disable, 1: Force enable, 2: Automatic determination)");
+
+static int
+sysctl_zenbleed_state_handler(SYSCTL_HANDLER_ARGS)
+{
+	const char *state;
+
+	if (!zenbleed_chicken_bit_applicable())
+		state = "Not applicable";
+	else if (zenbleed_chicken_bit_should_enable())
+		state = "Mitigation enabled";
+	else
+		state = "Mitigation disabled";
+	return (SYSCTL_OUT(req, state, strlen(state)));
+}
+SYSCTL_PROC(_machdep_mitigations_zenbleed, OID_AUTO, state,
+    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
+    sysctl_zenbleed_state_handler, "A",
+    "Zenbleed OS-triggered mitigation (chicken bit) state");
+
+
 /*
  * Enable and restore kernel text write permissions.
  * Callers must ensure that disable_wp()/restore_wp() are executed
diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c
index b43fa790d264..458a0cb396bb 100644
--- a/sys/x86/x86/intr_machdep.c
+++ b/sys/x86/x86/intr_machdep.c
@@ -90,7 +90,7 @@ static TAILQ_HEAD(pics_head, pic) pics;
 u_int num_io_irqs;
 
 #if defined(SMP) && !defined(EARLY_AP_STARTUP)
-static int assign_cpu;
+#error EARLY_AP_STARTUP required on x86
 #endif
 
 #define	INTRNAME_LEN	(MAXCOMLEN + 1)
@@ -399,18 +399,10 @@ intr_assign_cpu(void *arg, int cpu)
 	struct intsrc *isrc;
 	int error;
 
-#ifdef EARLY_AP_STARTUP
 	MPASS(mp_ncpus == 1 || smp_started);
 
 	/* Nothing to do if there is only a single CPU. */
 	if (mp_ncpus > 1 && cpu != NOCPU) {
-#else
-	/*
-	 * Don't do anything during early boot.  We will pick up the
-	 * assignment once the APs are started.
-	 */
-	if (assign_cpu && cpu != NOCPU) {
-#endif
 		isrc = arg;
 		sx_xlock(&intrsrc_lock);
 		error = isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]);
@@ -620,15 +612,9 @@ intr_next_cpu(int domain)
 {
 	u_int apic_id;
 
-#ifdef EARLY_AP_STARTUP
 	MPASS(mp_ncpus == 1 || smp_started);
 	if (mp_ncpus == 1)
 		return (PCPU_GET(apic_id));
-#else
-	/* Leave all interrupts on the BSP during boot. */
-	if (!assign_cpu)
-		return (PCPU_GET(apic_id));
-#endif
 
 	if (intr_no_domain)
 		domain = 0;
@@ -662,7 +648,6 @@ intr_add_cpu(u_int cpu)
 	CPU_SET(cpu, &intr_cpus);
 }
 
-#ifdef EARLY_AP_STARTUP
 static void
 intr_smp_startup(void *arg __unused)
 {
@@ -673,52 +658,6 @@ intr_smp_startup(void *arg __unused)
 SYSINIT(intr_smp_startup, SI_SUB_SMP, SI_ORDER_SECOND, intr_smp_startup,
     NULL);
 
-#else
-/*
- * Distribute all the interrupt sources among the available CPUs once the
- * AP's have been launched.
- */
-static void
-intr_shuffle_irqs(void *arg __unused)
-{
-	struct intsrc *isrc;
-	u_int cpu, i;
-
-	intr_init_cpus();
-	/* Don't bother on UP. */
-	if (mp_ncpus == 1)
-		return;
-
-	/* Round-robin assign a CPU to each enabled source. */
-	sx_xlock(&intrsrc_lock);
-	assign_cpu = 1;
-	for (i = 0; i < num_io_irqs; i++) {
-		isrc = interrupt_sources[i];
-		if (isrc != NULL && isrc->is_handlers > 0) {
-			/*
-			 * If this event is already bound to a CPU,
-			 * then assign the source to that CPU instead
-			 * of picking one via round-robin.  Note that
-			 * this is careful to only advance the
-			 * round-robin if the CPU assignment succeeds.
-			 */
-			cpu = isrc->is_event->ie_cpu;
-			if (cpu == NOCPU)
-				cpu = current_cpu[isrc->is_domain];
-			if (isrc->is_pic->pic_assign_cpu(isrc,
-			    cpu_apic_ids[cpu]) == 0) {
-				isrc->is_cpu = cpu;
-				if (isrc->is_event->ie_cpu == NOCPU)
-					intr_next_cpu(isrc->is_domain);
-			}
-		}
-	}
-	sx_xunlock(&intrsrc_lock);
-}
-SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs,
-    NULL);
-#endif
-
 /*
  * TODO: Export this information in a non-MD fashion, integrate with vmstat -i.
  */
diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c
index b382368cc626..43fe4625cd08 100644
--- a/sys/x86/x86/local_apic.c
+++ b/sys/x86/x86/local_apic.c
@@ -876,22 +876,8 @@ lapic_enable_pmc(void)
 
 	lvts[APIC_LVT_PMC].lvt_masked = 0;
 
-#ifdef EARLY_AP_STARTUP
 	MPASS(mp_ncpus == 1 || smp_started);
 	smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL);
-#else
-#ifdef SMP
-	/*
-	 * If hwpmc was loaded at boot time then the APs may not be
-	 * started yet.  In that case, don't forward the request to
-	 * them as they will program the lvt when they start.
-	 */
-	if (smp_started)
-		smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL);
-	else
-#endif
-		lapic_update_pmc(NULL);
-#endif
 	return (1);
 #else
 	return (0);
diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c
index dca6b935e4a3..b293fcedbd84 100644
--- a/sys/x86/x86/mca.c
+++ b/sys/x86/x86/mca.c
@@ -1077,11 +1077,7 @@ mca_startup(void *dummy)
 	taskqueue_enqueue_timeout_sbt(mca_tq, &mca_scan_task,
 	    mca_ticks * SBT_1S, 0, C_PREL(1));
 }
-#ifdef EARLY_AP_STARTUP
 SYSINIT(mca_startup, SI_SUB_KICK_SCHEDULER, SI_ORDER_ANY, mca_startup, NULL);
-#else
-SYSINIT(mca_startup, SI_SUB_SMP, SI_ORDER_ANY, mca_startup, NULL);
-#endif
 
 #ifdef DEV_APIC
 static void
diff --git a/sys/x86/x86/mp_x86.c b/sys/x86/x86/mp_x86.c
index ddcb54b63d88..11b11471d736 100644
--- a/sys/x86/x86/mp_x86.c
+++ b/sys/x86/x86/mp_x86.c
@@ -1133,11 +1133,6 @@ init_secondary_tail(void)
 	while (atomic_load_acq_int(&smp_started) == 0)
 		ia32_pause();
 
-#ifndef EARLY_AP_STARTUP
-	/* Start per-CPU event timers. */
-	cpu_initclocks_ap();
-#endif
-
 	kcsan_cpu_init(cpuid);
 
 	sched_ap_entry();
diff --git a/tests/atf_python/Makefile b/tests/atf_python/Makefile
index 889cdcdf9592..6b7c39948b0a 100644
--- a/tests/atf_python/Makefile
+++ b/tests/atf_python/Makefile
@@ -2,6 +2,8 @@
 
 .PATH:	${.CURDIR}
 
+PACKAGE=	tests
+
 FILES=	__init__.py atf_pytest.py ktest.py utils.py
 SUBDIR=	sys
 
diff --git a/tests/atf_python/sys/net/vnet.py b/tests/atf_python/sys/net/vnet.py
index 8942e6839b35..67fe15fff69c 100644
--- a/tests/atf_python/sys/net/vnet.py
+++ b/tests/atf_python/sys/net/vnet.py
@@ -19,7 +19,8 @@
 
 
 def run_cmd(cmd: str, verbose=True) -> str:
-    print("run: '{}'".format(cmd))
+    if verbose:
+        print("run: '{}'".format(cmd))
     return os.popen(cmd).read()
 
 
@@ -81,13 +82,9 @@ def set_vnet(self, vnet_name: str):
     def set_jailed(self, jailed: bool):
         self.jailed = jailed
 
-    def run_cmd(
-        self,
-        cmd,
-        verbose=False,
-    ):
+    def run_cmd(self, cmd, verbose=False):
         if self.vnet_name and not self.jailed:
-            cmd = "jexec {} {}".format(self.vnet_name, cmd)
+            cmd = "/usr/sbin/jexec {} {}".format(self.vnet_name, cmd)
         return run_cmd(cmd, verbose)
 
     @classmethod
@@ -180,13 +177,15 @@ def create_iface(self, alias_name: str, iface_name: str) -> List[VnetInterface]:
 
     @staticmethod
     def is_autodeleted(iface_name: str) -> bool:
+        if iface_name == "lo0":
+            return False
         iface_type = re.split(r"\d+", iface_name)[0]
         return iface_type in IfaceFactory.AUTODELETE_TYPES
 
     def cleanup_vnet_interfaces(self, vnet_name: str) -> List[str]:
         """Destroys"""
         ifaces_lst = ToolsHelper.get_output(
-            "/usr/sbin/jexec {} ifconfig -l".format(vnet_name)
+            "/usr/sbin/jexec {} /sbin/ifconfig -l".format(vnet_name)
         )
         for iface_name in ifaces_lst.split():
             if not self.is_autodeleted(iface_name):
@@ -194,7 +193,7 @@ def cleanup_vnet_interfaces(self, vnet_name: str) -> List[str]:
                     print("Skipping interface {}:{}".format(vnet_name, iface_name))
                     continue
             run_cmd(
-                "/usr/sbin/jexec {} ifconfig {} destroy".format(vnet_name, iface_name)
+                "/usr/sbin/jexec {} /sbin/ifconfig {} destroy".format(vnet_name, iface_name)
             )
 
     def cleanup(self):
@@ -226,10 +225,10 @@ def __init__(
         self.pipe = None
         self.subprocess = None
 
-    def run_vnet_cmd(self, cmd):
+    def run_vnet_cmd(self, cmd, verbose=True):
         if not self.attached:
-            cmd = "jexec {} {}".format(self.name, cmd)
-        return run_cmd(cmd)
+            cmd = "/usr/sbin/jexec {} {}".format(self.name, cmd)
+        return run_cmd(cmd, verbose)
 
     def disable_dad(self):
         self.run_vnet_cmd("/sbin/sysctl net.inet6.ip6.dad_count=0")
@@ -266,7 +265,7 @@ def _register_vnet(self, vnet_name: str):
 
     @staticmethod
     def _wait_interfaces(vnet_name: str, ifaces: List[str]) -> List[str]:
-        cmd = "jexec {} /sbin/ifconfig -l".format(vnet_name)
+        cmd = "/usr/sbin/jexec {} /sbin/ifconfig -l".format(vnet_name)
         not_matched: List[str] = []
         for i in range(50):
             vnet_ifaces = run_cmd(cmd).strip().split(" ")
@@ -490,7 +489,7 @@ def cleanup(self, test_id: str):
         # pytest test id: file::class::test_name
         topology_id = get_topology_id(self.test_id)
 
-        print("==== vnet cleanup ===")
+        print("============= vnet cleanup =============")
         print("# topology_id: '{}'".format(topology_id))
         VnetFactory(topology_id).cleanup()
         IfaceFactory().cleanup()
diff --git a/tests/sys/common/vnet.subr b/tests/sys/common/vnet.subr
index 50abadaec81d..183f7284d614 100644
--- a/tests/sys/common/vnet.subr
+++ b/tests/sys/common/vnet.subr
@@ -79,7 +79,7 @@ vnet_ifrename_jail()
 	ifname=$2
 	ifnewname=$3
 
-	jexec ${jailname} ifconfig $ifname name $ifnewname
+	ifconfig -j ${jailname} $ifname name $ifnewname
 	sed -i "" "/^${jailname}/s/${ifname}/${ifnewname}/" created_jails.lst
 }
 
@@ -88,7 +88,7 @@ vnet_cleanup()
 	if [ -f created_jails.lst ]; then
 		while read jailname ifnames; do
 			for ifname in ${ifnames}; do
-				jexec ${jailname} ifconfig ${ifname} destroy
+				ifconfig -j ${jailname} ${ifname} destroy
 			done
 			jail -r ${jailname}
 		done < created_jails.lst
@@ -96,10 +96,9 @@ vnet_cleanup()
 	fi
 
 	if [ -f created_interfaces.lst ]; then
-		for ifname in `cat created_interfaces.lst`
-		do
+		while read ifname; do
 			ifconfig ${ifname} destroy
-		done
+		done < created_interfaces.lst
 		rm created_interfaces.lst
 	fi
 }
diff --git a/tests/sys/fs/fusefs/mkdir.cc b/tests/sys/fs/fusefs/mkdir.cc
index 48453ff8bb8a..f020feb94ed8 100644
--- a/tests/sys/fs/fusefs/mkdir.cc
+++ b/tests/sys/fs/fusefs/mkdir.cc
@@ -241,7 +241,6 @@ TEST_F(Mkdir, parent_inode)
 
 	ASSERT_EQ(-1, mkdir(FULLPATH, mode));
 	ASSERT_EQ(EIO, errno);
-	usleep(100000);
 }
 
 TEST_F(Mkdir_7_8, ok)
diff --git a/tests/sys/fs/fusefs/mknod.cc b/tests/sys/fs/fusefs/mknod.cc
index 223d38f8acb1..1fb855f44f29 100644
--- a/tests/sys/fs/fusefs/mknod.cc
+++ b/tests/sys/fs/fusefs/mknod.cc
@@ -32,6 +32,7 @@ extern "C" {
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <semaphore.h>
 }
 
 #include "mockfs.hh"
@@ -255,14 +256,18 @@ TEST_F(Mknod, parent_inode)
 	const char RELPATH[] = "some_node";
 	mode_t mode = S_IFSOCK | 0755;
 	struct sockaddr_un sa;
+	sem_t sem;
 	int fd;
 	dev_t rdev = -1;	/* Really it's a don't care */
 	uint64_t ino = 42;
 
+	ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno);
+
 	expect_lookup(PPATH, ino, S_IFDIR | 0755, 0, 1);
 	EXPECT_LOOKUP(ino, RELPATH)
 	.WillOnce(Invoke(ReturnErrno(ENOENT)));
 	expect_mknod(ino, RELPATH, ino, mode, rdev);
+	expect_forget(ino, 1, &sem);
 
 	fd = socket(AF_UNIX, SOCK_STREAM, 0);
 	ASSERT_LE(0, fd) << strerror(errno);
@@ -273,6 +278,8 @@ TEST_F(Mknod, parent_inode)
 	ASSERT_EQ(EIO, errno);
 
 	leak(fd);
+	sem_wait(&sem);
+	sem_destroy(&sem);
 }
 
 /* 
diff --git a/tests/sys/fs/fusefs/readdir.cc b/tests/sys/fs/fusefs/readdir.cc
index 5fd8f25e8bb7..6b78e3a70697 100644
--- a/tests/sys/fs/fusefs/readdir.cc
+++ b/tests/sys/fs/fusefs/readdir.cc
@@ -321,6 +321,50 @@ TEST_F(Readdir, nodots)
 	leakdir(dir);
 }
 
+/*
+ * FUSE_READDIR returns a path with an embedded NUL. Obviously illegal, but
+ * nothing bad should happen.
+ */
+TEST_F(Readdir, nul)
+{
+	const char FULLPATH[] = "mountpoint/some_dir";
+	const char RELPATH[] = "some_dir";
+	uint64_t ino = 42;
+	DIR *dir;
+	struct dirent *de;
+	vector<struct dirent> ents(1);
+	vector<struct dirent> empty_ents(0);
+	const char nul[] = "foo\0bar";
+
+	expect_lookup(RELPATH, ino);
+	expect_opendir(ino);
+	ents[0].d_fileno = 4;
+	ents[0].d_off = 4000;
+	ents[0].d_namlen = sizeof(nul);
+	ents[0].d_type = DT_REG;
+	strncpy(ents[0].d_name, nul, ents[0].d_namlen);
+	expect_readdir(ino, 0, ents);
+	expect_readdir(ino, 4000, empty_ents);
+
+	errno = 0;
+	dir = opendir(FULLPATH);
+	ASSERT_NE(nullptr, dir) << strerror(errno);
+
+	errno = 0;
+	de = readdir(dir);
+	ASSERT_NE(nullptr, de) << strerror(errno);
+	EXPECT_EQ(4ul, de->d_fileno);
+	EXPECT_EQ(DT_REG, de->d_type);
+	EXPECT_EQ(sizeof(nul), de->d_namlen);
+	EXPECT_EQ(0, strcmp(nul, de->d_name));
+
+	ASSERT_EQ(nullptr, readdir(dir));
+	ASSERT_EQ(0, errno);
+
+	leakdir(dir);
+}
+
+
 /* telldir(3) and seekdir(3) should work with fuse */
 TEST_F(Readdir, seekdir)
 {
@@ -397,6 +441,49 @@ TEST_F(Readdir, seekdir)
 	leakdir(dir);
 }
 
+/*
+ * FUSE_READDIR returns a path with an embedded /. Obviously illegal, but
+ * nothing bad should happen.
+ */
+TEST_F(Readdir, slash)
+{
+	const char FULLPATH[] = "mountpoint/some_dir";
+	const char RELPATH[] = "some_dir";
+	uint64_t ino = 42;
+	DIR *dir;
+	struct dirent *de;
+	vector<struct dirent> ents(1);
+	vector<struct dirent> empty_ents(0);
+	const char foobar[] = "foo/bar";
+
+	expect_lookup(RELPATH, ino);
+	expect_opendir(ino);
+	ents[0].d_fileno = 4;
+	ents[0].d_off = 4000;
+	ents[0].d_namlen = sizeof(foobar);
+	ents[0].d_type = DT_REG;
+	strncpy(ents[0].d_name, foobar, ents[0].d_namlen);
+	expect_readdir(ino, 0, ents);
+	expect_readdir(ino, 4000, empty_ents);
+
+	errno = 0;
+	dir = opendir(FULLPATH);
+	ASSERT_NE(nullptr, dir) << strerror(errno);
+
+	errno = 0;
+	de = readdir(dir);
+	ASSERT_NE(nullptr, de) << strerror(errno);
+	EXPECT_EQ(4ul, de->d_fileno);
+	EXPECT_EQ(DT_REG, de->d_type);
+	EXPECT_EQ(sizeof(foobar), de->d_namlen);
+	EXPECT_EQ(0, strcmp(foobar, de->d_name));
+
+	ASSERT_EQ(nullptr, readdir(dir));
+	ASSERT_EQ(0, errno);
+
+	leakdir(dir);
+}
+
 TEST_F(Readdir_7_8, nodots)
 {
 	const char FULLPATH[] = "mountpoint/some_dir";
diff --git a/tests/sys/fs/fusefs/readlink.cc b/tests/sys/fs/fusefs/readlink.cc
index ff9aa08f6fae..30815f2cd4b6 100644
--- a/tests/sys/fs/fusefs/readlink.cc
+++ b/tests/sys/fs/fusefs/readlink.cc
@@ -79,6 +79,45 @@ TEST_F(Readlink, eloop)
 	EXPECT_EQ(ELOOP, errno);
 }
 
+/*
+ * If a malicious or buggy server returns a NUL in the FUSE_READLINK result, it
+ * should be handled gracefully.
+ * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274268
+ */
+TEST_F(Readlink, embedded_nul)
+{
+	const char FULLPATH[] = "mountpoint/src";
+	const char RELPATH[] = "src";
+	const char dst[] = "dst\0stuff";
+	char buf[80];
+	const uint64_t ino = 42;
+
+	EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH)
+	.WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) {
+		SET_OUT_HEADER_LEN(out, entry);
+		out.body.entry.attr.mode = S_IFLNK | 0777;
+		out.body.entry.nodeid = ino;
+		out.body.entry.attr_valid = UINT64_MAX;
+		out.body.entry.entry_valid = UINT64_MAX;
+	})));
+
+	EXPECT_CALL(*m_mock, process(
+		ResultOf([=](auto in) {
+			return (in.header.opcode == FUSE_READLINK &&
+				in.header.nodeid == ino);
+		}, Eq(true)),
+		_)
+	).WillRepeatedly(Invoke(ReturnImmediate([=](auto in __unused, auto& out) {
+		memcpy(out.body.str, dst, sizeof(dst));
+		out.header.len = sizeof(out.header) + sizeof(dst) + 1;
+	})));
+
+	EXPECT_EQ(-1, readlink(FULLPATH, buf, sizeof(buf)));
+	EXPECT_EQ(EIO, errno);
+	EXPECT_EQ(-1, access(FULLPATH, R_OK));
+	EXPECT_EQ(EIO, errno);
+}
+
 TEST_F(Readlink, ok)
 {
 	const char FULLPATH[] = "mountpoint/src";
diff --git a/tests/sys/fs/fusefs/symlink.cc b/tests/sys/fs/fusefs/symlink.cc
index 19286a446fc3..bd355497a8bd 100644
--- a/tests/sys/fs/fusefs/symlink.cc
+++ b/tests/sys/fs/fusefs/symlink.cc
@@ -29,6 +29,7 @@
  */
 
 extern "C" {
+#include <semaphore.h>
 #include <unistd.h>
 }
 
@@ -174,15 +175,22 @@ TEST_F(Symlink, parent_ino)
 	const char PPATH[] = "parent";
 	const char RELPATH[] = "src";
 	const char dst[] = "dst";
+	sem_t sem;
 	const uint64_t ino = 42;
 
+	ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno);
+
 	expect_lookup(PPATH, ino, S_IFDIR | 0755, 0, 1);
 	EXPECT_LOOKUP(ino, RELPATH)
 	.WillOnce(Invoke(ReturnErrno(ENOENT)));
 	expect_symlink(ino, dst, RELPATH);
+	expect_forget(ino, 1, &sem);
 
 	EXPECT_EQ(-1, symlink(dst, FULLPATH));
 	EXPECT_EQ(EIO, errno);
+
+	sem_wait(&sem);
+	sem_destroy(&sem);
 }
 
 TEST_F(Symlink_7_8, ok)
diff --git a/tests/sys/geom/class/eli/setkey_test.sh b/tests/sys/geom/class/eli/setkey_test.sh
index ce3833f5fe0c..34fb8221ab04 100644
--- a/tests/sys/geom/class/eli/setkey_test.sh
+++ b/tests/sys/geom/class/eli/setkey_test.sh
@@ -108,9 +108,9 @@ setkey_passphrase_body()
 	atf_check dd if=/dev/random of=rnd bs=512 count=${sectors} status=none
 	hash1=`dd if=rnd bs=512 count=${sectors} status=none | md5`
 	atf_check_equal 0 $?
-	atf_check dd if=/dev/random of=pass1 bs=512 count=32 status=none
-	atf_check dd if=/dev/random of=pass2 bs=512 count=32 status=none
-	atf_check dd if=/dev/random of=pass3 bs=512 count=32 status=none
+	atf_check dd if=/dev/random of=pass1 bs=512 count=1 status=none
+	atf_check dd if=/dev/random of=pass2 bs=512 count=1 status=none
+	atf_check dd if=/dev/random of=pass3 bs=512 count=1 status=none
 
 	atf_check geli init -B none -J pass1 ${md}
 	atf_check geli attach -j pass1 ${md}
diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile
index 9deb0b1c786a..664d9fdf3afd 100644
--- a/tests/sys/kern/Makefile
+++ b/tests/sys/kern/Makefile
@@ -51,6 +51,8 @@ TEST_METADATA.unix_seqpacket_test+=	timeout="15"
 ATF_TESTS_C+=	unix_socketpair_test
 ATF_TESTS_C+=	waitpid_nohang
 ATF_TESTS_C+=	pdeathsig
+ATF_TESTS_C+=	sigsys
+TEST_METADATA.sigsys+=	is_exclusive="true"
 
 ATF_TESTS_SH+=	coredump_phnum_test
 ATF_TESTS_SH+=	sonewconn_overflow
diff --git a/tests/sys/kern/sigsys.c b/tests/sys/kern/sigsys.c
new file mode 100644
index 000000000000..8554a646ebc6
--- /dev/null
+++ b/tests/sys/kern/sigsys.c
@@ -0,0 +1,142 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * This software were developed by Konstantin Belousov <kib@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ */
+
+#include <sys/param.h>
+#include <sys/syscall.h>
+#include <sys/sysctl.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdatomic.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+static sig_atomic_t sigsys_cnt;
+
+#define	SAVEDVALUE	"savedsignosys"
+
+static void
+sigsys_handler(int signo, siginfo_t *si, void *ucp)
+{
+	sigsys_cnt++;
+}
+
+static void
+sigsys_test(int knob)
+{
+	struct sigaction sa;
+
+	memset(&sa, 0, sizeof(sa));
+	sa.sa_sigaction = sigsys_handler;
+	sa.sa_flags = SA_SIGINFO;
+	ATF_REQUIRE(sigaction(SIGSYS, &sa, NULL) == 0);
+
+	ATF_REQUIRE(syscall(273) == -1);	/* reserved */
+	ATF_CHECK_ERRNO(ENOSYS, true);
+	atomic_signal_fence(memory_order_seq_cst);
+	ATF_CHECK_EQ(1 * knob, sigsys_cnt * knob);
+
+	ATF_REQUIRE(syscall(440) == -1);	/* SYS_kse_switchin */
+	ATF_CHECK_ERRNO(ENOSYS, true);
+	atomic_signal_fence(memory_order_seq_cst);
+	ATF_CHECK_EQ(2 * knob, sigsys_cnt * knob);
+
+	/* Hope this is enough for say next two months */
+	ATF_REQUIRE(syscall(3000000) == -1);
+	ATF_CHECK_ERRNO(ENOSYS, true);
+	atomic_signal_fence(memory_order_seq_cst);
+	ATF_CHECK_EQ(3 * knob, sigsys_cnt * knob);
+
+	ATF_REQUIRE(syscall(SYS_afs3_syscall) == -1);
+	ATF_CHECK_ERRNO(ENOSYS, true);
+	atomic_signal_fence(memory_order_seq_cst);
+	ATF_CHECK_EQ(4 * knob, sigsys_cnt * knob);
+}
+
+static void
+sysctlset(const char *name, int val)
+{
+	size_t oldlen;
+	int oldval;
+	char buf[80];
+
+	ATF_REQUIRE(sysctlbyname(name, &oldval, &oldlen, NULL, 0) == 0);
+
+	/* Store old %name in a symlink for cleanup */
+	snprintf(buf, sizeof(buf), "%d", oldval);
+	ATF_REQUIRE(symlink(buf, SAVEDVALUE) == 0);
+
+	ATF_REQUIRE(sysctlbyname(name, NULL, NULL, &val, sizeof(val)) == 0);
+}
+
+static void
+sysctlcleanup(const char *name)
+{
+	size_t oldlen;
+	int n, oldval;
+	char buf[80];
+
+	if ((n = readlink(SAVEDVALUE, buf, sizeof(buf))) > 0) {
+		buf[MIN((size_t)n, sizeof(buf) - 1)] = '\0';
+		if (sscanf(buf, "%d", &oldval) == 1) {
+			oldlen = sizeof(oldval);
+			(void)sysctlbyname(name, NULL, 0,
+			    &oldval, oldlen);
+		}
+	}
+	(void)unlink(SAVEDVALUE);
+}
+
+ATF_TC_WITH_CLEANUP(sigsys_test_on);
+ATF_TC_HEAD(sigsys_test_on, tc)
+{
+	atf_tc_set_md_var(tc, "require.user", "root");
+	atf_tc_set_md_var(tc, "require.config", "allow_sysctl_side_effects");
+	atf_tc_set_md_var(tc, "descr",
+	    "Testing delivery of SIGSYS on invalid syscalls");
+}
+
+ATF_TC_BODY(sigsys_test_on, tc)
+{
+	sysctlset("kern.signosys", 1);
+	sigsys_test(1);
+}
+
+ATF_TC_CLEANUP(sigsys_test_on, tc)
+{
+	sysctlcleanup("kern.signosys");
+}
+
+ATF_TC_WITH_CLEANUP(sigsys_test_off);
+ATF_TC_HEAD(sigsys_test_off, tc)
+{
+	atf_tc_set_md_var(tc, "require.user", "root");
+	atf_tc_set_md_var(tc, "require.config", "allow_sysctl_side_effects");
+	atf_tc_set_md_var(tc, "descr",
+	    "Testing SIGSYS silence on invalid syscalls");
+}
+
+ATF_TC_BODY(sigsys_test_off, tc)
+{
+	sysctlset("kern.signosys", 0);
+	sigsys_test(0);
+}
+
+ATF_TC_CLEANUP(sigsys_test_off, tc)
+{
+	sysctlcleanup("kern.signosys");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, sigsys_test_on);
+	ATF_TP_ADD_TC(tp, sigsys_test_off);
+	return (atf_no_error());
+}
diff --git a/tests/sys/net/if_ovpn/if_ovpn.sh b/tests/sys/net/if_ovpn/if_ovpn.sh
index c052a6d7eb47..bbaffa0bce73 100644
--- a/tests/sys/net/if_ovpn/if_ovpn.sh
+++ b/tests/sys/net/if_ovpn/if_ovpn.sh
@@ -805,14 +805,18 @@ ra_body()
 	ifconfig ${bridge} addm ${two}a
 
 	vnet_mkjail srv ${srv}b ${lan}a
+	jexec srv ifconfig lo0 inet 127.0.0.1/8 up
 	jexec srv ifconfig ${srv}b 192.0.2.1/24 up
 	jexec srv ifconfig ${lan}a 203.0.113.1/24 up
 	vnet_mkjail lan ${lan}b
+	jexec lan ifconfig lo0 inet 127.0.0.1/8 up
 	jexec lan ifconfig ${lan}b 203.0.113.2/24 up
 	jexec lan route add default 203.0.113.1
 	vnet_mkjail one ${one}b
+	jexec one ifconfig lo0 inet 127.0.0.1/8 up
 	jexec one ifconfig ${one}b 192.0.2.2/24 up
 	vnet_mkjail two ${two}b
+	jexec two ifconfig lo0 inet 127.0.0.1/8 up
 	jexec two ifconfig ${two}b 192.0.2.3/24 up
 
 	# Sanity checks
@@ -890,7 +894,9 @@ ra_body()
 
 	# Client-to-client communication
 	atf_check -s exit:0 -o ignore jexec one ping -c 1 198.51.100.3
+	atf_check -s exit:0 -o ignore jexec one ping -c 1 198.51.100.2
 	atf_check -s exit:0 -o ignore jexec two ping -c 1 198.51.100.2
+	atf_check -s exit:0 -o ignore jexec two ping -c 1 198.51.100.3
 
 	# RA test
 	atf_check -s exit:0 -o ignore jexec one ping -c 1 203.0.113.1
diff --git a/tests/sys/netinet/arp.sh b/tests/sys/netinet/arp.sh
index 045ccd1dc7a7..9181d38b10b0 100755
--- a/tests/sys/netinet/arp.sh
+++ b/tests/sys/netinet/arp.sh
@@ -120,12 +120,61 @@ pending_delete_if_cleanup() {
 }
 
 
+atf_test_case "arp_lookup_host" "cleanup"
+arp_lookup_host_head() {
+	atf_set descr 'Test looking up a specific host'
+	atf_set require.user root
+}
+
+arp_lookup_host_body() {
+
+	vnet_init
+
+	jname="v4t-arp_lookup_host"
+
+	epair0=$(vnet_mkepair)
+
+	vnet_mkjail ${jname}a ${epair0}a
+	vnet_mkjail ${jname}b ${epair0}b
+
+	ipa=198.51.100.1
+	ipb=198.51.100.2
+
+	atf_check -o ignore \
+		  ifconfig -j ${jname}a ${epair0}a inet ${ipa}/24
+	atf_check -o ignore \
+		  ifconfig -j ${jname}b ${epair0}b inet ${ipb}/24
+
+	# get jail b's MAC address
+	eth="$(ifconfig -j ${jname}b ${epair0}b |
+		sed -nE "s/^\tether ([0-9a-f:]*)$/\1/p")"
+
+	# no entry yet
+	atf_check -s exit:1 -o match:"\(${ipb}\) -- no entry" \
+		  jexec ${jname}a arp -n ${ipb}
+
+	# now ping jail b from jail a
+	atf_check -o ignore \
+		  jexec ${jname}a ping -c1 ${ipb}
+
+	# should be populated
+	atf_check -o match:"\(${ipb}\) at $eth on ${epair0}a" \
+		  jexec ${jname}a arp -n ${ipb}
+
+}
+
+arp_lookup_host_cleanup() {
+	vnet_cleanup
+}
+
+
 atf_init_test_cases()
 {
 
 	atf_add_test_case "arp_add_success"
 	atf_add_test_case "arp_del_success"
 	atf_add_test_case "pending_delete_if"
+	atf_add_test_case "arp_lookup_host"
 }
 
 # end
diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh
index 4ceded782cfb..7cc0d8f35c96 100644
--- a/tests/sys/netpfil/pf/nat.sh
+++ b/tests/sys/netpfil/pf/nat.sh
@@ -61,8 +61,8 @@ exhaust_body()
 	# Sanity check
 	atf_check -s exit:0 -o ignore ping -c 3 198.51.100.2
 
-	echo "foo" | nc -N 198.51.100.2 7
-	echo "foo" | nc -N 198.51.100.2 7
+	atf_check -s exit:0 -o match:foo* echo "foo" | nc -N 198.51.100.2 7
+	atf_check -s exit:0 -o match:foo* echo "foo" | nc -N 198.51.100.2 7
 
 	# This one will fail, but that's expected
 	echo "foo" | nc -N 198.51.100.2 7 &
diff --git a/tests/sys/netpfil/pf/pass_block.sh b/tests/sys/netpfil/pf/pass_block.sh
index 792b73b4a0a5..faf5c2de4de2 100644
--- a/tests/sys/netpfil/pf/pass_block.sh
+++ b/tests/sys/netpfil/pf/pass_block.sh
@@ -28,6 +28,43 @@
 
 common_dir=$(atf_get_srcdir)/../common
 
+atf_test_case "enable_disable" "cleanup"
+enable_disable_head()
+{
+	atf_set descr 'Test enable/disable'
+	atf_set require.user root
+}
+
+enable_disable_body()
+{
+	pft_init
+
+	j="pass_block:enable_disable"
+
+	vnet_mkjail ${j}
+
+	# Disable when disabled fails
+	atf_check -s exit:1 -e ignore \
+	    jexec ${j} pfctl -d
+
+	# Enable succeeds
+	atf_check -s exit:0 -e ignore \
+	    jexec ${j} pfctl -e
+
+	# Enable when enabled fails
+	atf_check -s exit:1 -e ignore \
+	    jexec ${j} pfctl -e
+
+	# Disable succeeds
+	atf_check -s exit:0 -e ignore \
+	    jexec ${j} pfctl -d
+}
+
+enable_disable_cleanup()
+{
+	pft_cleanup
+}
+
 atf_test_case "v4" "cleanup"
 v4_head()
 {
@@ -257,6 +294,7 @@ urpf_cleanup()
 
 atf_init_test_cases()
 {
+	atf_add_test_case "enable_disable"
 	atf_add_test_case "v4"
 	atf_add_test_case "v6"
 	atf_add_test_case "noalias"
diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh
index 80b81205b59d..87dfcf748d3c 100644
--- a/tests/sys/netpfil/pf/pfsync.sh
+++ b/tests/sys/netpfil/pf/pfsync.sh
@@ -78,6 +78,8 @@ common_body()
 		"set skip on ${epair_sync}b" \
 		"pass out keep state"
 
+	hostid_one=$(jexec one pfctl -si -v | awk '/Hostid:/ { gsub(/0x/, "", $2); printf($2); }')
+
 	ifconfig ${epair_one}b 198.51.100.254/24 up
 
 	ping -c 1 -S 198.51.100.254 198.51.100.1
@@ -89,6 +91,12 @@ common_body()
 	    grep 198.51.100.254 ; then
 		atf_fail "state not found on synced host"
 	fi
+
+	if ! jexec two pfctl -sc | grep ""${hostid_one}"";
+	then
+		jexec two pfctl -sc
+		atf_fail "HostID for host one not found on two"
+	fi
 }
 
 basic_cleanup()
@@ -826,6 +834,101 @@ basic_ipv6_cleanup()
 	pfsynct_cleanup
 }
 
+atf_test_case "route_to" "cleanup"
+route_to_head()
+{
+	atf_set descr 'Test route-to with default rule'
+	atf_set require.user root
+	atf_set require.progs scapy
+}
+
+route_to_body()
+{
+	pfsynct_init
+
+	epair_sync=$(vnet_mkepair)
+	epair_one=$(vnet_mkepair)
+	epair_two=$(vnet_mkepair)
+	epair_out_one=$(vnet_mkepair)
+	epair_out_two=$(vnet_mkepair)
+
+	vnet_mkjail one ${epair_one}a ${epair_sync}a ${epair_out_one}a
+	vnet_mkjail two ${epair_two}a ${epair_sync}b ${epair_out_two}a
+
+	# pfsync interface
+	jexec one ifconfig ${epair_sync}a 192.0.2.1/24 up
+	jexec one ifconfig ${epair_one}a 198.51.100.1/24 up
+	jexec one ifconfig ${epair_out_one}a 203.0.113.1/24 up
+	jexec one ifconfig ${epair_out_one}a name outif
+	jexec one sysctl net.inet.ip.forwarding=1
+	jexec one arp -s 203.0.113.254 00:01:02:03:04:05
+	jexec one ifconfig pfsync0 \
+		syncdev ${epair_sync}a \
+		maxupd 1 \
+		up
+
+	jexec two ifconfig ${epair_sync}b 192.0.2.2/24 up
+	jexec two ifconfig ${epair_two}a 198.51.100.2/24 up
+	jexec two ifconfig ${epair_out_two}a 203.0.113.2/24 up
+	#jexec two ifconfig ${epair_out_two}a name outif
+	jexec two sysctl net.inet.ip.forwarding=1
+	jexec two arp -s 203.0.113.254 00:01:02:03:04:05
+	jexec two ifconfig pfsync0 \
+		syncdev ${epair_sync}b \
+		maxupd 1 \
+		up
+
+	# Enable pf!
+	jexec one pfctl -e
+	pft_set_rules one \
+		"set skip on ${epair_sync}a" \
+		"pass out route-to (outif 203.0.113.254)"
+	jexec two pfctl -e
+
+	# Make sure we have different rulesets so the synced state is associated with
+	# V_pf_default_rule
+	pft_set_rules two \
+		"set skip on ${epair_sync}b" \
+		"pass out route-to (outif 203.0.113.254)" \
+		"pass out proto tcp"
+
+	ifconfig ${epair_one}b 198.51.100.254/24 up
+	ifconfig ${epair_two}b 198.51.100.253/24 up
+	route add -net 203.0.113.0/24 198.51.100.1
+	ifconfig ${epair_two}b up
+	ifconfig ${epair_out_one}b up
+	ifconfig ${epair_out_two}b up
+
+	atf_check -s exit:0 env PYTHONPATH=${common_dir} \
+		${common_dir}/pft_ping.py \
+		--sendif ${epair_one}b \
+		--fromaddr 198.51.100.254 \
+		--to 203.0.113.254 \
+		--recvif ${epair_out_one}b
+
+	# Allow time for sync
+	ifconfig ${epair_one}b inet 198.51.100.254 -alias
+	route del -net 203.0.113.0/24 198.51.100.1
+	route add -net 203.0.113.0/24 198.51.100.2
+
+	sleep 2
+
+	# Now try to trigger the state on the other pfsync member
+	env PYTHONPATH=${common_dir} \
+		${common_dir}/pft_ping.py \
+		--sendif ${epair_two}b \
+		--fromaddr 198.51.100.254 \
+		--to 203.0.113.254 \
+		--recvif ${epair_out_two}b
+
+	true
+}
+
+route_to_cleanup()
+{
+	pfsynct_cleanup
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case "basic"
@@ -838,4 +941,5 @@ atf_init_test_cases()
 	atf_add_test_case "timeout"
 	atf_add_test_case "basic_ipv6_unicast"
 	atf_add_test_case "basic_ipv6"
+	atf_add_test_case "route_to"
 }
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 9078f7fb8afa..1b04495c02ce 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1620,26 +1620,16 @@ OLD_FILES+=usr/bin/dialog
 OLD_FILES+=usr/bin/dpv
 OLD_FILES+=usr/lib/libdialog.a
 OLD_FILES+=usr/lib/libdialog.so
-OLD_FILES+=usr/lib/libdialog.so.10
+OLD_LIBS+=usr/lib/libdialog.so.10
 OLD_FILES+=usr/lib/libdialog_p.a
 OLD_FILES+=usr/lib/libdpv.a
 OLD_FILES+=usr/lib/libdpv.so
-OLD_FILES+=usr/lib/libdpv.so.3
+OLD_LIBS+=usr/lib/libdpv.so.3
 OLD_FILES+=usr/lib/libdpv_p.a
-OLD_FILES+=usr/sbin/bsdconfig
 OLD_FILES+=usr/share/man/man1/dialog.1.gz
 OLD_FILES+=usr/share/man/man1/dpv.1.gz
 OLD_FILES+=usr/share/man/man3/dialog.3.gz
 OLD_FILES+=usr/share/man/man3/dpv.3.gz
-OLD_FILES+=usr/share/man/man8/bsdconfig.8.gz
-OLD_DIRS+=usr/share/bsdconfig
-OLD_DIRS+=usr/share/bsdconfig/media
-OLD_DIRS+=usr/share/bsdconfig/networking
-OLD_DIRS+=usr/share/bsdconfig/packages
-OLD_DIRS+=usr/share/bsdconfig/password
-OLD_DIRS+=usr/share/bsdconfig/startup
-OLD_DIRS+=usr/share/bsdconfig/timezone
-OLD_DIRS+=usr/share/bsdconfig/usermgmt
 .endif
 
 .if ${MK_EFI} == no
@@ -2018,6 +2008,11 @@ OLD_DIRS+=usr/share/examples/uefisign
 OLD_DIRS+=usr/share/examples/ypldap
 .endif
 
+.if ${MK_FDT} == no
+OLD_FILES+=usr/sbin/ofwdump
+OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
+.endif
+
 .if ${MK_FINGER} == no
 OLD_FILES+=usr/bin/finger
 OLD_FILES+=usr/share/man/man1/finger.1.gz
diff --git a/tools/build/options/WITH_DIALOG b/tools/build/options/WITH_DIALOG
new file mode 100644
index 000000000000..8b473b22e21e
--- /dev/null
+++ b/tools/build/options/WITH_DIALOG
@@ -0,0 +1,6 @@
+Do build
+.Xr dialog 1 ,
+.Xr dialog 3 ,
+.Xr dpv 1 ,
+and
+.Xr dpv 3 .
diff --git a/tools/test/stress2/misc/jumbo.sh b/tools/test/stress2/misc/jumbo.sh
index 8dcc5aa7aca3..a2d09bafaa82 100755
--- a/tools/test/stress2/misc/jumbo.sh
+++ b/tools/test/stress2/misc/jumbo.sh
@@ -131,7 +131,7 @@ reader(void) {
 	if ((buf = malloc(MX)) == NULL)
 			err(1, "malloc(%d), %s:%d", MX, __FILE__, __LINE__);
 	setproctitle("reader");
-	for (i = 4096; i < MX; i += 1024) {
+	for (i = sysconf(_SC_PAGESIZE); i < MX; i += 1024) {
 		alarm(TIMEOUT);
 		if ((n = recvfrom(msgsock, buf, i, MSG_WAITALL, NULL,
 		    NULL)) < 0) {
diff --git a/tools/tools/editing/freebsd.vim b/tools/tools/editing/freebsd.vim
index fa7977b30361..e515f81890df 100644
--- a/tools/tools/editing/freebsd.vim
+++ b/tools/tools/editing/freebsd.vim
@@ -21,8 +21,6 @@
 " 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$
 
 " This is a plugin for Vim (tested with Vim v7.1) to follow the FreeBSD style(9)
 " indentation.  It registers a macro (see below) for changing a buffer's
diff --git a/tools/tools/locale/etc/charmaps.xml b/tools/tools/locale/etc/charmaps.xml
index dcf1644e4371..0193912b9a01 100644
--- a/tools/tools/locale/etc/charmaps.xml
+++ b/tools/tools/locale/etc/charmaps.xml
@@ -1,4 +1,3 @@
-<!-- $FreeBSD$ -->
 <data>
 <languages>
 	<!-- Attributes known:
diff --git a/usr.bin/bsddialog/Makefile b/usr.bin/bsddialog/Makefile
index 1c2f9d697e97..24a75aaf2f96 100644
--- a/usr.bin/bsddialog/Makefile
+++ b/usr.bin/bsddialog/Makefile
@@ -1,10 +1,13 @@
-BSDDIALOG=	${SRCTOP}/contrib/bsddialog
+BSDDIALOG=	${SRCTOP}/contrib/bsddialog/utility
 .PATH:	${BSDDIALOG}
 
 PROG=	bsddialog
-SRCS=	bsddialog.c util_theme.c
+SRCS=	bsddialog.c \
+	util_builders.c \
+	util_cli.c \
+	util_theme.c
 MAN=	bsddialog.1
-CFLAGS+=	-I${BSDDIALOG}/lib
+CFLAGS+=	-I${BSDDIALOG}/../lib
 LIBADD=	bsddialog tinfow
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/elfctl/elfctl.1 b/usr.bin/elfctl/elfctl.1
index 7c565049c155..2dbe04ee0ed2 100644
--- a/usr.bin/elfctl/elfctl.1
+++ b/usr.bin/elfctl/elfctl.1
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd February 4, 2022
+.Dd October 5, 2023
 .Dt ELFCTL 1
 .Os
 .Sh NAME
@@ -95,6 +95,8 @@ Features may also be specified as a single combined value:
 .Bd -literal -offset -indent
 elfctl -e =0x5 file
 .Ed
+.Sh SEE ALSO
+.Xr mitigations 7
 .Sh HISTORY
 .Nm
 first appeared in
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 2737373c98bf..7238226998fc 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 29, 2020
+.Dd October 7, 2023
 .Dt FETCH 1
 .Os
 .Sh NAME
@@ -131,18 +131,8 @@ only.
 .It Fl -ca-cert= Ns Ar file
 [SSL]
 Path to certificate bundle containing trusted CA certificates.
-If not specified,
-.Pa /usr/local/etc/ssl/cert.pem
-is used.
-If this file does not exist,
-.Pa /etc/ssl/cert.pem
-is used instead.
-If neither file exists and no CA path has been configured,
+Otherwise,
 OpenSSL's default CA cert and path settings apply.
-The certificate bundle can contain multiple CA certificates.
-The
-.Pa security/ca_root_nss
-port is a common source of a current CA bundle.
 .It Fl -ca-path= Ns Ar dir
 [SSL]
 The directory
diff --git a/usr.bin/file/tests/Makefile b/usr.bin/file/tests/Makefile
index ea0ebaa12ce2..cd3d00ae742c 100644
--- a/usr.bin/file/tests/Makefile
+++ b/usr.bin/file/tests/Makefile
@@ -2,7 +2,7 @@ PACKAGE=	tests
 ATF_TESTS_SH=	file_test
 
 SRCDIR=		${SRCTOP}/contrib/file/tests
-_files!=	echo ${SRCDIR}/*.testfile ${SRCDIR}/*.result ${SRCDIR}/*.magic
+_files!=	echo ${SRCDIR}/*.testfile ${SRCDIR}/*.flags ${SRCDIR}/*.result ${SRCDIR}/*.magic
 ${PACKAGE}FILES+=${_files}
 
 .include <bsd.test.mk>
diff --git a/usr.bin/file/tests/file_test.sh b/usr.bin/file/tests/file_test.sh
index e6e398f6e51d..490274c05892 100644
--- a/usr.bin/file/tests/file_test.sh
+++ b/usr.bin/file/tests/file_test.sh
@@ -32,16 +32,27 @@ contrib_file_tests_body() {
 	for testfile in "${srcdir}"/*.testfile; do
 		test_name="${testfile%.testfile}"
 		result_file="${test_name}.result"
-		magic_file="${test_name}.magic"
 		file_args=
-		if [ -e "${magic_file}" ]; then
-			file_args="${file_args} --magic-file ${magic_file}"
+		magic_files=
+		for magic_file in ${test_name}*.magic; do
+			if [ -f "${magic_file}" ]; then
+				if [ -z "${magic_files}" ]; then
+					magic_files="${magic_file}"
+				else
+					magic_files="${magic_files}:${magic_file}"
+				fi
+			fi
+		done
+		if [ -z "${magic_files}" ]; then
+			magic_files=/usr/share/misc/magic
+		fi
+		if [ -f "${test_name}.flags" ]; then
+			file_args="${file_args} -$(cat "${test_name}.flags")"
 		fi
 		# The result files were created in UTC.
-		TZ=Z atf_check -o save:actual_output file ${file_args} \
-		    --brief "$testfile"
-		atf_check -o save:trimmed_output tr -d '\012' < actual_output
-		atf_check cmp trimmed_output "$result_file"
+		atf_check -o save:actual_output -e ignore env TZ=Z MAGIC="${magic_files}" \
+			file ${file_args} --brief "$testfile"
+		atf_check cmp actual_output "$result_file"
 	done
 }
 
diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips
index dd2c3cfb0495..3ee4ca3a5972 100644
--- a/usr.bin/fortune/datfiles/freebsd-tips
+++ b/usr.bin/fortune/datfiles/freebsd-tips
@@ -833,7 +833,7 @@ $ sysctl -n hw.pagesize
 To establish a serial connection to anything including a USB device,
 nothing more than cu(1) is needed:
 
-$ cu -s 9600 -l /dev/ttyU0
+$ cu -s 115200 -l /dev/ttyU0
 
 		-- Daniel Ebdrup Jensen <debdrup@FreeBSD.org>
 %
diff --git a/usr.bin/genl/genl.1 b/usr.bin/genl/genl.1
index 44ce4feaea48..b3d66298eb00 100644
--- a/usr.bin/genl/genl.1
+++ b/usr.bin/genl/genl.1
@@ -24,23 +24,44 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 20, 2023
+.Dd Oct 5, 2023
 .Dt GENL 1
 .Os
 .Sh NAME
 .Nm genl
-.Nd "generic netlink list"
+.Nd "generic netlink"
 .Sh SYNOPSIS
 .Nm
+.Pp
+.Nm Cm list
+.Pp
+.Nm Cm monitor Ao family Ac Ao multicast group Ac
 .Sh DESCRIPTION
+The
 .Nm
-lists all available generic netlink protocols, and presents its details:
+utility is design to provide access to the user to generic netlink
+protocols.
+.Pp
+The following commands are available:
+.Bl -tag -ident
+.It Cm list Po default Pc
+Lists all available generic netlink protocols, and presents its details:
 .Bl -tag -width "multicast groups"
 .It operations
 Id of the operation if any and associated capabilities
 .It multicast groups
 If of the available multicast group if any and it associated name
 .El
+.It Cm monitor Ao family Ac Ao multicast group Ac
+Connect to the
+.Ar family
+protocol and subscribe to the
+.Ar mulicast group
+then print the received messages in a readable format if the protocol is known.
+So far only
+.Qq nlctrl
+is known.
+.El
 .Sh SEE ALSO
 .Xr genetlink 4 ,
 .Xr netlink 4
diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c
index 8e8e18a7f8e2..e3acb872a39e 100644
--- a/usr.bin/genl/genl.c
+++ b/usr.bin/genl/genl.c
@@ -27,18 +27,41 @@
 
 #include <sys/param.h>
 #include <sys/module.h>
+#include <sys/socket.h>
 
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <err.h>
 #include <stdio.h>
+#include <poll.h>
 
 #include <netlink/netlink.h>
 #include <netlink/netlink_generic.h>
 #include <netlink/netlink_snl.h>
 #include <netlink/netlink_snl_generic.h>
 
+static int monitor_mcast(int argc, char **argv);
+static int list_families(int argc, char **argv);
+static void parser_nlctrl_notify(struct snl_state *ss, struct nlmsghdr *hdr);
+static void parser_fallback(struct snl_state *ss, struct nlmsghdr *hdr);
+
+static struct commands {
+	const char *name;
+	const char *usage;
+	int (*cmd)(int argc, char **argv);
+} cmds[] = {
+	{ "monitor", "monitor <family> <multicast group>", monitor_mcast },
+	{ "list", "list", list_families },
+};
+
+static struct mcast_parsers {
+	const char *family;
+	void (*parser)(struct snl_state *ss, struct nlmsghdr *hdr);
+} mcast_parsers [] = {
+	{ "nlctrl", parser_nlctrl_notify },
+};
+
 struct genl_ctrl_op {
 	uint32_t id;
 	uint32_t flags;
@@ -131,6 +154,13 @@ dump_mcast_groups( struct snl_genl_ctrl_mcast_groups *mcast_groups)
 		    mcast_groups->groups[i]->mcast_grp_name);
 }
 
+static void
+usage(void)
+{
+	fprintf(stderr, "Usage: %s\n", getprogname());
+	for (size_t i = 0; i < nitems(cmds); i++)
+		fprintf(stderr, "       %s %s\n", getprogname(), cmds[i].usage);
+}
 
 static void
 dump_family(struct genl_family *family)
@@ -143,8 +173,87 @@ dump_family(struct genl_family *family)
 	dump_mcast_groups(&family->mcast_groups);
 }
 
+void
+parser_nlctrl_notify(struct snl_state *ss, struct nlmsghdr *hdr)
+{
+	struct genl_family family = {};
+
+	if (snl_parse_nlmsg(ss, hdr, &genl_family_parser,
+				&family))
+		dump_family(&family);
+}
+
+void
+parser_fallback(struct snl_state *ss __unused, struct nlmsghdr *hdr __unused)
+{
+	printf("New unknown message\n");
+}
+
+int
+monitor_mcast(int argc __unused, char **argv)
+{
+	struct snl_state ss;
+	struct nlmsghdr *hdr;
+	struct _getfamily_attrs attrs;
+	struct pollfd pfd;
+	bool found = false;
+	void (*parser)(struct snl_state *ss, struct nlmsghdr *hdr);
+
+	parser = parser_fallback;
+
+	if (!snl_init(&ss, NETLINK_GENERIC))
+		err(EXIT_FAILURE, "snl_init()");
+
+	if (argc != 2) {
+		usage();
+		return (EXIT_FAILURE);
+	}
+	if (!snl_get_genl_family_info(&ss, argv[0], &attrs))
+		errx(EXIT_FAILURE, "Unknown family '%s'", argv[0]);
+	for (uint32_t i = 0; i < attrs.mcast_groups.num_groups; i++) {
+		if (strcmp(attrs.mcast_groups.groups[i]->mcast_grp_name,
+		    argv[1]) == 0) {
+			found = true;
+			if (setsockopt(ss.fd, SOL_NETLINK,
+			    NETLINK_ADD_MEMBERSHIP,
+			    (void *)&attrs.mcast_groups.groups[i]->mcast_grp_id,
+			    sizeof(attrs.mcast_groups.groups[i]->mcast_grp_id))
+			    == -1)
+				err(EXIT_FAILURE, "Cannot subscribe to command "
+				    "notify");
+			break;
+		}
+	}
+	if (!found)
+		errx(EXIT_FAILURE, "No such multicat group '%s'"
+		    " in family '%s'", argv[1], argv[0]);
+	for (size_t i= 0; i < nitems(mcast_parsers); i++) {
+		if (strcmp(mcast_parsers[i].family, argv[0]) == 0) {
+			parser = mcast_parsers[i].parser;
+			break;
+		}
+	}
+	memset(&pfd, 0, sizeof(pfd));
+	pfd.fd = ss.fd;
+	pfd.events = POLLIN | POLLERR;
+	while (true) {
+		pfd.revents = 0;
+		if (poll(&pfd, 1, -1) == -1) {
+			if (errno == EINTR)
+				continue;
+			err(EXIT_FAILURE, "poll()");
+		}
+		hdr = snl_read_message(&ss);
+		if (hdr != NULL && hdr->nlmsg_type != NLMSG_ERROR)
+			parser(&ss, hdr);
+
+	}
+
+	return (EXIT_SUCCESS);
+}
+
 int
-main(int argc, char **argv __unused)
+list_families(int argc, char **argv __unused)
 {
 	struct snl_state ss;
 	struct snl_writer nw;
@@ -152,16 +261,16 @@ main(int argc, char **argv __unused)
 	struct snl_errmsg_data e = {};
 	uint32_t seq_id;
 
-	if (argc > 1)
-		errx(EXIT_FAILURE, "usage: genl does not accept any argument");
-	if (modfind("netlink") == -1)
-		err(EXIT_FAILURE, "require netlink module to be loaded");
-
+	if (argc != 0) {
+		usage();
+		return (EXIT_FAILURE);
+	}
 	if (!snl_init(&ss, NETLINK_GENERIC))
 		err(EXIT_FAILURE, "snl_init()");
 
 	snl_init_writer(&ss, &nw);
-	hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL, CTRL_CMD_GETFAMILY);
+	hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL,
+	    CTRL_CMD_GETFAMILY);
 	if ((hdr = snl_finalize_msg(&nw)) == NULL)
 		err(EXIT_FAILURE, "snl_finalize_msg");
 	seq_id = hdr->nlmsg_seq;
@@ -179,3 +288,21 @@ main(int argc, char **argv __unused)
 
 	return (EXIT_SUCCESS);
 }
+
+int
+main(int argc, char **argv)
+{
+	if (modfind("netlink") == -1)
+		err(EXIT_FAILURE, "require netlink module to be loaded");
+
+	if (argc == 1)
+		return (list_families(0, NULL));
+
+	for (size_t i = 0; i < nitems(cmds); i++) {
+		if (strcmp(argv[1], cmds[i].name) == 0)
+			return (cmds[i].cmd(argc - 2, argv + 2));
+	}
+	usage();
+
+	return (EXIT_FAILURE);
+}
diff --git a/usr.bin/proccontrol/proccontrol.1 b/usr.bin/proccontrol/proccontrol.1
index 694f44c5a057..639d8c86c06c 100644
--- a/usr.bin/proccontrol/proccontrol.1
+++ b/usr.bin/proccontrol/proccontrol.1
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd September 2, 2021
+.Dd October 5, 2023
 .Dt PROCCONTROL 1
 .Os
 .Sh NAME
@@ -128,7 +128,8 @@ process 1020, do
 .Sh SEE ALSO
 .Xr kill 2 ,
 .Xr procctl 2 ,
-.Xr ptrace 2
+.Xr ptrace 2 ,
+.Xr mitigations 7
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index aed28f36103f..5bad0a248211 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -6,6 +6,7 @@ SUBDIR=	adduser \
 	arp \
 	binmiscctl \
 	boottrace \
+	bsdconfig \
 	camdd \
 	cdcontrol \
 	chkgrp \
@@ -128,11 +129,11 @@ SUBDIR.${MK_BSNMP}+=	bsnmpd
 SUBDIR.${MK_OPENSSL}+=	certctl
 .endif
 SUBDIR.${MK_CXGBETOOL}+=	cxgbetool
-SUBDIR.${MK_DIALOG}+=	bsdconfig
 SUBDIR.${MK_EFI}+=	efivar efidp efibootmgr efitable efiwake
 .if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_EFI}+=	uefisign
 .endif
+SUBDIR.${MK_FDT}+=	ofwdump
 SUBDIR.${MK_FLOPPY}+=	fdcontrol
 SUBDIR.${MK_FLOPPY}+=	fdformat
 SUBDIR.${MK_FLOPPY}+=	fdread
diff --git a/usr.sbin/Makefile.aarch64 b/usr.sbin/Makefile.aarch64
index fac0135d8898..21790c6e27e1 100644
--- a/usr.sbin/Makefile.aarch64
+++ b/usr.sbin/Makefile.aarch64
@@ -5,4 +5,3 @@ SUBDIR+=	acpi
 .if ${MK_BHYVE} != "no"
 SUBDIR+=	bhyve
 .endif
-SUBDIR+=	ofwdump
diff --git a/usr.sbin/Makefile.arm b/usr.sbin/Makefile.arm
deleted file mode 100644
index 3767c8c9e1ca..000000000000
--- a/usr.sbin/Makefile.arm
+++ /dev/null
@@ -1,2 +0,0 @@
-
-SUBDIR+=	ofwdump
diff --git a/usr.sbin/Makefile.powerpc b/usr.sbin/Makefile.powerpc
index a6d5b3b35ad4..d6b05857e152 100644
--- a/usr.sbin/Makefile.powerpc
+++ b/usr.sbin/Makefile.powerpc
@@ -2,4 +2,3 @@
 .if ${MACHINE_ARCH} != "powerpcspe"
 SUBDIR+=	nvram
 .endif
-SUBDIR+=	ofwdump
diff --git a/usr.sbin/Makefile.riscv b/usr.sbin/Makefile.riscv
deleted file mode 100644
index 3767c8c9e1ca..000000000000
--- a/usr.sbin/Makefile.riscv
+++ /dev/null
@@ -1,2 +0,0 @@
-
-SUBDIR+=	ofwdump
diff --git a/usr.sbin/authpf/Makefile b/usr.sbin/authpf/Makefile
index aa6c6e1058a5..f99418a16a58 100644
--- a/usr.sbin/authpf/Makefile
+++ b/usr.sbin/authpf/Makefile
@@ -15,6 +15,9 @@ CFLAGS+= -I${SRCTOP}/lib/libpfctl -I${OBJTOP}/lib/libpfctl
 
 LIBADD=	m util pfctl
 
+# ld.lld: error: could not determine size of cap reloc against local object nla_p_donemsg
+LD_FATAL_WARNINGS=no
+
 WARNS?=	3
 
 LINKS=	${BINDIR}/authpf ${BINDIR}/authpf-noip
diff --git a/usr.sbin/bhyve/amd64/fwctl.c b/usr.sbin/bhyve/amd64/fwctl.c
index 01b16c38f3a7..5e930cdb2051 100644
--- a/usr.sbin/bhyve/amd64/fwctl.c
+++ b/usr.sbin/bhyve/amd64/fwctl.c
@@ -63,8 +63,7 @@
  * Back-end state-machine
  */
 static enum state {
-	IDENT_WAIT,
-	IDENT_SEND,
+	IDENT,
 	REQ,
 	RESP
 } be_state;
@@ -75,7 +74,7 @@ static u_int ident_idx;
 struct op_info {
 	int op;
 	int  (*op_start)(uint32_t len);
-	void (*op_data)(uint32_t data, uint32_t len);
+	void (*op_data)(uint32_t data);
 	int  (*op_result)(struct iovec **data);
 	void (*op_done)(struct iovec *data);
 };
@@ -120,7 +119,7 @@ errop_start(uint32_t len __unused)
 }
 
 static void
-errop_data(uint32_t data __unused, uint32_t len __unused)
+errop_data(uint32_t data __unused)
 {
 
 	/* ignore */
@@ -192,7 +191,7 @@ fget_start(uint32_t len)
 }
 
 static void
-fget_data(uint32_t data, uint32_t len __unused)
+fget_data(uint32_t data)
 {
 
 	assert(fget_cnt + sizeof(uint32_t) <= sizeof(fget_str));
@@ -347,7 +346,7 @@ fwctl_request_data(uint32_t value)
 	else
 		rinfo.req_size -= sizeof(uint32_t);
 
-	(*rinfo.req_op->op_data)(value, rinfo.req_size);
+	(*rinfo.req_op->op_data)(value);
 
 	if (rinfo.req_size < sizeof(uint32_t)) {
 		fwctl_request_done();
@@ -360,7 +359,6 @@ fwctl_request_data(uint32_t value)
 static int
 fwctl_request(uint32_t value)
 {
-
 	int ret;
 
 	ret = 0;
@@ -451,12 +449,11 @@ fwctl_reset(void)
 		/* Discard partially-received request. */
 		memset(&rinfo, 0, sizeof(rinfo));
 		break;
-	case IDENT_WAIT:
-	case IDENT_SEND:
+	case IDENT:
 		break;
 	}
 
-	be_state = IDENT_SEND;
+	be_state = IDENT;
 	ident_idx = 0;
 }
 
@@ -472,7 +469,7 @@ fwctl_inb(void)
 	retval = 0xff;
 
 	switch (be_state) {
-	case IDENT_SEND:
+	case IDENT:
 		retval = sig[ident_idx++];
 		if (ident_idx >= sizeof(sig))
 			be_state = REQ;
@@ -580,5 +577,5 @@ fwctl_init(void)
 	ops[OP_GET_LEN] = &fgetlen_info;
 	ops[OP_GET]     = &fgetval_info;
 
-	be_state = IDENT_WAIT;
+	be_state = IDENT;
 }
diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8
index 78b8e518fd58..bb7d3734e4a3 100644
--- a/usr.sbin/bhyve/bhyve.8
+++ b/usr.sbin/bhyve/bhyve.8
@@ -129,7 +129,6 @@ The default value for each of
 and
 .Ar threads
 is 1.
-The current maximum number of guest virtual CPUs is 16.
 If
 .Ar numcpus
 is not specified then it will be calculated from the other arguments.
@@ -143,6 +142,15 @@ and
 If a
 .Ar setting
 is specified more than once the last one has precedence.
+.Pp
+The maximum number of virtual CPUs defaults to the number of active
+physical CPUs in the system available via the
+.Va hw.vmm.maxcpu
+.Xr sysctl 8
+variable.
+The limit can be adjusted via the
+.Va hw.vmm.maxcpu
+loader tunable.
 .It Fl D
 Destroy the VM on guest initiated power-off.
 .It Fl e
@@ -193,8 +201,11 @@ Specify the keyboard layout.
 The value that can be specified sets the file name in
 .Ar /usr/share/bhyve/kbdlayout .
 This specification only works when loaded with UEFI mode for VNC.
-When using a VNC client that supports QEMU Extended Key Event Message (e.g. TigerVNC), this option isn't needed.
-When using a VNC client that doesn't support QEMU Extended Key Event Message (e.g. tightVNC), the layout defaults to the US keyboard unless specified otherwise.
+When using a VNC client that supports QEMU Extended Key Event Message (e.g.
+TigerVNC), this option isn't needed.
+When using a VNC client that doesn't support QEMU Extended Key Event Message
+(e.g. tightVNC), the layout defaults to the US keyboard unless specified
+otherwise.
 .Pq Sq = ,
 and a value.
 No spaces are permitted between the variable name, equals sign, or
@@ -259,6 +270,14 @@ Pin guest's virtual CPU
 .Em vcpu
 to
 .Em hostcpu .
+Host CPUs and guest virtual CPUs are numbered starting from 0.
+A
+.Fl p
+option is required for every guest vCPU to be pinned.
+To map a 4 vCPU guest to host CPUs 12-15:
+.Bd -literal
+-p 0:12 -p 1:13 -p 2:14 -p 3:15
+.Ed
 .It Fl r Ar file
 Resume a guest from a snapshot.
 The guest memory contents are restored from
@@ -266,9 +285,9 @@ The guest memory contents are restored from
 and the guest device and vCPU state are restored from the file
 .Dq Ar file Ns .kern .
 .Pp
-Note that the current snapshot file format requires that the configuration of
-devices in the new VM match the VM from which the snapshot was taken by specifying the
-same
+Note that the current snapshot file format requires that the
+configuration of devices in the new VM match the VM from which the
+snapshot was taken by specifying the same
 .Fl s
 and
 .Fl l
@@ -589,7 +608,8 @@ to that file.
 Fwcfg types:
 .Bl -tag -width 10n
 .It Ar fwcfg
-The fwcfg interface is used to pass information such as the CPU count or ACPI tables to the guest firmware.
+The fwcfg interface is used to pass information such as the CPU count
+or ACPI tables to the guest firmware.
 Supported values are
 .Ql bhyve
 and
@@ -604,9 +624,12 @@ It currently reports only the CPU count to the guest firmware.
 The
 .Ql qemu
 option uses QEMU's fwcfg interface.
-This interface is widely used and allows user-defined information to be passed to the guest.
-It is used for passing the CPU count, ACPI tables, a boot order and many other things to the guest.
-Some operating systems such as Fedora CoreOS can be configured by qemu's fwcfg interface as well.
+This interface is widely used and allows user-defined information to
+be passed to the guest.
+It is used for passing the CPU count, ACPI tables, a boot order and
+many other things to the guest.
+Some operating systems such as Fedora CoreOS can be configured by
+qemu's fwcfg interface as well.
 .El
 .Pp
 Pass-through device backends:
@@ -640,7 +663,8 @@ are:
 Add
 .Ar romfile
 as option ROM to the PCI device.
-The ROM will be loaded by firmware and should be capable of initializing the device.
+The ROM will be loaded by firmware and should be capable of
+initializing the device.
 .It Li bootindex= Ns Ar index
 Add the device to the bootorder at
 .Ar index .
@@ -959,9 +983,10 @@ Each virtual CPU is exposed to the debugger as a thread.
 General purpose registers can be queried for each virtual CPU, but other
 registers such as floating-point and system registers cannot be queried.
 .Ss Memory
-Memory (including memory mapped I/O regions) can be read and written by the debugger.
-Memory operations use virtual addresses that are resolved to physical addresses
-via the current virtual CPU's active address translation.
+Memory (including memory mapped I/O regions) can be read and written
+by the debugger.
+Memory operations use virtual addresses that are resolved to physical
+addresses via the current virtual CPU's active address translation.
 .Ss Control
 The running guest can be interrupted by the debugger at any time
 .Pq for example, by pressing Ctrl-C in the debugger .
diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c
index 5ffb65269608..b69c099225db 100644
--- a/usr.sbin/bhyve/pci_ahci.c
+++ b/usr.sbin/bhyve/pci_ahci.c
@@ -118,7 +118,6 @@ static FILE *dbg;
 #else
 #define DPRINTF(format, arg...)
 #endif
-#define WPRINTF(format, arg...) printf(format, ##arg)
 
 #define AHCI_PORT_IDENT 20 + 1
 
@@ -343,7 +342,7 @@ ahci_write_fis(struct ahci_port *p, enum sata_fis_type ft, uint8_t *fis)
 		irq = (fis[1] & (1 << 6)) ? AHCI_P_IX_PS : 0;
 		break;
 	default:
-		WPRINTF("unsupported fis type %d", ft);
+		EPRINTLN("unsupported fis type %d", ft);
 		return;
 	}
 	if (fis[2] & ATA_S_ERROR) {
@@ -1802,7 +1801,7 @@ ahci_handle_cmd(struct ahci_port *p, int slot, uint8_t *cfis)
 			handle_packet_cmd(p, slot, cfis);
 		break;
 	default:
-		WPRINTF("Unsupported cmd:%02x", cfis[2]);
+		EPRINTLN("Unsupported cmd:%02x", cfis[2]);
 		ahci_write_fis_d2h(p, slot, cfis,
 		    (ATA_E_ABORT << 8) | ATA_S_READY | ATA_S_ERROR);
 		break;
@@ -1847,7 +1846,7 @@ ahci_handle_slot(struct ahci_port *p, int slot)
 #endif
 
 	if (cfis[0] != FIS_TYPE_REGH2D) {
-		WPRINTF("Not a H2D FIS:%02x", cfis[0]);
+		EPRINTLN("Not a H2D FIS:%02x", cfis[0]);
 		return;
 	}
 
@@ -2134,7 +2133,7 @@ pci_ahci_port_write(struct pci_ahci_softc *sc, uint64_t offset, uint64_t value)
 	case AHCI_P_TFD:
 	case AHCI_P_SIG:
 	case AHCI_P_SSTS:
-		WPRINTF("pci_ahci_port: read only registers 0x%"PRIx64"", offset);
+		EPRINTLN("pci_ahci_port: read only registers 0x%"PRIx64"", offset);
 		break;
 	case AHCI_P_SCTL:
 		p->sctl = value;
@@ -2209,7 +2208,7 @@ pci_ahci_write(struct pci_devinst *pi, int baridx, uint64_t offset, int size,
 	else if (offset < (uint64_t)AHCI_OFFSET + sc->ports * AHCI_STEP)
 		pci_ahci_port_write(sc, offset, value);
 	else
-		WPRINTF("pci_ahci: unknown i/o write offset 0x%"PRIx64"", offset);
+		EPRINTLN("pci_ahci: unknown i/o write offset 0x%"PRIx64"", offset);
 
 	pthread_mutex_unlock(&sc->mtx);
 }
@@ -2307,7 +2306,7 @@ pci_ahci_read(struct pci_devinst *pi, int baridx, uint64_t regoff, int size)
 		value = pci_ahci_port_read(sc, offset);
 	else {
 		value = 0;
-		WPRINTF("pci_ahci: unknown i/o read offset 0x%"PRIx64"",
+		EPRINTLN("pci_ahci: unknown i/o read offset 0x%"PRIx64"",
 		    regoff);
 	}
 	value >>= 8 * (regoff & 0x3);
diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c
index d1b15d6f3a3c..2fd49a84c768 100644
--- a/usr.sbin/bhyve/pci_nvme.c
+++ b/usr.sbin/bhyve/pci_nvme.c
@@ -514,6 +514,7 @@ static void
 pci_nvme_init_ctrldata(struct pci_nvme_softc *sc)
 {
 	struct nvme_controller_data *cd = &sc->ctrldata;
+	int ret;
 
 	cd->vid = 0xFB5D;
 	cd->ssvid = 0x0000;
@@ -583,6 +584,13 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc)
 	    NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT;
 
 	cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT;
+
+	ret = snprintf(cd->subnqn, sizeof(cd->subnqn),
+	    "nqn.2013-12.org.freebsd:bhyve-%s-%u-%u-%u",
+	    get_config_value("name"), sc->nsc_pi->pi_bus,
+	    sc->nsc_pi->pi_slot, sc->nsc_pi->pi_func);
+	if ((ret < 0) || ((unsigned)ret > sizeof(cd->subnqn)))
+		EPRINTLN("%s: error setting subnqn (%d)", __func__, ret);
 }
 
 static void
@@ -3309,7 +3317,6 @@ pci_nvme_init(struct pci_devinst *pi, nvlist_t *nvl)
 	pci_nvme_aen_init(sc);
 
 	pci_nvme_reset(sc);
-
 done:
 	return (error);
 }
diff --git a/usr.sbin/blacklistctl/Makefile b/usr.sbin/blacklistctl/Makefile
index effba6761154..1e4778bf0953 100644
--- a/usr.sbin/blacklistctl/Makefile
+++ b/usr.sbin/blacklistctl/Makefile
@@ -2,6 +2,8 @@
 BLACKLIST_DIR=${SRCTOP}/contrib/blacklist
 .PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port
 
+PACKAGE=	blocklist
+
 PROG=	blacklistctl
 SRCS=	blacklistctl.c conf.c state.c support.c internal.c \
 	sockaddr_snprintf.c pidfile.c strtoi.c popenve.c
diff --git a/usr.sbin/blacklistd/Makefile b/usr.sbin/blacklistd/Makefile
index a33ea1d285b1..b6d1e236911e 100644
--- a/usr.sbin/blacklistd/Makefile
+++ b/usr.sbin/blacklistd/Makefile
@@ -2,6 +2,8 @@
 BLACKLIST_DIR=${SRCTOP}/contrib/blacklist
 .PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port
 
+PACKAGE=	blocklist
+
 CONFS=	blacklistd.conf
 PROG=	blacklistd
 SRCS=	blacklistd.c conf.c run.c state.c support.c internal.c \
diff --git a/usr.sbin/bsdconfig/include/media.hlp b/usr.sbin/bsdconfig/include/media.hlp
index 6fd609473810..ec92e035f833 100644
--- a/usr.sbin/bsdconfig/include/media.hlp
+++ b/usr.sbin/bsdconfig/include/media.hlp
@@ -16,29 +16,6 @@ You can install from the following types of media:
             get the distribution files from there.
 
 
-   Floppy   Get distribution files from one or more DOS or UFS
-            formatted floppies.  Such floppies are assumed to
-            contain the appropriate distribution pieces - see
-            ABOUT.TXT for more information about making floppy
-            distribution media.
-
-
-   FTP      Get the distribution files from an anonymous ftp server
-            (you will be presented with a list).  Please note that
-            you may invoke FTP in "Active"/"Passive" auto-mode, or
-            via an HTTP proxy.
-
-            By default, ftp(1) will automatically use the best mode
-            for the server.  Using an HTTP proxy is sometimes necessary
-            for firewalls which block all FTP connections.
-
-            If you chose to enter your own URL in the FTP menu, please
-            note that all paths are *relative* to the home directory
-            of the user being logged in as.  By default, this is the
-            user "ftp" (anonymous ftp) but you may change this in the
-            Options screen.
-
-
    HTTP Direct
             Get the distribution files directly from an HTTP server.
 
diff --git a/usr.sbin/bsdconfig/include/messages.subr b/usr.sbin/bsdconfig/include/messages.subr
index 63c8f4925c0f..267743e87b0a 100644
--- a/usr.sbin/bsdconfig/include/messages.subr
+++ b/usr.sbin/bsdconfig/include/messages.subr
@@ -77,7 +77,6 @@ msg_checking_access_to="Checking access to\n %s"
 msg_chinese_desc="Ported software for the Chinese market."
 msg_choose_a_cd_dvd_type="Choose a CD/DVD type"
 msg_choose_a_dos_partition="Choose a DOS partition"
-msg_choose_a_floppy_drive="Choose a Floppy drive"
 msg_choose_a_ufs_partition="Choose a UFS partition"
 msg_choose_a_usb_drive="Choose a USB drive"
 msg_choose_installation_media="Choose Installation Media"
@@ -94,10 +93,8 @@ msg_could_not_unmount_the_cdrom_dvd="Could not unmount the CDROM/DVD from %s: %s
 msg_could_not_unmount_the_dos_partition="Could not unmount the DOS partition from %s: %s"
 msg_could_not_unmount_the_nfs_partition="Could not unmount the NFS partition from %s: %s"
 msg_could_not_unmount_the_ufs_partition="Could not unmount the UFS partition from %s: %s"
-msg_couldnt_connect_to_ftp_server="Couldn't connect to FTP server"
 msg_couldnt_connect_to_proxy="Couldn't connect to proxy"
 msg_couldnt_connect_to_server="Couldn't connect to server"
-msg_couldnt_open_ftp_connection="Couldn't open FTP connection to %s:\n  %s."
 msg_create_new="Create New"
 msg_created_path="Created %s"
 msg_czech_republic="Czech Republic"
@@ -129,7 +126,6 @@ msg_enter_a_fully_qualified_pathname_for_the_directory="Enter a fully qualified
 msg_enter_the_device_name_of_a_ufs_formatted_partition="Enter the device-name of a UFS formatted partition"
 msg_error="Error"
 msg_error_mounting_device="Error mounting %s on %s: %s"
-msg_error_mounting_floppy_device="Error mounting floppy %s (%s) on %s: %s"
 msg_error_mounting_usb_drive="Error mounting USB drive %s on %s: %s"
 msg_error_when_requesting_url="Error when requesting %s, you could try an other server"
 msg_estonia="Estonia"
@@ -141,7 +137,6 @@ msg_failed_to_reach_wpa_supplicant="Failed to reach wpa_supplicant: %s"
 msg_file_system="File System"
 msg_finance_desc="Monetary, financial and related applications."
 msg_finland="Finland"
-msg_floppy="Floppy"
 msg_forget_all="Forget All"
 msg_forget_all_confirm="WARNING! Are you really sure you want to forget all known networks\nby re-initializing wpa_supplicant.conf(5)? This cannot be undone."
 msg_forget_all_help="Reset wpa_supplicant(8) configuration, forgetting all known networks"
@@ -150,8 +145,6 @@ msg_france="France"
 msg_french_desc="Ported software for French countries."
 msg_ftp="FTP"
 msg_ftp_desc="FTP client and server utilities."
-msg_ftp_passive="FTP Passive"
-msg_ftp_username="FTP username"
 msg_generating_index_from_pkg_database="Generating INDEX from pkg(8) database\n(this can take a while)..."
 msg_geography_desc="Geography-related software."
 msg_german_desc="Ported software for Germanic countries."
@@ -171,12 +164,9 @@ msg_http_proxy="HTTP Proxy"
 msg_hungarian_desc="Ported software for the Hungarian market."
 msg_iceland="Iceland"
 msg_install_from_a_dos_partition="Install from a DOS partition"
-msg_install_from_a_floppy_disk_set="Install from a floppy disk set"
 msg_install_from_a_freebsd_cd_dvd="Install from a FreeBSD CD/DVD"
 msg_install_from_a_ufs_partition="Install from a UFS partition"
 msg_install_from_a_usb_drive="Install from a USB drive"
-msg_install_from_an_ftp_server="Install from an FTP server"
-msg_install_from_an_ftp_server_thru_firewall="Install from an FTP server through a firewall"
 msg_install_from_an_ftp_server_thru_proxy="Install from an FTP server through an HTTP proxy"
 msg_install_from_an_http_server="Install from an HTTP server"
 msg_install_from_the_existing_filesystem="Install from the existing filesystem"
@@ -228,7 +218,6 @@ msg_media_timeout="Media Timeout"
 msg_media_type="Media Type"
 msg_menu_text="If you've already installed FreeBSD, you may use\nthis menu to customize it somewhat to suit your\nparticular configuration.  Most importantly, you\ncan use the Packages utility to load extra '3rd\nparty' software not provided in the base\ndistributions."
 msg_misc_desc="Miscellaneous utilities."
-msg_missing_ftp_host_or_directory="Missing FTP host or directory specification.  FTP media not initialized."
 msg_multimedia_desc="Multimedia software."
 msg_must_be_root_to_execute="%s: must be root to execute"
 msg_must_have_pkg_to_execute="%s: must have pkg(8) to execute"
@@ -257,7 +246,6 @@ msg_no="No"
 msg_no_cd_dvd_devices_found="No CD/DVD devices found!  Please check that your system's\nconfiguration is correct and that the CD/DVD drive is of a\nsupported type. For more information, consult the hardware\nguide in the Doc menu."
 msg_no_description_provided="No description provided"
 msg_no_dos_primary_partitions_found="No DOS primary partitions found!  This installation method is unavailable"
-msg_no_floppy_devices_found="No floppy devices found!  Please check that your system's configuration\nis correct.  For more information, consult the hardware guide in the Doc\nmenu."
 msg_no_gateway_has_been_set="No gateway has been set. You will be unable to access hosts\nnot on your local network"
 msg_no_network_devices="No network devices available!"
 msg_no_package_name_passed_in_package_variable="No package name passed in package variable"
@@ -297,12 +285,8 @@ msg_please_enter_the_full_nfs_file_specification="Please enter the full NFS file
 msg_please_enter_the_password_for_this_user="Please enter the password for this user:"
 msg_please_enter_the_username_you_wish_to_login_as="Please enter the username you wish to login as:"
 msg_please_enter_username_password="Please enter a username and password for sudo(8):"
-msg_please_insert_floppy_containing="Please insert floppy containing %s in %s"
-msg_please_insert_floppy_in_drive="Please insert floppy in %s"
 msg_please_select_a_category_to_display="Please select a category to display."
 msg_please_select_a_cd_dvd_drive="FreeBSD can be installed directly from a CD/DVD containing a valid\nFreeBSD distribution.  If you are seeing this menu it is because\nmore than one CD/DVD drive was found on your system.  Please select\none of the following CD/DVD drives as your installation drive."
-msg_please_select_a_floppy_drive="You have more than one floppy drive.  Please choose which drive\nyou would like to use."
-msg_please_select_a_freebsd_ftp_distribution_site="Please select a FreeBSD FTP distribution site"
 msg_please_select_a_freebsd_http_distribution_site="Please select a FreeBSD HTTP distribution site"
 msg_please_select_a_usb_drive="You have more than one USB drive. Please choose which drive\nyou would like to use."
 msg_please_select_dos_partition="FreeBSD can be installed directly from a DOS partition assuming,\nof course, that you have copied the relevant distributions into\nyour DOS partition before starting this installation.  If this is\nnot the case then you should reboot DOS at this time and copy the\ndistributions you wish to install into a \"FREEBSD\" subdirectory\non one of your DOS partitions.  Otherwise, please select the DOS\npartition containing the FreeBSD distribution files."
@@ -339,7 +323,6 @@ msg_rescan_devices="Re-scan Devices"
 msg_reset="RESET!"
 msg_reset_all_values_to_startup_defaults="Reset all values to startup defaults"
 msg_return_to_previous_menu="Return to previous menu"
-msg_reuse_old_ftp_site_selection_values="Re-use old FTP site selection values?"
 msg_reuse_old_http_site_settings="Re-use old HTTP site settings?"
 msg_review="Review"
 msg_review_desc="Review/perform pending actions"
@@ -378,7 +361,6 @@ msg_sorry_try_again="Sorry, try again."
 msg_south_africa="South Africa"
 msg_spain="Spain"
 msg_spanish_desc="Ported software for the Spanish market."
-msg_specify_some_other_ftp_site="Specify some other ftp site by URL"
 msg_specify_some_other_http_site="Specify some other http site by URL"
 msg_sweden="Sweden"
 msg_sysutils_desc="Various system utilities."
@@ -398,7 +380,6 @@ msg_ukrainian_desc="Ported software for the Ukrainian market."
 msg_unable_to_configure_device="Unable to configure the %s interface!\nThis installation method cannot be used."
 msg_unable_to_fetch_package_from_selected_media="Unable to fetch package %s from selected media.\nNo package add will be done."
 msg_unable_to_get_file_from_selected_media="Unable to get %s file from selected media.\n\nThis may be because the packages collection is not available\non the distribution media you've chosen, most likely an FTP site\nwithout the packages collection mirrored.  Please verify that\nyour media, or your path to the media, is correct and try again."
-msg_unable_to_get_proper_ftp_path="Unable to get proper FTP path.  FTP media not initialized."
 msg_unable_to_initialize_media_type_for_package_extract="Unable to initialize media type for package extract."
 msg_unable_to_make_directory_mountpoint="Unable to make %s directory mountpoint for %s!"
 msg_unable_to_open="Unable to open %s"
@@ -447,7 +428,6 @@ msg_xfce_desc="Software related to the Xfce Desktop Environment."
 msg_yes="Yes"
 msg_yes_to_all="Yes to All"
 msg_you_are_not_root_but="You are not root but %s can use sudo(8).\nWhat would you like to do?"
-msg_you_may_remove_the_floppy="You may remove the floppy from %s"
 msg_youve_already_done_the_network_configuration="You've already done the network configuration once,\nwould you like to skip over it now?"
 msg_zope_desc="Software related to the Zope platform."
 tcplayout_extras_help="Any interface-specific options to ifconfig you would like to add"
diff --git a/usr.sbin/bsdconfig/include/options.hlp b/usr.sbin/bsdconfig/include/options.hlp
index f47df27a6b88..257c5011fb9e 100644
--- a/usr.sbin/bsdconfig/include/options.hlp
+++ b/usr.sbin/bsdconfig/include/options.hlp
@@ -85,9 +85,7 @@ Release Name:  Which release to attempt to load from installation media.
 
     You should only change this option if you're really sure you know
     what you are doing!  This will change the release name used by
-    bsdconfig when fetching components of any distributions, and
-    is a useful way of using a more recent installation boot floppy
-    with an older release (say, on CDROM).
+    bsdconfig when fetching components of any distributions.
 
 
 Media Type:   Which media type is being used.
diff --git a/usr.sbin/bsdconfig/share/device.subr b/usr.sbin/bsdconfig/share/device.subr
index c60ad303acfc..4ca2a80c69a5 100644
--- a/usr.sbin/bsdconfig/share/device.subr
+++ b/usr.sbin/bsdconfig/share/device.subr
@@ -77,7 +77,6 @@ f_struct_define DEVICE_INFO \
 setvar DEVICE_TYPE_ANY		"any"		# Any
 setvar DEVICE_TYPE_NONE		"NONE"		# Unknown
 setvar DEVICE_TYPE_DISK		"DISK"		# GEOM `DISK'
-setvar DEVICE_TYPE_FLOPPY	"FD"		# GEOM `FD'
 setvar DEVICE_TYPE_FTP		"FTP"		# Dynamic network device
 setvar DEVICE_TYPE_NETWORK	"NETWORK"	# See f_device_get_all_network
 setvar DEVICE_TYPE_CDROM	"CDROM"		# GEOM `DISK'
@@ -440,14 +439,6 @@ f_device_probe_geom()
 
 		return $retval
 		;;
-	$GEOM_CLASS_FD)
-		f_dprintf "Found floppy device named %s" "$devname"
-		debug= f_device_register device "$devname" "$desc" \
-			"/dev/$devname" $DEVICE_TYPE_FLOPPY 1 \
-			f_media_init_floppy f_media_get_floppy \
-			f_media_shutdown_floppy "" "$capacity"
-		return $?
-		;;
 	$GEOM_CLASS_LABEL)
 		: fall through to below section # reduces indentation level
 		;;
@@ -936,7 +927,6 @@ f_device_desc()
 	case "$__type" in
 	$DEVICE_TYPE_CDROM)   __cp="<unknown cdrom device type>" ;;
 	$DEVICE_TYPE_DISK)    __cp="<unknown disk device type>" ;;
-	$DEVICE_TYPE_FLOPPY)  __cp="<unknown floppy device type>" ;;
 	$DEVICE_TYPE_USB)     __cp="<unknown USB storage device type>" ;;
 	$DEVICE_TYPE_NETWORK) __cp="<unknown network interface type>" ;;
 	*)
@@ -1247,7 +1237,6 @@ f_device_menu()
 #
 f_cdrom()   { f_device_catalog_set $DEVICE_TYPE_CDROM   "$1" "$2"; }
 f_disk()    { f_device_catalog_set $DEVICE_TYPE_DISK    "$1" "$2"; }
-f_floppy()  { f_device_catalog_set $DEVICE_TYPE_FLOPPY  "$1" "$2"; }
 f_usb()     { f_device_catalog_set $DEVICE_TYPE_USB     "$1" "$2"; }
 f_network() { f_device_catalog_set $DEVICE_TYPE_NETWORK "$1" "$2"; }
 
@@ -1262,7 +1251,7 @@ f_network() { f_device_catalog_set $DEVICE_TYPE_NETWORK "$1" "$2"; }
 
 DEVICE_CATALOG_APPEND_ONLY=1 # Make initial loading faster
 
-# CDROM, Disk, Floppy, and USB devices/names
+# CDROM, Disk, and USB devices/names
 f_cdrom  "cd%d"   "SCSI CDROM drive"
 f_cdrom  "mcd%d"  "Mitsumi (old model) CDROM drive"
 f_cdrom  "scd%d"  "Sony CDROM drive - CDU31/33A type"
@@ -1277,7 +1266,6 @@ f_disk   "mfid%d" "LSI MegaRAID SAS array"
 f_disk   "mlxd%d" "Mylex RAID disk"
 f_disk   "twed%d" "3ware ATA RAID array"
 f_disk   "vtbd%d" "VirtIO Block Device"
-f_floppy "fd%d"   "Floppy Drive unit A"
 f_usb    "da%da"  "USB Mass Storage Device"
 
 # Network interfaces/names
diff --git a/usr.sbin/bsdconfig/share/dialog.subr b/usr.sbin/bsdconfig/share/dialog.subr
index 5b7ae9123073..0b6f11f39134 100644
--- a/usr.sbin/bsdconfig/share/dialog.subr
+++ b/usr.sbin/bsdconfig/share/dialog.subr
@@ -51,7 +51,7 @@ f_include_lang $BSDCFG_LIBE/include/messages.subr
 # Default name of dialog(1) utility
 # NOTE: This is changed to "Xdialog" by the optional `-X' argument
 #
-DIALOG="dialog"
+DIALOG="bsddialog"
 
 #
 # Default dialog(1) title and backtitle text
@@ -79,9 +79,15 @@ DIALOG_OK=${SUCCESS:-0}
 DIALOG_CANCEL=${FAILURE:-1}
 DIALOG_HELP=2
 DIALOG_EXTRA=3
-DIALOG_ITEM_HELP=4
-export DIALOG_ERROR=254 # sh(1) can't handle the default of `-1'
-DIALOG_ESC=255
+if [ $DIALOG = "bsddialog" ]; then
+	DIALOG_ITEM_HELP=2
+	DIALOG_ERROR=255
+	DIALOG_ESC=5
+else
+	DIALOG_ITEM_HELP=4
+	export DIALOG_ERROR=254 # sh(1) can't handle the default of `-1'
+	DIALOG_ESC=255
+fi
 
 #
 # Default behavior is to call f_dialog_init() automatically when loaded.
@@ -2221,7 +2227,14 @@ f_dialog_init()
 	#
 	# Process `-X' command-line option
 	#
-	[ "$USE_XDIALOG" ] && DIALOG=Xdialog USE_DIALOG=
+	if [ "$USE_XDIALOG" ]; then
+		if [ $DIALOG = "bsddialog" ]; then
+			DIALOG_ESC=255
+			# else it is already 255 like dialog(1)
+		fi
+		DIALOG=Xdialog
+		USE_DIALOG=
+	fi
 
 	#
 	# Sanity check, or die gracefully
@@ -2229,7 +2242,7 @@ f_dialog_init()
 	if ! f_have $DIALOG; then
 		unset USE_XDIALOG
 		local failed_dialog="$DIALOG"
-		DIALOG=dialog
+		DIALOG=bsddialog
 		f_die 1 "$msg_no_such_file_or_directory" "$pgm" "$failed_dialog"
 	fi
 
@@ -2261,7 +2274,7 @@ f_dialog_init()
 		if ! f_have xauth; then
 			# Die gracefully, as we [likely] can't use Xdialog(1)
 			unset USE_XDIALOG
-			DIALOG=dialog
+			DIALOG=bsddialog
 			f_die 1 "$msg_no_such_file_or_directory" "$pgm" "xauth"
 		fi
 		HOSTNAME=$( hostname )
@@ -2283,12 +2296,13 @@ f_dialog_init()
 		then
 			# Xdialog(1) failed, fall back to dialog(1)
 			unset USE_XDIALOG
+			DIALOG=bsddialog
 
 			# Display the error message produced by Xdialog(1)
 			local height width
 			f_dialog_buttonbox_size height width \
 				"$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$maxsize"
-			dialog \
+			$DIALOG \
 				--title "$DIALOG_TITLE"         \
 				--backtitle "$DIALOG_BACKTITLE" \
 				--ok-label "$msg_ok"            \
diff --git a/usr.sbin/bsdconfig/share/media/Makefile b/usr.sbin/bsdconfig/share/media/Makefile
index d6b77d96ee7f..e90b87f70cc2 100644
--- a/usr.sbin/bsdconfig/share/media/Makefile
+++ b/usr.sbin/bsdconfig/share/media/Makefile
@@ -1,7 +1,7 @@
 
 FILESDIR=	${SHAREDIR}/bsdconfig/media
 FILES=		any.subr cdrom.subr common.subr directory.subr dos.subr \
-		floppy.subr ftp.subr http.subr httpproxy.subr network.subr \
+		http.subr httpproxy.subr network.subr \
 		nfs.subr options.subr tcpip.subr ufs.subr usb.subr wlan.subr
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsdconfig/share/media/any.subr b/usr.sbin/bsdconfig/share/media/any.subr
index d98f58567bfa..2c6720be364d 100644
--- a/usr.sbin/bsdconfig/share/media/any.subr
+++ b/usr.sbin/bsdconfig/share/media/any.subr
@@ -34,8 +34,6 @@ f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/media/cdrom.subr
 f_include $BSDCFG_SHARE/media/directory.subr
 f_include $BSDCFG_SHARE/media/dos.subr
-f_include $BSDCFG_SHARE/media/floppy.subr
-f_include $BSDCFG_SHARE/media/ftp.subr
 f_include $BSDCFG_SHARE/media/http.subr
 f_include $BSDCFG_SHARE/media/httpproxy.subr
 f_include $BSDCFG_SHARE/media/nfs.subr
@@ -70,16 +68,14 @@ f_media_get_type()
 	local prompt="$msg_choose_installation_media_description"
 	local menu_list="
 		'1 $msg_cd_dvd'    '$msg_install_from_a_freebsd_cd_dvd'
-		'2 $msg_ftp'       '$msg_install_from_an_ftp_server'
-		'3 $msg_http_proxy'
+		'2 $msg_http_proxy'
 		                '$msg_install_from_an_ftp_server_thru_proxy'
-		'4 $msg_http_direct' '$msg_install_from_an_http_server'
-		'5 $msg_directory' '$msg_install_from_the_existing_filesystem'
+		'3 $msg_http_direct' '$msg_install_from_an_http_server'
+		'4 $msg_directory' '$msg_install_from_the_existing_filesystem'
 		'6 $msg_nfs'       '$msg_install_over_nfs'
-		'7 $msg_dos'       '$msg_install_from_a_dos_partition'
-		'8 $msg_ufs'       '$msg_install_from_a_ufs_partition'
-		'9 $msg_floppy'    '$msg_install_from_a_floppy_disk_set'
-		'A $msg_usb'       '$msg_install_from_a_usb_drive'
+		'6 $msg_dos'       '$msg_install_from_a_dos_partition'
+		'7 $msg_ufs'       '$msg_install_from_a_ufs_partition'
+		'8 $msg_usb'       '$msg_install_from_a_usb_drive'
 		'X $msg_options'   '$msg_view_set_various_media_options'
 	" # END-QUOTE
 	local hline="$hline_choose_help_for_more_information_on_media_types"
@@ -121,14 +117,12 @@ f_media_get_type()
 
 		case "$mtag" in
 		?" $msg_cd_dvd")      f_media_set_cdrom ;;
-		?" $msg_ftp")         f_media_set_ftp ;;
 		?" $msg_http_proxy")  f_media_set_http_proxy ;;
 		?" $msg_http_direct") f_media_set_http ;;
 		?" $msg_directory")   f_media_set_directory ;;
 		?" $msg_dos")         f_media_set_dos ;;
 		?" $msg_nfs")         f_media_set_nfs ;;
 		?" $msg_ufs")         f_media_set_ufs ;;
-		?" $msg_floppy")      f_media_set_floppy ;;
 		?" $msg_usb")         f_media_set_usb ;;
 		?" $msg_options")
 			f_media_options_menu
diff --git a/usr.sbin/bsdconfig/share/media/floppy.subr b/usr.sbin/bsdconfig/share/media/floppy.subr
deleted file mode 100644
index ae17ee27f282..000000000000
--- a/usr.sbin/bsdconfig/share/media/floppy.subr
+++ /dev/null
@@ -1,228 +0,0 @@
-if [ ! "$_MEDIA_FLOPPY_SUBR" ]; then _MEDIA_FLOPPY_SUBR=1
-#
-# Copyright (c) 2012-2013 Devin Teske
-# 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.
-#
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." media/floppy.subr
-f_include $BSDCFG_SHARE/device.subr
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/media/common.subr
-f_include $BSDCFG_SHARE/struct.subr
-f_include $BSDCFG_SHARE/variable.subr
-
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
-f_include_lang $BSDCFG_LIBE/include/messages.subr
-
-############################################################ GLOBALS
-
-FLOPPY_MOUNTED=
-FLOPPY_DISTWANTED=
-
-############################################################ FUNCTIONS
-
-# f_media_set_floppy
-#
-# Return success if we both found and set the media type to be a floppy.
-#
-f_media_set_floppy()
-{
-	f_media_close
-
-	local devs ndevs
-	f_device_find "" $DEVICE_TYPE_FLOPPY devs
-	f_count ndevs $devs
-
-	if [ ${ndevs:=0} -eq 0 ]; then
-		f_interactive && f_show_msg "$msg_no_floppy_devices_found"
-		return $FAILURE
-	elif [ $ndevs -eq 1 ]; then
-		f_struct_copy $devs device_media
-	else
-		local dev
-		local title="$msg_choose_a_floppy_drive"
-		local prompt="$msg_please_select_a_floppy_drive"
-		local hline=
-
-		dev=$( f_device_menu \
-			"$title" "$prompt" "$hline" $DEVICE_TYPE_FLOPPY \
-			2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD ) ||
-			return $FAILURE
-
-		f_struct_copy "$dev" device_media
-	fi
-
-	f_struct device_media &&
-		device_media unset private
-
-	f_struct device_media || return $FAILURE
-}
-
-# f_media_init_floppy $device
-#
-# Initializes the Floppy media device. Returns success if able to mount the
-# Floppy disk device using either mount_msdosfs(8) or mount(8) (tried in that
-# order).
-#
-f_media_init_floppy()
-{
-	local funcname=f_media_init_floppy
-	local dev="$1" devname err
-
-	$dev get devname devname || return $FAILURE
-	f_dprintf "Init floppy called for %s distribution. devname=[%s]" \
-	          "${FLOPPY_DISTWANTED:-some}" "$devname"
-
-	if [ "$FLOPPY_MOUNTED" ]; then
-		f_dprintf "Floppy device already mounted."
-		return $SUCCESS
-	fi
-
-	local mp
-	$dev get private mp
-	if [ ! -e "${mp:=$MOUNTPOINT}" ] && ! f_quietly mkdir -p "$mp"; then
-		f_show_msg "$msg_unable_to_make_directory_mountpoint" \
-		           "$mp" "$devname"
-		return $FAILURE
-	fi
-
-	if f_interactive; then
-		local desc
-		$dev get desc desc
-		if [ "$FLOPPY_DISTWANTED" ]; then
-			f_show_msg "$msg_please_insert_floppy_in_drive" "$desc"
-		else
-			f_show_msg "$msg_please_insert_floppy_containing" \
-			           "$FLOPPY_DISTWANTED" "$desc"
-		fi
-	fi
-
-	if ! {
-	    f_eval_catch -dk err $funcname mount_msdosfs \
-		'mount_msdosfs -o ro -m 0777 -u 0 -g 0 "%s" "%s"' \
-		"$devname" "$mp" ||
-	    f_eval_catch -dk err $funcname mount \
-		'mount -o ro "%s" "%s"' "$devname" "$mp"
-	}; then
-		err="${err#mount: }"; err="${err#*: }"
-		local name
-		$dev get name name
-		f_show_msg "$msg_error_mounting_floppy_device" \
-		           "$name" "$devname" "$mp" "$err"
-		return $FAILURE
-	fi
-	FLOPPY_MOUNTED=1
-	FLOPPY_DISTWANTED=
-	return $SUCCESS
-}
-
-# f_media_get_floppy $device $file [$probe_type]
-#
-# Returns data from $file on a mounted Floppy disk device. Similar to cat(1).
-# If $probe_type is present and non-NULL, limits retries to zero and returns
-# success if $file exists. If $probe_type is equal to $PROBE_SIZE, prints the
-# size of $file in bytes to standard-out.
-#
-f_media_get_floppy()
-{
-	local funcname=f_media_get_floppy
-	local dev="$1" file="$2" probe_type="$3"
-	local name
-
-	$dev get name name
-	f_dprintf "f_media_get_floppy: dev=[%s] file=[%s] probe_type=%s" \
-	          "$name" "$file" "$probe_type"
-
-	#
-	# floppies don't use f_media_generic_get() because it's too expensive
-	# to speculatively open files on a floppy disk.  Make user get it
-	# right or give up with floppies.
-	#
-	local mp
-	$dev get private mp
-	local fp="${mp:=$MOUNTPOINT}/$file"
-	if ! [ -f "$fp" -a -r "$fp" ]; then
-		local nretries=4
-		[ "$probe_type" = "$PROBE_SIZE" ] && echo "-1"
-		[ "$probe_type" ] && return $FAILURE
-		while ! [ -f "$fp" -a -r "$fp" ]; do
-			if [ $nretries -eq 0 ]; then
-				f_show_msg "$msg_failed_to_get_floppy_file" \
-				           "$fp"
-				[ "$probe_type" = "$PROBE_SIZE" ] && echo "-1"
-				return $FAILURE
-			fi
-			FLOPPY_DISTWANTED="$fp"
-			f_media_shutdown_floppy "$dev"
-			f_media_init_floppy "$dev" || return $FAILURE
-			nretries=$(( $nretries - 1 ))
-		done
-	fi
-	#
-	# If we reach here, $file exists
-	#
-	if [ "$probe_type" = "$PROBE_SIZE" ]; then
-		local size
-		f_eval_catch -dk size $funcname stat 'stat -f %%z "%s"' "$fp"
-		f_isinteger "$size" || size=-1
-		echo "$size"
-	fi
-	[ "$probe_type" ] && return $SUCCESS
-	cat "$fp"
-}
-
-# f_media_shutdown_floppy $device
-#
-# Shuts down the Floppy disk device using umount(8). Return status should be
-# ignored.
-#
-f_media_shutdown_floppy()
-{
-	local funcname=f_media_shutdown_floppy
-	local dev="$1" err mp
-
-	[ "$FLOPPY_MOUNTED" ] || return $FAILURE
-
-	$dev get private mp
-	if f_eval_catch -d $funcname umount \
-		'umount -f "%s"' "${mp:=$MOUNTPOINT}"
-	then
-		FLOPPY_MOUNTED=
-		if f_interactive && [ "$_systemState" != "fixit" ]; then
-			local desc
-			$dev get desc desc
-			f_show_msg "$msg_you_may_remove_the_floppy" "$desc"
-		fi
-	fi
-}
-
-############################################################ MAIN
-
-f_dprintf "%s: Successfully loaded." media/floppy.subr
-
-fi # ! $_MEDIA_FLOPPY_SUBR
diff --git a/usr.sbin/bsdconfig/share/media/ftp.subr b/usr.sbin/bsdconfig/share/media/ftp.subr
deleted file mode 100644
index 05c551c7f3d6..000000000000
--- a/usr.sbin/bsdconfig/share/media/ftp.subr
+++ /dev/null
@@ -1,840 +0,0 @@
-if [ ! "$_MEDIA_FTP_SUBR" ]; then _MEDIA_FTP_SUBR=1
-#
-# Copyright (c) 2012-2013 Devin Teske
-# 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.
-#
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." media/ftp.subr
-f_include $BSDCFG_SHARE/device.subr
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/media/common.subr
-f_include $BSDCFG_SHARE/media/tcpip.subr
-f_include $BSDCFG_SHARE/strings.subr
-f_include $BSDCFG_SHARE/struct.subr
-f_include $BSDCFG_SHARE/variable.subr
-
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
-f_include_lang $BSDCFG_LIBE/include/messages.subr
-
-############################################################ GLOBALS
-
-FTP_SKIP_RESOLV=
-
-URL_MAX=261261 # according to actual fetch(1) test-results
-
-FTP_DIRS="
-	.
-	releases/$UNAME_P
-	snapshots/$UNAME_P
-	pub/FreeBSD
-	pub/FreeBSD/releases/$UNAME_P
-	pub/FreeBSD/snapshots/$UNAME_P
-	pub/FreeBSD-Archive/old-releases/$UNAME_P
-" # END-QUOTE
-
-############################################################ FUNCTIONS
-
-# f_dialog_menu_media_ftp
-#
-# Prompt the user to select from a range of ``built-in'' FTP servers or specify
-# their own. If the user makes a choice and doesn't cancel or press Esc, stores
-# the user's choice in VAR_FTP_PATH (see variables.subr) and returns success.
-#
-f_dialog_menu_media_ftp()
-{
-	f_dialog_title "$msg_please_select_a_freebsd_ftp_distribution_site"
-	local title="$DIALOG_TITLE" btitle="$DIALOG_BACKTITLE"
-	f_dialog_title_restore
-	local prompt="$msg_please_select_the_site_closest_to_you_or_other"
-	local menu_list="
-		'$msg_main_site'          'download.freebsd.org'
-		'$msg_australia $msg_v6'  'ftp.au.freebsd.org'
-		' $msg_australia #3'      'ftp3.au.freebsd.org'
-		'$msg_austria $msg_v6'    'ftp.at.freebsd.org'
-		'$msg_brazil #2'          'ftp2.br.freebsd.org'
-		' $msg_brazil #3'         'ftp3.br.freebsd.org'
-		'$msg_bulgaria $msg_v6'   'ftp.bg.freebsd.org'
-		'$msg_czech_republic $msg_v6' 'ftp.cz.freebsd.org'
-		'$msg_denmark $msg_v6'    'ftp.dk.freebsd.org'
-		'$msg_finland'            'ftp.fi.freebsd.org'
-		'$msg_france $msg_v6'     'ftp.fr.freebsd.org'
-		' $msg_france #3'         'ftp3.fr.freebsd.org'
-		' $msg_france #6'         'ftp6.fr.freebsd.org'
-		'$msg_germany $msg_v6'     'ftp.de.freebsd.org'
-		' $msg_germany #1 $msg_v6' 'ftp1.de.freebsd.org'
-		' $msg_germany #2 $msg_v6' 'ftp2.de.freebsd.org'
-		' $msg_germany #5 $msg_v6' 'ftp5.de.freebsd.org'
-		' $msg_germany #7 $msg_v6' 'ftp7.de.freebsd.org'
-		'$msg_greece $msg_v6'     'ftp.gr.freebsd.org'
-		' $msg_greece #2 $msg_v6' 'ftp2.gr.freebsd.org'
-		'$msg_japan $msg_v6'      'ftp.jp.freebsd.org'
-		' $msg_japan #2'          'ftp2.jp.freebsd.org'
-		' $msg_japan #3'          'ftp3.jp.freebsd.org'
-		' $msg_japan #4'          'ftp4.jp.freebsd.org'
-		' $msg_japan #6 $msg_v6'  'ftp6.jp.freebsd.org'
-		'$msg_korea'              'ftp.kr.freebsd.org'
-		' $msg_korea #2'          'ftp2.kr.freebsd.org'
-		'$msg_latvia'             'ftp.lv.freebsd.org'
-		'$msg_netherlands $msg_v6' 'ftp.nl.freebsd.org'
-		' $msg_netherlands #2'    'ftp2.nl.freebsd.org'
-		'$msg_new_zealand'        'ftp.nz.freebsd.org'
-		'$msg_norway $msg_v6'     'ftp.no.freebsd.org'
-		'$msg_poland $msg_v6'     'ftp.pl.freebsd.org'
-		'$msg_russia $msg_v6'     'ftp.ru.freebsd.org'
-		' $msg_russia #2'         'ftp2.ru.freebsd.org'
-		'$msg_slovenia $msg_v6'   'ftp.si.freebsd.org'
-		'$msg_south_africa $msg_v6'     'ftp.za.freebsd.org'
-		' $msg_south_africa #2 $msg_v6' 'ftp2.za.freebsd.org'
-		' $msg_south_africa #4'         'ftp4.za.freebsd.org'
-		'$msg_sweden $msg_v6'           'ftp.se.freebsd.org'
-		'$msg_taiwan #4'          'ftp4.tw.freebsd.org'
-		' $msg_taiwan #5'         'ftp5.tw.freebsd.org'
-		'$msg_uk'                 'ftp.uk.freebsd.org'
-		' $msg_uk #2'             'ftp2.uk.freebsd.org'
-		'$msg_ukraine $msg_v6'    'ftp.ua.freebsd.org'
-		'$msg_usa #5 $msg_v6'     'ftp5.us.freebsd.org'
-		' $msg_usa #11 $msg_v6'   'ftp11.us.freebsd.org'
-		' $msg_usa #14'           'ftp14.us.freebsd.org'
-	" # END-QUOTE
-	local hline="$msg_select_a_site_thats_close"
-
-	local height width rows
-	eval f_dialog_menu_size height width rows \
-	                        \"\$title\"  \
-	                        \"\$btitle\" \
-	                        \"\$prompt\" \
-	                        \"\$hline\"  \
-	                        $menu_list
-
-	local mtag
-	mtag=$( eval $DIALOG \
-		--title \"\$title\"             \
-		--backtitle \"\$btitle\"        \
-		--hline \"\$hline\"             \
-		--ok-label \"\$msg_ok\"         \
-		--cancel-label \"\$msg_cancel\" \
-		--menu \"\$prompt\"             \
-		$height $width $rows            \
-		$menu_list                      \
-		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	) || return $DIALOG_CANCEL
-	f_dialog_data_sanitize mtag
-
-	case "$mtag" in
-	URL) setvar $VAR_FTP_PATH "other" ;;
-	*)
-		local value
-		value=$( eval f_dialog_menutag2item \"\$mtag\" $menu_list )
-		setvar $VAR_FTP_PATH "ftp://$value"
-	esac
-	
-	return $DIALOG_OK
-}
-
-# f_media_set_ftp
-#
-# Return success if we both found and set the media type to be an FTP server.
-# Variables from variable.subr that can be used to script user input:
-#
-# 	VAR_FTP_PATH
-# 		Can be a URL (including "ftp://" protocol-prefix) or "other"
-# 		(user is prompted to enter FTP URL). If a URL, can optionally
-# 		contain directory prefix after hostname/port. Valid examples
-# 		include:
-# 			ftp://myhost
-# 			ftp://somename:21/pub/
-# 			ftp://192.168.2.3/pub/
-# 			ftp://[::1]:21/
-# 		The default port if not specified is 21.
-# 	VAR_NAMESERVER [Optional]
-# 		If set, overrides resolv.conf(5) and sets the nameserver that
-# 		is used to convert names into addresses (when a name converts
-# 		into multiple addresses, the first address to successfully
-# 		connect is used).
-#
-# Meanwhile, the following variables from variable.subr are set after
-# successful execution:
-#
-# 	VAR_FTP_HOST
-# 		The FTP host to connect to, parsed from VAR_FTP_PATH. In the
-# 		example case of IPv6 where VAR_FTP_PATH is "ftp://[::1]", this
-# 		variable will be set to "::1" (the outer brackets are removed).
-# 	VAR_FTP_PORT
-# 		The TCP port to connect to, parsed from VAR_FTP_PATH. Usually
-# 		21 unless VAR_FTP_PATH was of one of the following forms:
-# 			ftp://hostname:OTHER_PORT
-# 			ftp://hostname:OTHER_PORT/*
-# 			ftp://ip:OTHER_PORT
-# 			ftp://ip:OTHER_PORT/*
-# 			ftp://[ip6]:OTHER_PORT
-# 			ftp://[ip6]:OTHER_PORT/*
-# 	VAR_FTP_DIR
-# 		If VAR_FTP_PATH contained a directory element (e.g.,
-# 		"ftp://localhost/pub") this variable contains only the
-# 		directory element (e.g., "/pub").
-#
-f_media_set_ftp()
-{
-	f_media_close
-
-	local url
-	f_getvar $VAR_FTP_PATH url
-
-	# If we've been through here before ...
-	if f_struct device_network && [ "${url#$msg_other}" ]; then
-		f_dialog_yesno "$msg_reuse_old_ftp_site_selection_values" ||
-			url=
-	fi
-
-	if [ ! "$url" ]; then
-		f_dialog_menu_media_ftp || return $FAILURE
-		f_getvar $VAR_FTP_PATH url
-	fi
-	[ "$url" ] || return $FAILURE
-
-	case "$url" in
-	other)
-		setvar $VAR_FTP_PATH "ftp://"
-		f_variable_get_value $VAR_FTP_PATH \
-			"$msg_please_specify_url_of_a_freebsd_distribution"
-		f_getvar $VAR_FTP_PATH url
-		if [ ! "${url#ftp://}" ]; then
-			unset $VAR_FTP_PATH
-			return $FAILURE
-		fi
-		if [ ${#url} -gt ${URL_MAX:-261261} ]; then
-			f_show_msg "$msg_length_of_specified_url_is_too_long" \
-			           ${#url} ${URL_MAX:-261261}
-			unset $VAR_FTP_PATH
-			return $FAILURE
-		fi
-		case "$url" in
-		ftp://*) : valid URL ;;
-		*)
-			f_show_msg "$msg_sorry_invalid_url" "$url"
-			unset $VAR_FTP_PATH
-			return $FAILURE
-		esac
-	esac
-	case "$url" in
-	ftp://*) : valid URL ;;
-	*)
-		f_show_msg "$msg_sorry_invalid_url" "$url"
-		unset $VAR_FTP_PATH
-		return $FAILURE
-	esac
-
-	# Set the name of the FTP device to the URL
-	f_struct_new DEVICE device_ftp
-	device_ftp set name "$url"
-
-	if ! f_struct device_network ||
-	   ! f_dialog_yesno "$msg_youve_already_done_the_network_configuration"
-	then
-		f_struct device_network &&
-			f_device_shutdown device_network
-		if ! f_device_select_tcp; then
-			unset $VAR_FTP_PATH
-			return $FAILURE
-		fi
-		local dev if
-		f_getvar $VAR_NETWORK_DEVICE if
-		f_device_find -1 "$if" $DEVICE_TYPE_NETWORK dev
-		f_struct_copy "$dev" device_network
-	fi
-	if ! f_device_init device_network; then
-		f_dprintf "f_media_set_ftp: %s" "$msg_net_device_init_failed"
-		unset $VAR_FTP_PATH
-		return $FAILURE
-	fi
-
-	local hostname="${url#*://}" port=21 dir=/
-	case "$hostname" in
-	#
-	# The order in-which the below individual cases appear is important!
-	#
-	"["*"]":*/*) # IPv6 address with port and directory
-		f_dprintf "Looks like an IPv6 addr with port/dir: %s" \
-		          "$hostname"
-		hostname="${hostname#\[}"
-		port="${hostname#*\]:}"
-		port="${port%%[!0-9]*}"
-		dir="/${hostname#*/}"
-		hostname="${hostname%%\]:*}"
-		;;
-	"["*"]":*) # IPv6 address with port
-		f_dprintf "Looks like an IPv6 addr with port: %s" "$hostname"
-		hostname="${hostname#\[}"
-		port="${hostname#*\]:}"
-		port="${port%%[!0-9]*}"
-		hostname="${hostname%%\]:*}"
-		;;
-	"["*"]"/*) # IPv6 address with directory
-		f_dprintf "Looks like an IPv6 addr with dir: %s" "$hostname"
-		hostname="${hostname#\[}"
-		dir="/${hostname#*/}"
-		hostname="${hostname%%\]*}"
-		;;
-	"["*"]") # IPv6 address
-		f_dprintf "Looks like an IPv6 addr: %s" "$hostname"
-		hostname="${hostname#\[}"
-		hostname="${hostname%\]}"
-		;;
-	#
-	# ^^^ IPv6 above / DNS Name or IPv4 below vvv
-	#
-	*:*/*) # DNS name or IPv4 address with port and directory
-		f_dprintf "Looks like a %s with port/dir: %s" \
-		          "DNS name or IPv4 addr" "$hostname"
-		port="${hostname#*:}"
-		port="${port%%[!0-9]*}"
-		dir="/${hostname#*/}"
-		hostname="${hostname%%:*}"
-		;;
-	*:*) # DNS name or IPv4 address with port
-		f_dprintf "Looks like a DNS name or IPv4 addr with port: %s" \
-		          "$hostname"
-		port="${hostname#*:}"
-		hostname="${hostname%%:*}"
-		;;
-	*/*) # DNS name or IPv4 address with directory
-		f_dprintf "Looks like a DNS name or IPv4 addr with dir: %s" \
-		          "$hostname"
-		dir="/${hostname#*/}"
-		hostname="${hostname%%/*}"
-		;;
-	*) # DNS name or IPv4 address
-		f_dprintf "Looks like a DNS name or IPv4 addr: %s" "$hostname"
-		: leave hostname as-is
-	esac
-
-	f_dprintf "hostname = \`%s'" "$hostname"
-	f_dprintf "dir = \`%s'" "$dir"
-	f_dprintf "port \# = \`%d'" "$port"
-
-	local ns
-	f_getvar $VAR_NAMESERVER ns
-	[ "$ns" ] || f_resolv_conf_nameservers ns
-	if [ "$ns" -a ! "$FTP_SKIP_RESOLV" ] && ! {
-		f_validate_ipaddr "$hostname" ||
-		f_validate_ipaddr6 "$hostname"
-	}; then
-		f_show_info "$msg_looking_up_host" "$hostname"
-		f_dprintf "%s: Looking up hostname, %s, using host(1)" \
-		          "f_media_set_ftp" "$hostname"
-		if ! f_quietly f_host_lookup "$hostname"; then
-			f_show_msg "$msg_cannot_resolve_hostname" "$hostname"
-			f_struct device_network &&
-				f_device_shutdown device_network
-			f_struct_free device_network
-			unset $VAR_FTP_PATH
-			return $FAILURE
-		fi
-		f_dprintf "Found DNS entry for %s successfully." "$hostname"
-	fi
-
-	setvar $VAR_FTP_HOST "$hostname"
-	setvar $VAR_FTP_PORT "$port"
-	setvar $VAR_FTP_DIR  "$dir"
-
-	device_ftp set type     $DEVICE_TYPE_FTP
-	device_ftp set init     f_media_init_ftp
-	device_ftp set get      f_media_get_ftp
-	device_ftp set shutdown f_media_shutdown_ftp
-	device_ftp set private  device_network
-	f_struct_copy device_ftp device_media
-	f_struct_free device_ftp
-
-	return $SUCCESS
-}
-
-# f_media_set_ftp_active
-#
-# Wrapper to f_media_set_ftp to access FTP servers actively.
-#
-f_media_set_ftp_active()
-{
-	setvar $VAR_FTP_STATE "active"
-	f_media_set_ftp
-}
-
-# f_media_set_ftp_passive
-#
-# Wrapper to f_media_set_ftp to access FTP servers passively.
-#
-f_media_set_ftp_passive()
-{
-	setvar $VAR_FTP_STATE "passive"
-	f_media_set_ftp
-}
-
-# f_media_set_ftp_userpass
-#
-# Prompt the user to enter/confirm the username/password variables that will
-# be used to communicate with the FTP servers. Returns success if the user does
-# not cancel or press Esc to either username or password.
-#
-# Variables from variable.subr that can be used to script user input:
-#
-# 	VAR_FTP_USER
-# 		The username to send via ftp(1) when connecting to an FTP
-# 		server.
-# 	VAR_FTP_PASS
-# 		The password to send with the above username.
-#
-# Does not prompt for confirmation of values if VAR_NONINTERACTIVE is set (see
-# variable.subr for more information).
-#
-f_media_set_ftp_userpass()
-{
-	local user pass
-	f_variable_get_value $VAR_FTP_USER \
-		"$msg_please_enter_the_username_you_wish_to_login_as"
-	f_getvar $VAR_FTP_USER user
-	if [ "$user" ]; then
-		f_variable_get_value $VAR_FTP_PASS \
-			"$msg_please_enter_the_password_for_this_user"
-		f_getvar $VAR_FTP_PASS pass
-	else
-		pass=
-	fi
-	[ "$pass" ] # Return status
-}
-
-# f_device_network_up $device
-#
-# Brings up attached network device, if any - takes FTP device as arg.
-#
-f_device_network_up()
-{
-	local dev="$1" netDev
-	f_struct "$dev" || return $FAILURE
-	$dev get private netDev || return $SUCCESS # No net == happy net
-debug=1 f_dprintf "netDev=[$netDev]"
-	f_device_init $netDev
-}
-
-# f_device_network_down $device
-#
-# Brings down attached network device, if any - takes FTP device as arg.
-#
-f_device_network_down()
-{
-	local dev="$1" netDev
-	f_struct "$dev" || return $FAILURE
-	$dev get private netDev || return $SUCCESS
-	f_device_shutdown $netDev
-}
-
-# f_media_init_ftp $device
-#
-# Initializes the FTP media device. Returns success if both able to log into
-# the FTP server and confirm the existence of at least one known release path
-# using ftp(1).
-#
-# Variables from variable.subr used to initialize the connection are as follows
-# (all of which are configured by f_media_set_ftp above):
-#
-# 	VAR_FTP_PATH
-# 		The unparsed FTP URL representing the server to contact.
-# 		Usually "ftp://server" for example. Can contain TCP port number
-# 		and/or directory path (but should not contain username/password
-# 		info).
-# 	VAR_FTP_HOST
-# 		The FTP host to connect to. Can be an IPv4 address (e.g.,
-# 		127.0.0.1), IPv6 address (e.g., ::1), or DNS hostname. Usually
-# 		set automatically in f_media_set_ftp() by parsing VAR_FTP_PATH.
-# 	VAR_FTP_PORT
-# 		The TCP port to connect to. Usually set automatically in
-# 		f_media_set_ftp() by parsing VAR_FTP_PATH.
-# 	VAR_FTP_DIR
-# 		The base FTP directory to use when downloading files from the
-# 		FTP server. Usually set automatically in f_media_set_ftp() by
-# 		parsing VAR_FTP_PATH.
-# 	VAR_FTP_USER [Optional]
-# 		If unset, defaults to using anonymous access.
-# 	VAR_FTP_PASS [Optional]
-# 		If unset, defaults to a sensible value.
-#
-# In addition, the following (managed either manually or by f_media_set_ftp_*):
-#
-# 	VAR_FTP_STATE
-# 		Sets FTPMODE for ftp(1) and can be one of:
-# 			active    active mode FTP only
-# 			auto      automatic determination of passive or active
-# 			          (this is the default)
-# 			gate      gate-ftp mode
-# 			passive   passive mode FTP only
-# 		See ftp(1) for additional information.
-#
-# And last, but not least (managed automatically or manually):
-#
-# 	VAR_RELNAME
-# 		Defaults to being set to $(uname -r) but can be overridden.
-# 		This sets the name of a release to look for as part of a well
-# 		known set of paths to search for release data once connected
-# 		via FTP. If set to "__RELEASE" or "any" then the VAR_FTP_DIR is
-# 		taken as the absolute path to the release and no further
-# 		searching is done (see FTP_DIRS above in the GLOBALS section
-# 		for a list of well known paths that are used when searching for
-# 		a VAR_RELNAME sub-directory).
-#
-f_media_init_ftp()
-{
-	local dev="$1"
-	local url
-
-	$dev get name url
-	f_dprintf "Init routine called for FTP device. url=[%s]" "$url"
-
-	if [ "$FTP_INITIALIZED" ]; then
-		f_dprintf "FTP device already initialized."
-		return $SUCCESS
-	fi
-
-	# If we can't initialize the network, bag it!
-	f_device_network_up $dev || return $FAILURE
-
-	local cp
-	while :; do
-		f_getvar $VAR_FTP_PATH cp
-		if [ ! "$cp" ]; then
-			if ! f_media_set_ftp ||
-			   ! f_getvar $VAR_FTP_PATH cp ||
-			   [ ! "$cp" ]
-			then
-				f_show_msg "$msg_unable_to_get_proper_ftp_path"
-				f_device_network_down $dev
-				return $FAILURE
-			fi
-		fi
-
-		local ftp_host ftp_dir
-		if ! {
-			f_getvar $VAR_FTP_HOST ftp_host &&
-			f_getvar $VAR_FTP_DIR ftp_dir
-		}; then
-			f_show_msg "$msg_missing_ftp_host_or_directory"
-			f_device_network_down $dev
-			return $FAILURE
-		fi
-
-		local ftp_port
-		f_getvar $VAR_FTP_PORT ftp_port
-		local host="$ftp_host" port="${ftp_port:+:$ftp_port}"
-		case "$host" in *:*) host="[$host]"; esac
-
-		local user pass use_anon=
-		f_getvar $VAR_FTP_USER user
-		if [ ! "$user" ]; then
-			user="anonymous"
-			use_anon=1
-		fi
-		if ! f_getvar $VAR_FTP_PASS pass; then
-			f_getvar $VAR_HOSTNAME cp
-			if f_running_as_init; then
-				pass="installer@$cp"
-			else
-				local name="$( id -un 2> /dev/null )"
-				pass="${name:-ftp}@$cp"
-			fi
-		fi
-
-		f_show_info "$msg_logging_in_to_user_at_host" \
-		            "$user" "$ftp_host"
-
-		local userpass=""
-		if [ ! "$use_anon" ] && [ "$user" -o "$pass" ]; then
-			userpass="$user${pass:+:$( f_uriencode "$pass" )}"
-			userpass="$userpass${userpass:+@}"
-		fi
-
-		local mode rx
-		f_getvar $VAR_FTP_STATE mode
-
-		if [ "$ftp_dir" ]; then
-			if ! rx=$(
-				printf 'cd "%s"\npwd\n' "$ftp_dir" | eval \
-					FTPMODE=\"\$mode\" \
-					${use_anon:+FTPANONPASS=\"\$pass\"} \
-					ftp -V ${use_anon:+-a} \
-					    \"ftp://\$userpass\$host\$port\" \
-				2>&1
-			); then
-				f_show_msg "$msg_couldnt_open_ftp_connection" \
-				           "$ftp_host" "$rx"
-				break # to failure
-			fi
-			if echo "$rx" | awk -v dir="/${ftp_dir#/}" '
-				BEGIN {
-					found = 0
-					if ( dir != "/" ) sub("/$", "", dir)
-				}
-				/^Remote directory: / {
-					sub(/^[^:]*:[[:space:]]*/, "")
-					if ($0 != dir) next
-					found = 1; exit
-				}
-				END { exit ! found }
-			'; then
-				setvar $VAR_FTP_DIR "$ftp_dir"
-				setvar $VAR_FTP_PATH \
-					"ftp://$ftp_host/${ftp_dir#/}"
-			else
-				f_show_msg \
-				    "$msg_please_check_the_url_and_try_again" \
-				    "ftp://$ftp_host/${ftp_dir#/}"
-				break # to failure
-			fi
-		fi
-
-		#
-		# Now that we've verified that the path we're given is ok,
-		# let's try to be a bit intelligent in locating the release we
-		# are looking for.  First off, if the release is specified as
-		# "__RELEASE" or "any", then just assume that the current
-		# directory is the one we want and give up.
-		#
-		local rel
-		f_getvar $VAR_RELNAME rel
-		f_dprintf "f_media_init_ftp: rel=[%s]" "$rel"
-
-		case "$rel" in
-		__RELEASE|any)
-			FTP_INITIALIZED=YES
-			return $SUCCESS
-			;;
-		*)
-			#
-			# Ok, since we have a release variable, let's walk
-			# through the list of directories looking for a release
-			# directory. First successful CWD wins.
-			#
-			if ! rx=$(
-				for dir in $FTP_DIRS; do
-					# Avoid confusing some servers
-					[ "$dir" = "." ] && continue
-					printf 'cd "/%s/%s"\npwd\n' \
-					       "$dir" "$rel"
-				done | eval \
-					FTPMODE=\"\$mode\" \
-					${use_anon:+FTPANONPASS=\"\$pass\"} \
-					ftp -V ${use_anon:+-a} \
-					    \"ftp://\$userpass\$host\$port\" \
-				2>&1
-			); then
-				f_show_msg "$msg_couldnt_open_ftp_connection" \
-				           "$ftp_host" "$rx"
-				break # to failure
-			fi
-
-			local fdir
-			if fdir=$( echo "$rx" | awk '
-				/^Remote directory: / {
-					sub(/^[^:]*:[[:space:]]*/, "")
-					if ($0 == "/") next
-					# Exit after the first dir
-					found++; print; exit
-				}
-				END { exit ! found }
-			' ); then
-				setvar $VAR_FTP_DIR "$fdir"
-				setvar $VAR_FTP_PATH "ftp://$ftp_host$fdir"
-				FTP_INITIALIZED=YES
-				return $SUCCESS
-			else
-				f_yesno "$msg_cant_find_distribution" \
-				        "$rel" "$ftp_host"
-				if [ $? -eq $DIALOG_OK ]; then
-					unset $VAR_FTP_PATH
-					f_media_set_ftp && continue
-				fi
-			fi
-		esac
-		break # to failure
-	done
-
-	unset FTP_INITIALIZED $VAR_FTP_PATH
-	f_device_network_down $dev
-	return $FAILURE
-}
-
-# f_media_get_ftp $device $file [$probe_type]
-#
-# Returns data from $file on an FTP server using ftp(1). Please note that
-# $device is unused but must be present (even if null). Information is instead
-# gathered from the environment. If $probe_type is present and non-NULL,
-# returns success if $file exists. If $probe_type is equal to $PROBE_SIZE,
-# prints the size of $file in bytes to standard-out.
-#
-# Variables from variable.subr used to configure the connection are as follows
-# (all of which are configured by f_media_set_ftp above):
-#
-# 	VAR_FTP_HOST
-# 		FTP host to connect to. Can be an IPv4 address, IPv6 address,
-# 		or DNS hostname of your choice.
-# 	VAR_FTP_PORT
-# 		TCP port to connect on; see f_media_set_ftp() above.
-# 	VAR_FTP_USER [Optional]
-# 		If unset, defaults to using anonymous access.
-# 	VAR_FTP_PASS [Optional]
-# 		If unset, defaults to a sensible value.
-#
-# In addition, the following (managed either manually or by f_media_set_ftp_*):
-#
-# 	VAR_FTP_STATE
-# 		Sets FTPMODE for ftp(1) and can be one of:
-# 			active    active mode FTP only
-# 			auto      automatic determination of passive or active
-# 			          (this is the default)
-# 			gate      gate-ftp mode
-# 			passive   passive mode FTP only
-# 		See ftp(1) for additional information.
-#
-# See variable.subr for additional information.
-#
-# Example usage:
-# 	f_media_set_ftp
-# 	f_media_get_ftp media $file
-#
-f_media_get_ftp()
-{
-	local funcname=f_media_get_ftp
-	local dev="$1" file="$2" probe_type="$3" hosts=
-
-	f_dprintf "f_media_get_ftp: dev=[%s] file=[%s] probe_type=%s" \
-	          "$dev" "$file" "$probe_type"
-
-	local ftp_host ftp_port
-	f_getvar $VAR_FTP_HOST ftp_host
-	f_getvar $VAR_FTP_PORT ftp_port
-
-	if [ ! "$FTP_INITIALIZED" ]; then
-		f_dprintf "No FTP connection open, can't get file %s" "$file"
-		return $FAILURE
-	fi
-
-	if ! {
-		f_validate_ipaddr "$ftp_host" ||
-		f_validate_ipaddr6 "$ftp_host" ||
-		{
-		  f_dprintf "%s: Looking up hostname, %s, using host(1)" \
-		            "f_media_get_ftp" "$ftp_host"
-		  f_host_lookup "$ftp_host" hosts
-		}
-	}; then
-		# All the above validations failed
-		[ "$hosts" ] && f_dialog_msgbox "$hosts"
-		return $FAILURE
-	elif [ ! "$hosts" ]; then
-		# One of the first two validations passed
-		hosts="$ftp_host"
-	fi
-
-	local host connected=
-	for host in $hosts; do
-		f_quietly nc -nz "$host" "$ftp_port" || continue
-		connected=1; break
-	done
-	if [ ! "$connected" ]; then
-		f_show_msg "$msg_couldnt_connect_to_ftp_server %s:%s" \
-		           "$ftp_host" "$ftp_port"
-		return $FAILURE
-	fi
-
-	local user pass use_anon=
-	f_getvar $VAR_FTP_USER user
-	if [ ! "$user" ]; then
-		user="anonymous"
-		use_anon=1
-	fi
-	if ! f_getvar $VAR_FTP_PASS pass; then
-		f_getvar $VAR_HOSTNAME cp
-		if f_running_as_init; then
-			pass="installer@$cp"
-		else
-			local name="$( id -un 2> /dev/null )"
-			pass="${name:-ftp}@$cp"
-		fi
-	fi
-
-	local userpass=""
-	if [ ! "$use_anon" ] && [ "$user" -o "$pass" ]; then
-		userpass="$user${pass:+:$( f_uriencode "$pass" )}"
-		userpass="$userpass${userpass:+@}"
-	fi
-
-	local dir mode rx
-	f_getvar $VAR_FTP_DIR\#/ dir
-	f_getvar $VAR_FTP_STATE mode
-
-	local port="${ftp_port:+:$ftp_port}"
-	case "$host" in *:*) host="[$host]"; esac
-
-	f_dprintf "sending ftp request for: %s" "ftp://$host$port/$dir/$file"
-
-	if [ "$probe_type" ]; then
-		local url="ftp://$userpass$host$port/$dir/$file" size
-		[ "$use_anon" ] && url="ftp://$host$port/$dir/$file"
-		if ! f_eval_catch -dk size $funcname fetch \
-			'fetch -s "%s"' "$url" || ! f_isinteger "$size"
-		then
-			f_dprintf "size request failed!"
-			[ "$probe_type" = "$PROBE_SIZE" ] && echo "-1"
-			return $FAILURE
-		fi
-		[ "$probe_type" = "$PROBE_SIZE" ] && echo "$size"
-		return $SUCCESS
-	fi
-
-	eval FTPMODE=\"\$mode\" ${use_anon:+FTPANONPASS=\"\$pass\"} \
-	     ftp -V ${use_anon:+-a} -o - \
-	     	\"ftp://\$userpass\$host\$port/\$dir/\$file\" 2> /dev/null
-	local retval=$?
-
-	[ $retval -eq $SUCCESS ] || f_dprintf "request failed!"
-	return $retval
-}
-
-# f_media_shutdown_ftp $device
-#
-# Shuts down the FTP device. Return status should be ignored. Note that since
-# we don't maintain an open connection to the FTP server there's nothing to do.
-#
-f_media_shutdown_ftp()
-{
-	[ "$FTP_INITIALIZED" ] || return $SUCCESS
-
-	unset FTP_INITIALIZED
-}
-
-############################################################ MAIN
-
-f_dprintf "%s: Successfully loaded." media/ftp.subr
-
-fi # ! $_MEDIA_FTP_SUBR
diff --git a/usr.sbin/bsdconfig/share/media/http.subr b/usr.sbin/bsdconfig/share/media/http.subr
index c4b1b131d236..e23f1abe27db 100644
--- a/usr.sbin/bsdconfig/share/media/http.subr
+++ b/usr.sbin/bsdconfig/share/media/http.subr
@@ -76,7 +76,6 @@ f_dialog_menu_media_http()
 	f_dialog_title_restore
 	local prompt="$msg_please_select_the_site_closest_to_you_or_other"
 	local menu_list="
-		'dist $msg_main_site' 'ftp.freebsd.org'
 		'pkg $msg_main_site'  'pkg.freebsd.org'
 		'URL'                 '$msg_specify_some_other_http_site'
 	" # END-QUOTE
diff --git a/usr.sbin/bsdconfig/share/media/httpproxy.subr b/usr.sbin/bsdconfig/share/media/httpproxy.subr
index b49a6bfb7901..442e29404e61 100644
--- a/usr.sbin/bsdconfig/share/media/httpproxy.subr
+++ b/usr.sbin/bsdconfig/share/media/httpproxy.subr
@@ -31,7 +31,6 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
 f_dprintf "%s: loading includes..." media/httpproxy.subr
 f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/media/ftp.subr
 f_include $BSDCFG_SHARE/media/tcpip.subr
 f_include $BSDCFG_SHARE/variable.subr
 
diff --git a/usr.sbin/bsdconfig/share/media/options.subr b/usr.sbin/bsdconfig/share/media/options.subr
index 340619a50ac1..0e9e06af6fb2 100644
--- a/usr.sbin/bsdconfig/share/media/options.subr
+++ b/usr.sbin/bsdconfig/share/media/options.subr
@@ -32,7 +32,6 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 f_dprintf "%s: loading includes..." media/options.subr
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/media/any.subr
-f_include $BSDCFG_SHARE/media/ftp.subr
 f_include $BSDCFG_SHARE/struct.subr
 f_include $BSDCFG_SHARE/variable.subr
 
@@ -138,11 +137,6 @@ f_media_options_menu()
 			    '$msg_attempt_ipv6_configuration_of_interfaces'"
 		fi
 
-		f_getvar $VAR_FTP_USER cp
-		menu_list="$menu_list
-			' $msg_ftp_username' '$cp'
-			    '$msg_username_and_password_to_use'"
-
 		f_getvar $VAR_EDITOR cp
 		menu_list="$menu_list
 			' $msg_editor' '$cp' '$msg_which_text_editor_to_use'"
@@ -158,8 +152,6 @@ f_media_options_menu()
 			$DEVICE_TYPE_UFS|$DEVICE_TYPE_DISK)
 				cp="$msg_file_system" ;;
 			$DEVICE_TYPE_DIRECTORY)  cp="$msg_directory"   ;;
-			$DEVICE_TYPE_FLOPPY)     cp="$msg_floppy"      ;;
-			$DEVICE_TYPE_FTP)        cp="$msg_ftp"         ;;
 			$DEVICE_TYPE_HTTP_PROXY) cp="$msg_http_proxy"  ;;
 			$DEVICE_TYPE_HTTP)       cp="$msg_http_direct" ;;
 			$DEVICE_TYPE_CDROM)      cp="$msg_cdrom"       ;;
@@ -285,8 +277,6 @@ f_media_options_menu()
 			else
 				export $VAR_TRY_RTSOL="YES"
 			fi ;;
-		" $msg_ftp_username")
-			f_media_set_ftp_userpass ;;
 		" $msg_editor")
 			f_variable_get_value $VAR_EDITOR \
 			    "$msg_please_specify_the_name_of_the_text_editor"
diff --git a/usr.sbin/bsdconfig/share/media/tcpip.subr b/usr.sbin/bsdconfig/share/media/tcpip.subr
index 9a08c739f2c5..85e35fd5b272 100644
--- a/usr.sbin/bsdconfig/share/media/tcpip.subr
+++ b/usr.sbin/bsdconfig/share/media/tcpip.subr
@@ -1029,7 +1029,6 @@ f_host_lookup()
 	{ f_quietly f_getvar $VAR_HTTP_PATH ||
 	  f_quietly f_getvar $VAR_HTTP_PROXY_PATH
 	} && __srvtypes="$__srvtypes _http._tcp"
-	f_quietly f_getvar $VAR_FTP_PATH && __srvtypes="$__srvtypes _ftp._tcp"
 	f_quietly f_getvar $VAR_NFS_PATH &&
 		__srvtypes="$__srvtypes _nfs._tcp _nfs._udp"
 
diff --git a/usr.sbin/bsdconfig/share/packages/Makefile b/usr.sbin/bsdconfig/share/packages/Makefile
index e694bf4157cf..c8e710902bec 100644
--- a/usr.sbin/bsdconfig/share/packages/Makefile
+++ b/usr.sbin/bsdconfig/share/packages/Makefile
@@ -1,5 +1,5 @@
 
 FILESDIR=	${SHAREDIR}/bsdconfig/packages
-FILES=		categories.subr index.subr musthavepkg.subr packages.subr
+FILES=		categories.subr index.awk index.subr musthavepkg.subr packages.subr
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsdconfig/share/packages/index.awk b/usr.sbin/bsdconfig/share/packages/index.awk
new file mode 100644
index 000000000000..f22aa150bd63
--- /dev/null
+++ b/usr.sbin/bsdconfig/share/packages/index.awk
@@ -0,0 +1,98 @@
+function _asorti(src, dest)
+{
+	k = nitems = 0
+
+	# Copy src indices to dest and calculate array length
+	for (i in src) dest[++nitems] = i
+
+	# Sort the array of indices (dest) using insertion sort method
+	for (i = 1; i <= nitems; k = i++)
+	{
+		idx = dest[i]
+		while ((k > 0) && (dest[k] > idx))
+		{
+			dest[k+1] = dest[k]
+			k--
+		}
+		dest[k+1] = idx
+	}
+
+	return nitems
+}
+
+function print_category(category, npkgs, desc)
+{
+	cat = category
+	# Accent the category if the first page has been
+	# cached (also acting as a visitation indicator)
+	if ( ENVIRON["_index_page_" varcat "_1"] )
+		cat = cat "*"
+	printf "'\''%s'\'' '\''%s " packages "'\'' '\''%s'\''\n",
+	       cat, npkgs, desc >>tmpfile
+}
+
+BEGIN{
+	cnt=0
+	div=int(npkg / 100)
+	last=0
+	prefix = ""
+}
+{
+	cnt+=1
+	i = int(cnt / div)
+	if (i > last) {
+		last = i
+		print "XXX"
+		print i
+		print msg
+		print "XXX"
+		fflush("/dev/stdout");
+	}
+	varpkg = $1
+	gsub("[^" valid_chars "]", "_", varpkg)
+	print "_categories_" varpkg "=\"" $7 "\"" >> tmpfile
+	split($7, pkg_categories, /[[:space:]]+/)
+	for (pkg_category in pkg_categories)
+		categories[pkg_categories[pkg_category]]++
+	print "_rundeps_" varpkg "=\"" $9 "\"" >> tmpfile
+
+}
+END {
+	n = _asorti(categories, categories_sorted)
+	# Produce package counts for each category
+	for (i = 1; i <= n; i++)
+	{
+		cat = varcat = categories_sorted[i]
+		npkgs = categories[cat]
+		gsub("[^" valid_chars "]", "_", varcat)
+		print "_npkgs_" varcat "=\"" npkgs "\"" >>tmpfile
+	}
+	#
+	# Create menu list and generate list of categories at same time
+	print "CATEGORY_MENU_LIST=\"" >>tmpfile
+	print_category(msg_all, npkg, msg_all_desc)
+	category_list = ""
+	for (i = 1; i <= n; i++)
+	{
+		cat = varcat = categories_sorted[i]
+		npkgs = categories[cat]
+		cur_prefix = tolower(substr(cat, 1, 1))
+		if ( prefix != cur_prefix )
+			prefix = cur_prefix
+		else
+			cat = " " cat
+		gsub("[^" valid_chars "]", "_", varcat)
+		desc = ENVIRON["_category_" varcat]
+		if ( ! desc ) desc = default_desc
+		print_category(cat, npkgs, desc)
+		category_list = category_list " " cat
+	}
+	print "\"" >>tmpfile
+
+	# Produce the list of categories (calculated in above block)
+	sub(/^ /, "", category_list)
+	print "PACKAGE_CATEGORIES=\"" category_list "\"" >> tmpfile
+	print "_npkgs=\""npkg"\"" >>tmpfile
+
+	print "EOF"
+}
diff --git a/usr.sbin/bsdconfig/share/packages/index.subr b/usr.sbin/bsdconfig/share/packages/index.subr
index dd432adf6adf..04f28603426b 100644
--- a/usr.sbin/bsdconfig/share/packages/index.subr
+++ b/usr.sbin/bsdconfig/share/packages/index.subr
@@ -90,11 +90,6 @@ f_index_initialize()
 	case "$__type" in
 	$DEVICE_TYPE_DIRECTORY)
 		__site="file://$__data/packages/$PKG_ABI" ;;
-	$DEVICE_TYPE_FLOPPY)
-		__site="file://${__data:-$MOUNTPOINT}/packages/$PKG_ABI" ;;
-	$DEVICE_TYPE_FTP)
-		f_getvar $VAR_FTP_PATH __site
-		__site="$__site/packages/$PKG_ABI" ;;
 	$DEVICE_TYPE_HTTP)
 		f_getvar $VAR_HTTP_PATH __site
 		__site="$__site/$PKG_ABI/latest" ;;
@@ -151,7 +146,7 @@ f_index_initialize()
 				# one populate the environment from the on-disk
 				# cache and provide success exit status.
 				#
-				if [ "$digest" = "$__sqlite_digest" ]; then
+				if [ "$digest" = "#$__sqlite_digest" ]; then
 					cat
 					exit $SUCCESS
 				else
@@ -176,24 +171,27 @@ f_index_initialize()
 	# If we reach this point, we need to generate the data from scratch
 	#
 
-	eval "$__var_to_set"='$( pkg rquery -I | (
-		exec 2<&1; dpv -ko /dev/stderr >&$TERMINAL_STDOUT_PASSTHRU \
-			-b "$DIALOG_BACKTITLE" \
-			-- "$msg_generating_index_from_pkg_database"
-	) | sort )'
-
-	#
-	# Attempt to create the persistent on-disk cache
-	#
-
 	# Create a new temporary file to write to
 	local __tmpfile
 	if f_eval_catch -dk __tmpfile $__funcname mktemp \
-		'mktemp -t "%s"' "$pgm"
-	then
+		'mktemp -t "%s"' "$pgm"; then
+		local _npkg
 		# Write the temporary file contents
-		echo "$__sqlite_digest" > "$__tmpfile"
-		debug= f_getvar "$__var_to_set" >> "$__tmpfile"
+		echo "#$__sqlite_digest" > "$__tmpfile"
+		f_eval_catch -k _npkg $__funcname pkg \
+			"pkg stat -r | awk '%s'" '/Packages available/ { print $3 }'
+		pkg rquery -I | awk -v npkg=$_npkg \
+			-v msg="$msg_generating_index_from_pkg_database" \
+			-v tmpfile="$__tmpfile" \
+			-v valid_chars="$VALID_VARNAME_CHARS" \
+			-v default_desc="$msg_no_description_provided" \
+			-v packages="$msg_packages" \
+			-v msg_all="$msg_all" \
+			-v msg_all_desc="$msg_all_desc" \
+			-F "|" \
+			-f $BSDCFG_SHARE/packages/index.awk | \
+			$DIALOG --backtitle "$DIALOG_BACKTITLE" \
+			--gauge "$msg_generating_index_from_pkg_database" 0 0
 
 		# Finally, move the temporary file into place
 		case "$PACKAGES_INDEX_CACHEFILE" in
@@ -202,10 +200,13 @@ f_index_initialize()
 		esac
 		f_eval_catch -d $__funcname mv 'mv -f "%s" "%s"' \
 			"$__tmpfile" "$PACKAGES_INDEX_CACHEFILE"
+	else
+		return $FAILURE
 	fi
 
 	if ! f_index_read "$__var_to_set"; then
-		f_show_err "$msg_io_or_format_error_on_index_file"
+		f_show_err \
+			"$msg_io_or_format_error_on_index_file"
 		return $FAILURE
 	fi
 
@@ -239,98 +240,7 @@ f_index_read()
 	export VALID_VARNAME_CHARS
 	export msg_packages
 
-	eval "$( debug= f_getvar "$var_to_get" | awk -F'|' '
-	function _asorti(src, dest)
-	{
-		k = nitems = 0
-
-		# Copy src indices to dest and calculate array length
-		for (i in src) dest[++nitems] = i
-
-		# Sort the array of indices (dest) using insertion sort method
-		for (i = 1; i <= nitems; k = i++)
-		{
-			idx = dest[i]
-			while ((k > 0) && (dest[k] > idx))
-			{
-				dest[k+1] = dest[k]
-				k--
-			}
-			dest[k+1] = idx
-		}
-
-		return nitems
-	}
-	function print_category(category, npkgs, desc)
-	{
-		cat = category
-		# Accent the category if the first page has been
-		# cached (also acting as a visitation indicator)
-		if ( ENVIRON["_index_page_" varcat "_1"] )
-			cat = cat "*"
-		printf "'\''%s'\'' '\''%s " packages "'\'' '\''%s'\''\n",
-		       cat, npkgs, desc
-	}
-	BEGIN {
-		valid_chars = ENVIRON["VALID_VARNAME_CHARS"]
-		default_desc = ENVIRON["msg_no_description_provided"]
-		packages = ENVIRON["msg_packages"]
-		tpkgs = 0
-		prefix = ""
-	}
-	{
-		tpkgs++
-		varpkg = $1
-		gsub("[^" valid_chars "]", "_", varpkg)
-		print "_categories_" varpkg "=\"" $7 "\""
-		split($7, pkg_categories, /[[:space:]]+/)
-		for (pkg_category in pkg_categories)
-			categories[pkg_categories[pkg_category]]++
-		print "_rundeps_" varpkg "=\"" $9 "\""
-	}
-	END {
-		print "_npkgs=" tpkgs # For convenience, total package count
-
-		n = _asorti(categories, categories_sorted)
-
-		# Produce package counts for each category
-		for (i = 1; i <= n; i++)
-		{
-			cat = varcat = categories_sorted[i]
-			npkgs = categories[cat]
-			gsub("[^" valid_chars "]", "_", varcat)
-			print "_npkgs_" varcat "=\"" npkgs "\""
-		}
-
-		# Create menu list and generate list of categories at same time
-		print "CATEGORY_MENU_LIST=\""
-		print_category(ENVIRON["msg_all"], tpkgs,
-		               ENVIRON["msg_all_desc"])
-		category_list = ""
-		for (i = 1; i <= n; i++)
-		{
-			cat = varcat = categories_sorted[i]
-			npkgs = categories[cat]
-			cur_prefix = tolower(substr(cat, 1, 1))
-			if ( prefix != cur_prefix )
-				prefix = cur_prefix
-			else
-				cat = " " cat
-			gsub("[^" valid_chars "]", "_", varcat)
-			desc = ENVIRON["_category_" varcat]
-			if ( ! desc ) desc = default_desc
-			print_category(cat, npkgs, desc)
-			category_list = category_list " " cat
-		}
-		print "\""
-
-		# Produce the list of categories (calculated in above block)
-		sub(/^ /, "", category_list)
-		print "PACKAGE_CATEGORIES=\"" category_list "\""
-
-	}' | ( exec 2<&1; dpv -ko /dev/stderr >&$TERMINAL_STDOUT_PASSTHRU \
-		-b "$DIALOG_BACKTITLE" -- "$msg_reading_package_index_data"
-	) )" # End-Quote
+	. $PACKAGES_INDEX_CACHEFILE
 }
 
 # f_index_extract_pages $var_to_get $var_basename $pagesize [$category]
@@ -347,19 +257,14 @@ f_index_read()
 f_index_extract_pages()
 {
 	local var_to_get="${1:-PACKAGE_INDEX}" var_basename="$2" pagesize="$3"
-	local category="$4" # Optional
 
 	eval "$(
 		debug= f_getvar "$var_to_get" | awk -F'|' \
-			-v cat="$category" \
 			-v pagesize="$pagesize" \
-			-v var_basename="$var_basename" \
-			-v i18n_all="$msg_all" '
+			-v var_basename="$var_basename" ' \
 		BEGIN { n = page = 0 }
 		/'\''/{ gsub(/'\''/, "'\''\\'\'\''") }
 		{
-			if ( cat !~ "(^$|^" i18n_all "$)" && $7 !~ \
-			     "(^|[[:space:]])" cat "([[:space:]]|$)" ) next
 			starting_new_page = (n++ == (pagesize * page))
 			if ( starting_new_page )
 				printf "%s%s", ( n > 1 ? "'\''\n" : "" ),
diff --git a/usr.sbin/bsdconfig/share/packages/musthavepkg.subr b/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
index 9b5d94675345..0a1026afe86c 100644
--- a/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
+++ b/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
@@ -44,26 +44,16 @@ f_include $BSDCFG_SHARE/mustberoot.subr
 f_musthavepkg_init()
 {
 	local funcname=f_musthavepkg_init
-	local pkg_abi_awk=' # BEGIN-AWK
-		$1 ~ /^ABI/ && $0 = $NF, sub(/^"/, "") && sub(/".*/, "") {
-			print; found = 1; exit
-		} END { exit ! found }
-	' # END-AWK
 
-	if [ "$PKG_ABI" ]; then # Already set
-		f_dprintf "PKG_ABI=[%s]" "$PKG_ABI"
-		export PKG_ABI
-		f_quietly pkg -N -vv # return status (pkg(8) functional?)
-		return $?
-	fi
-
-	# Attempt to get PKG_ABI without prematurely bootstrapping pkg(8)
-	if f_eval_catch -k PKG_ABI $funcname pkg \
-		"pkg -N -vv | awk '%s'" "$pkg_abi_awk"
-	then
-		f_dprintf "PKG_ABI=[%s]" "$PKG_ABI"
-		export PKG_ABI
-		return $SUCCESS
+	if f_quietly pkg -N; then
+		if [ -n "$PKG_ABI" ]; then
+			export PKG_ABI
+			return $SUCCESS
+		fi
+		if f_eval_catch -k PKG_ABI $funcname pkg "pkg config abi"; then
+			export PKG_ABI
+			return $SUCCESS
+		fi
 	fi
 
 	# pkg(8) not yet bootstrapped; ask for permission unless nonInteractive
@@ -74,10 +64,10 @@ f_musthavepkg_init()
 
 	# Bootstrap pkg(8)
 	f_dialog_info "$msg_bootstrapping_pkg"
-	f_eval_catch -k PKG_ABI $funcname pkg \
-		"ASSUME_ALWAYS_YES=1 pkg -vv | awk '%s'" "$pkg_abi_awk" ||
+	f_eval_catch $funcname pkg \
+		"pkg bootstrap -y" ||
 		f_die 1 "$msg_must_have_pkg_to_execute" "$pgm"
-
+	f_eval_catch -k PKG_ABI $funcname pkg "pkg config abi"
 	f_dprintf "PKG_ABI=[%s]" "$PKG_ABI"
 	export PKG_ABI
 	return $SUCCESS
diff --git a/usr.sbin/bsdconfig/share/packages/packages.subr b/usr.sbin/bsdconfig/share/packages/packages.subr
index 554e7f9bb9e0..38059d4748a6 100644
--- a/usr.sbin/bsdconfig/share/packages/packages.subr
+++ b/usr.sbin/bsdconfig/share/packages/packages.subr
@@ -378,6 +378,7 @@ f_package_index_get_page()
 #
 f_package_menu_select()
 {
+	local __funcname=f_package_menu_deselect
 	local category="$1" page="${2:-1}"
 	local prompt= # Calculated below
 	local menu_list # Calculated below
@@ -424,8 +425,15 @@ f_package_menu_select()
 			next_page="$next_page*"
 	fi
 
-	local index_page
-	f_package_index_get_page "$category" $page index_page
+	local index_page __index
+	if [ "$category" = "$msg_all" ]; then
+		f_eval_catch -k __index $__funcname pkg \
+			"pkg rquery -a '%s'"  "%n|%o||%c"
+	else
+		f_eval_catch -k __index $__funcname pkg \
+			"pkg rquery -g '%s' '%s/\*'"  "%n|%o||%c" "$category"
+	fi
+	f_package_index_get_page "$category" $page index_page __index
 
 	menu_list="
 		${add_prev:+'> $previous_page' '' ${SHOW_DESC:+''}}
diff --git a/usr.sbin/bsdconfig/share/script.subr b/usr.sbin/bsdconfig/share/script.subr
index feac3b47bdef..c395fc5395cc 100644
--- a/usr.sbin/bsdconfig/share/script.subr
+++ b/usr.sbin/bsdconfig/share/script.subr
@@ -171,19 +171,12 @@ f_resword_new mediaGetType	f_media_get_type         # media/any.subr
 f_resword_new mediaSetCDROM	f_media_set_cdrom        # media/cdrom.subr
 f_resword_new mediaSetDOS	f_media_set_dos          # media/dos.subr
 f_resword_new mediaSetDirectory	f_media_set_directory    # media/directory.subr
-f_resword_new mediaSetFloppy	f_media_set_floppy       # media/floppy.subr
 f_resword_new mediaSetNFS	f_media_set_nfs          # media/nfs.subr
 f_resword_new mediaSetUFS	f_media_set_ufs          # media/ufs.subr
 f_resword_new mediaSetUSB	f_media_set_usb          # media/usb.subr
 f_resword_new optionsEditor	f_media_options_menu     # media/options.subr
 f_resword_new tcpMenuSelect	f_dialog_menu_select_tcp # media/tcp.subr
 
-# media/ftp.subr
-f_resword_new mediaSetFTP		f_media_set_ftp
-f_resword_new mediaSetFTPActive		f_media_set_ftp_active
-f_resword_new mediaSetFTPPassive	f_media_set_ftp_passive
-f_resword_new mediaSetFTPUserPass	f_media_set_ftp_userpass
-
 # media/http.subr
 f_resword_new mediaSetHTTP	f_media_set_http
 
diff --git a/usr.sbin/bsdconfig/share/variable.subr b/usr.sbin/bsdconfig/share/variable.subr
index e5e96a686f05..2a81200e8d01 100644
--- a/usr.sbin/bsdconfig/share/variable.subr
+++ b/usr.sbin/bsdconfig/share/variable.subr
@@ -111,8 +111,6 @@ f_variable_set_defaults()
 	# Initialize various user-edittable values to their defaults
 	#
 	setvar $VAR_EDITOR		"${EDITOR:-/usr/bin/ee}"
-	setvar $VAR_FTP_STATE		"auto"
-	setvar $VAR_FTP_USER		"ftp"
 	setvar $VAR_HOSTNAME		"$( hostname )"
 	setvar $VAR_MEDIA_TIMEOUT	"300"
 	setvar $VAR_NFS_SECURE		"NO"
@@ -128,8 +126,6 @@ f_variable_set_defaults()
 		local var
 		for var in \
 			$VAR_EDITOR		\
-			$VAR_FTP_STATE		\
-			$VAR_FTP_USER		\
 			$VAR_HOSTNAME		\
 			$VAR_MEDIA_TIMEOUT	\
 			$VAR_NFS_SECURE		\
@@ -232,13 +228,6 @@ f_variable_new VAR_DIRECTORY_PATH	_directoryPath
 f_variable_new VAR_DOMAINNAME		domainname
 f_variable_new VAR_EDITOR		editor
 f_variable_new VAR_EXTRAS		ifconfig_
-f_variable_new VAR_FTP_DIR		ftpDirectory
-f_variable_new VAR_FTP_HOST		ftpHost
-f_variable_new VAR_FTP_PASS		ftpPass
-f_variable_new VAR_FTP_PATH		_ftpPath
-f_variable_new VAR_FTP_PORT		ftpPort
-f_variable_new VAR_FTP_STATE		ftpState
-f_variable_new VAR_FTP_USER		ftpUser
 f_variable_new VAR_GATEWAY		defaultrouter
 f_variable_new VAR_GROUP		group
 f_variable_new VAR_GROUP_GID		groupGid
diff --git a/usr.sbin/bsdinstall/partedit/diskmenu.c b/usr.sbin/bsdinstall/partedit/diskmenu.c
index 9e16ef96171a..f87c7714e5a7 100644
--- a/usr.sbin/bsdinstall/partedit/diskmenu.c
+++ b/usr.sbin/bsdinstall/partedit/diskmenu.c
@@ -62,10 +62,10 @@ diskmenu_show(const char *title, const char *text, struct partedit_item *items,
 	bsddialog_initconf(&conf);
 	conf.title = title;
 	conf.menu.align_left = true;
-	conf.text.highlight = true;
+	conf.text.escape = true;
 	conf.key.f1_message="[\\Z1\\ZbC\\Znreate]: a new partition.\n"
 		"[\\Z1\\ZbD\\Znelete]: selected partition(s).\n"
-		"[\\Z1\\ZbC\\Znhange]: partition type or mountpoint.\n"
+		"[\\Z1\\ZbM\\Znodify]: partition type or mountpoint.\n"
 		"[\\Z1\\ZbR\\Znevert]: changes to disk setup.\n"
 		"[\\Z1\\ZbA\\Znuto]:   guided partitioning tool.\n"
 		"[\\Z1\\ZbF\\Zninish]: will ask to apply changes.";
@@ -76,8 +76,8 @@ diskmenu_show(const char *title, const char *text, struct partedit_item *items,
 	conf.button.cancel_label   = "Modify";
 	conf.button.with_help      = true;
 	conf.button.help_label     = "Revert";
-	conf.button.generic1_label = "Auto";
-	conf.button.generic2_label = "Finish";
+	conf.button.right1_label = "Auto";
+	conf.button.right2_label = "Finish";
 	conf.button.default_label  = "Finish";
 	output = bsddialog_menu(&conf, text, 20, 0, 10, nitems, bsditems,
 	    focusitem);
diff --git a/usr.sbin/bsdinstall/partedit/diskmenu.h b/usr.sbin/bsdinstall/partedit/diskmenu.h
index 7c0e3c505f9e..9fce2e813214 100644
--- a/usr.sbin/bsdinstall/partedit/diskmenu.h
+++ b/usr.sbin/bsdinstall/partedit/diskmenu.h
@@ -33,8 +33,8 @@
 #define BUTTON_DELETE BSDDIALOG_EXTRA
 #define BUTTON_MODIFY BSDDIALOG_CANCEL
 #define BUTTON_REVERT BSDDIALOG_HELP
-#define BUTTON_AUTO   BSDDIALOG_GENERIC1
-#define BUTTON_FINISH BSDDIALOG_GENERIC2
+#define BUTTON_AUTO   BSDDIALOG_RIGHT1
+#define BUTTON_FINISH BSDDIALOG_RIGHT2
 
 struct partedit_item {
 	int indentation;
diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c
index 8b75d2d6d859..92d1a367890c 100644
--- a/usr.sbin/bsdinstall/partedit/gpart_ops.c
+++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c
@@ -639,9 +639,8 @@ gpart_edit(struct gprovider *pp)
 	items[1].init = sizestr;
 
 editpart:
-	conf.form.value_without_ok = true;
 	conf.title = "Edit Partition";
-	choice = bsddialog_form(&conf, "", 0, 0, 0, nitems, items);
+	choice = bsddialog_form(&conf, "", 0, 0, 0, nitems, items, NULL);
 
 	if (choice == BSDDIALOG_CANCEL)
 		goto endedit;
@@ -1129,12 +1128,10 @@ gpart_create(struct gprovider *pp, const char *default_type,
 	if (interactive) {
 		conf.button.with_extra = true;
 		conf.button.extra_label = "Options";
-		conf.form.value_without_ok = true;
 		conf.title = "Add Partition";
-		choice = bsddialog_form(&conf, "", 0, 0, 0, nitems, items);
+		choice = bsddialog_form(&conf, "", 0, 0, 0, nitems, items, NULL);
 		conf.button.with_extra = false;
 		conf.button.extra_label = NULL;
-		conf.form.value_without_ok = false;
 		switch (choice) {
 		case BSDDIALOG_OK:
 			break;
diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c
index 9cdd72dd333d..83e69dc0b0e6 100644
--- a/usr.sbin/bsdinstall/partedit/part_wizard.c
+++ b/usr.sbin/bsdinstall/partedit/part_wizard.c
@@ -73,7 +73,7 @@ part_wizard(const char *fsreq)
 		return (1);
 	}
 
-	bsddialog_clearterminal();
+	bsddialog_clear(0);
 	bsddialog_backtitle(&conf, "FreeBSD Installer");
 	schemeroot = wizard_partition(&mesh, disk);
 	free(disk);
@@ -81,7 +81,7 @@ part_wizard(const char *fsreq)
 	if (schemeroot == NULL)
 		return (1);
 
-	bsddialog_clearterminal();
+	bsddialog_clear(0);
 	bsddialog_backtitle(&conf, "FreeBSD Installer");
 	error = geom_gettree(&mesh);
 	if (error != 0) {
diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c
index 6579c22f6068..668824725ac8 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.c
+++ b/usr.sbin/bsdinstall/partedit/partedit.c
@@ -123,7 +123,7 @@ main(int argc, const char **argv)
 
 	/* Show the part editor either immediately, or to confirm wizard */
 	while (prompt != NULL) {
-		bsddialog_clearterminal();
+		bsddialog_clear(0);
 		if (!sade_mode)
 			bsddialog_backtitle(&conf, "FreeBSD Installer");
 
diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile
index 50f4845a79ca..8966c8dd43ab 100644
--- a/usr.sbin/bsdinstall/scripts/Makefile
+++ b/usr.sbin/bsdinstall/scripts/Makefile
@@ -9,6 +9,7 @@ SCRIPTS=auto \
 	docsinstall \
 	entropy \
 	fetchmissingdists \
+	finalconfig \
 	hardening \
 	hostname \
 	jail \
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
index ece043edb757..e60c46739619 100755
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -179,7 +179,7 @@ for dist in $DISTRIBUTIONS; do
 done
 
 if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; then
-	dialog --backtitle "$OSNAME Installer" --title "Network Installation" --msgbox "Some installation files were not found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0
+	bsddialog --backtitle "$OSNAME Installer" --title "Network Installation" --msgbox "Some installation files were not found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0
 	bsdinstall netconfig || error
 	NETCONFIG_DONE=yes
 fi
@@ -314,7 +314,7 @@ aarch64*c*|riscv*c*)
 esac
 
 exec 5>&1
-PARTMODE=`echo $PMODES | xargs dialog --backtitle "$OSNAME Installer" \
+PARTMODE=`echo $PMODES | xargs -o bsddialog --backtitle "$OSNAME Installer" \
 	--title "Partitioning" \
 	--item-help \
 	--menu "How would you like to partition your disk?" \
@@ -381,7 +381,7 @@ fi
 #
 #[ -z "$BSDINSTALL_SKIP_HARDENING" ] && bsdinstall hardening
 
-[ -z "$BSDINSTALL_SKIP_USERS" ] && dialog --backtitle "$OSNAME Installer" \
+[ -z "$BSDINSTALL_SKIP_USERS" ] && bsddialog --backtitle "$OSNAME Installer" \
 	--title "Add User Accounts" --yesno \
     "Would you like to add users to the installed system now?" 0 0 && \
     bsdinstall adduser
@@ -399,76 +399,8 @@ esac
 [ -n "$HAVE_CHERI_DESKTOP" ] && [ -z "$BSDINSTALL_SKIP_CHERI_DESKTOP" ] && bsdinstall cheri-desktop
 [ -n "$HAVE_CHERI_VM_SUPPORT" ] && [ -z "$BSDINSTALL_SKIP_CHERI_VM_SUPPORT" ] && bsdinstall cheri-vm-support
 
-finalconfig() {
-	if [ -n "$HAVE_CHERI_DESKTOP" ]; then
-		CHERI_DESKTOP_REVISIT='"CHERI Desktop" "Install the CHERI desktop environment (requires network)"'
-		CHERI_VM_SUPPORT_REVISIT='"CHERI VM Support" "Install CHERI virtual machine support (requires network)"'
-	else
-		CHERI_DESKTOP_REVISIT=
-		CHERI_VM_SUPPORT_REVISIT=
-	fi
-	exec 5>&1
-	REVISIT=$(echo $CHERI_DESKTOP_REVISIT $CHERI_VM_SUPPORT_REVISIT | \
-	    xargs dialog --backtitle "$OSNAME Installer" \
-	    --title "Final Configuration" --no-cancel --menu \
-	    "Setup of your $OSNAME system is nearly complete. You can now modify your configuration choices. After this screen, you will have an opportunity to make more complex changes using a shell." 0 0 0 \
-		"Exit" "Apply configuration and exit installer" \
-		"Add User" "Add a user to the system" \
-		"Root Password" "Change root password" \
-		"Hostname" "Set system hostname" \
-		"Network" "Networking configuration" \
-		"Services" "Set daemons to run on startup" \
-		"System Hardening" "Set security options" \
-		"Time Zone" "Set system timezone" \
-		"Handbook" "Install $OSNAME Handbook (requires network)" 2>&1 1>&5)
-	exec 5>&-
-
-	case "$REVISIT" in
-	"Add User")
-		bsdinstall adduser
-		finalconfig
-		;;
-	"Root Password")
-		bsdinstall rootpass
-		finalconfig
-		;;
-	"Hostname")
-		bsdinstall hostname
-		finalconfig
-		;;
-	"Network")
-		bsdinstall netconfig
-		finalconfig
-		;;
-	"Services")
-		bsdinstall services
-		finalconfig
-		;;
-	"System Hardening")
-		bsdinstall hardening
-		finalconfig
-		;;
-	"Time Zone")
-		bsdinstall time
-		finalconfig
-		;;
-	"Handbook")
-		bsdinstall docsinstall
-		finalconfig
-		;;
-	"CHERI Desktop")
-		bsdinstall cheri-desktop
-		finalconfig
-		;;
-	"CHERI VM Support")
-		bsdinstall cheri-vm-support
-		finalconfig
-		;;
-	esac
-}
-
 # Allow user to change his mind
-[ -z "$BSDINSTALL_SKIP_FINALCONFIG" ] && finalconfig
+[ -z "$BSDINSTALL_SKIP_FINALCONFIG" ] && bsdinstall finalconfig
 
 trap error SIGINT	# SIGINT is bad again
 bsdinstall config  || error "Failed to save config"
@@ -480,8 +412,8 @@ fi
 [ -f /usr/libexec/bsdinstall/local.post-configure ] && f_dprintf "Running local.post-configure" && sh /usr/libexec/bsdinstall/local.post-configure "$BSDINSTALL_CHROOT"
 
 if [ -z "$BSDINSTALL_SKIP_MANUAL" ]; then
-	dialog --backtitle "$OSNAME Installer" --title "Manual Configuration" \
-		--default-button no --yesno \
+	bsddialog --backtitle "$OSNAME Installer" --title "Manual Configuration" \
+		--default-no --yesno \
 		"The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0
 	if [ $? -eq 0 ]; then
 		clear
diff --git a/usr.sbin/bsdinstall/scripts/finalconfig b/usr.sbin/bsdinstall/scripts/finalconfig
new file mode 100755
index 000000000000..d2764d99d70b
--- /dev/null
+++ b/usr.sbin/bsdinstall/scripts/finalconfig
@@ -0,0 +1,108 @@
+#!/bin/sh
+#-
+# Copyright (c) 2011 Nathan Whitehorn
+# Copyright (c) 2013-2018 Devin Teske
+# 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$
+
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+
+: ${BSDDIALOG_OK=0}
+
+case `uname -p` in
+aarch64c)
+	HAVE_CHERI_DESKTOP=yes
+	HAVE_CHERI_VM_SUPPORT=yes
+	;;
+*)
+	HAVE_CHERI_DESKTOP=
+	HAVE_CHERI_VM_SUPPORT=
+	;;
+esac
+
+if [ -n "$HAVE_CHERI_DESKTOP" ]; then
+	CHERI_DESKTOP_REVISIT='"CHERI Desktop" "Install the CHERI desktop environment (requires network)"'
+	CHERI_VM_SUPPORT_REVISIT='"CHERI VM Support" "Install CHERI virtual machine support (requires network)"'
+else
+	CHERI_DESKTOP_REVISIT=
+	CHERI_VM_SUPPORT_REVISIT=
+fi
+
+while true; do
+	exec 5>&1
+	REVISIT=$(echo $CHERI_DESKTOP_REVISIT $CHERI_VM_SUPPORT_REVISIT | \
+	    xargs bsddialog --backtitle "$OSNAME Installer" \
+	    --title "Final Configuration" --ok-label "Select" \
+	    --cancel-label "Finish" --default-no --menu \
+	    "Setup of your $OSNAME system is nearly complete. You can now modify your configuration choices. After this screen, you will have an opportunity to make more complex changes using a shell." 0 0 0 \
+		"Add User" "Add a user to the system" \
+		"Root Password" "Change root password" \
+		"Hostname" "Set system hostname" \
+		"Network" "Networking configuration" \
+		"Services" "Set daemons to run on startup" \
+		"System Hardening" "Set security options" \
+		"Time Zone" "Set system timezone" \
+		"Handbook" "Install $OSNAME Handbook (requires network)" 2>&1 1>&5)
+	retval=$?
+	exec 5>&-
+
+	if [ $retval -ne $BSDDIALOG_OK ]; then
+		break
+	fi
+
+	case "$REVISIT" in
+	"Add User")
+		bsdinstall adduser
+		;;
+	"Root Password")
+		bsdinstall rootpass
+		;;
+	"Hostname")
+		bsdinstall hostname
+		;;
+	"Network")
+		bsdinstall netconfig
+		;;
+	"Services")
+		bsdinstall services
+		;;
+	"System Hardening")
+		bsdinstall hardening
+		;;
+	"Time Zone")
+		bsdinstall time
+		;;
+	"Handbook")
+		bsdinstall docsinstall
+		;;
+	"CHERI Desktop")
+		bsdinstall cheri-desktop
+		;;
+	"CHERI VM Support")
+		bsdinstall cheri-vm-support
+		;;
+	esac
+done
diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail
index ab095f44ba39..feb9d8b1c097 100755
--- a/usr.sbin/bsdinstall/scripts/jail
+++ b/usr.sbin/bsdinstall/scripts/jail
@@ -49,6 +49,7 @@ error() {
 	if [ $? -ne $BSDDIALOG_OK ]; then
 		exit
 	else
+		[ -z "$MIRROR_BUTTON" ] || unset BSDINSTALL_DISTSITE
 		exec $0 $BSDINSTALL_CHROOT
 	fi
 }
diff --git a/usr.sbin/bsdinstall/scripts/keymap b/usr.sbin/bsdinstall/scripts/keymap
index 63f1f2455096..6f4060c0772e 100755
--- a/usr.sbin/bsdinstall/scripts/keymap
+++ b/usr.sbin/bsdinstall/scripts/keymap
@@ -195,7 +195,7 @@ while :; do
 		--default-item \"\$defaultitem\"   \
 		--menu \"\$prompt\"                \
 		$height $width $rows               \
-		$menu_list                         \
+		${USE_DIALOG:+--} $menu_list       \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
 	) || {
 		f_quietly rm -f "$KEYMAPFILE"
diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig
index 99c129ab61f5..200312333020 100755
--- a/usr.sbin/bsdinstall/scripts/netconfig
+++ b/usr.sbin/bsdinstall/scripts/netconfig
@@ -81,7 +81,7 @@ exec 5>&-
 IFCONFIG_PREFIX=""
 if is_wireless_if $INTERFACE; then
 	NEXT_WLAN_IFACE=wlan0	# XXX
-	echo wlans_$INTERFACE=\"$NEXT_WLAN_IFACE\" >> $BSDINSTALL_TMPETC/._rc.conf.net
+	sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net wlans_$INTERFACE="$NEXT_WLAN_IFACE"
 	IFCONFIG_PREFIX="WPA "
 	if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
 		ifconfig $NEXT_WLAN_IFACE create wlandev $INTERFACE
@@ -115,7 +115,7 @@ fi
 # In case wlanconfig left an option and we do not support IPv4 we need to write
 # it out on its own.  We cannot write it out with IPv6 as that suffix.
 if [ ${IPV4_AVAIL} -eq 0 -a -n ${IFCONFIG_PREFIX} ]; then
-	echo ifconfig_${INTERFACE}=\"${IFCONFIG_PREFIX}\" >> $BSDINSTALL_TMPETC/._rc.conf.net
+	sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_$INTERFACE="${IFCONFIG_PREFIX}"
 fi
 if [ ${IPV6_AVAIL} -eq 1 ]; then
 	bsddialog --backtitle "$OSNAME Installer" --title 'Network Configuration' \
diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv4 b/usr.sbin/bsdinstall/scripts/netconfig_ipv4
index 3da1803cd0d1..8f747a9d0162 100755
--- a/usr.sbin/bsdinstall/scripts/netconfig_ipv4
+++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv4
@@ -63,7 +63,7 @@ if [ $? -eq $BSDDIALOG_OK ]; then
 			exec $0 ${INTERFACE} "${IFCONFIG_PREFIX}"
 		fi
 	fi
-	echo ifconfig_$INTERFACE=\"${IFCONFIG_PREFIX}DHCP\" >> $BSDINSTALL_TMPETC/._rc.conf.net
+	sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_$INTERFACE="${IFCONFIG_PREFIX}DHCP"
 	exit 0
 fi
 
diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv6 b/usr.sbin/bsdinstall/scripts/netconfig_ipv6
index 00ef8791de4b..b851069eee14 100755
--- a/usr.sbin/bsdinstall/scripts/netconfig_ipv6
+++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv6
@@ -73,7 +73,7 @@ while : ; do
 				continue
 			fi
 		fi
-		echo ifconfig_${INTERFACE}_ipv6=\"inet6 accept_rtadv\" >> $BSDINSTALL_TMPETC/._rc.conf.net
+		sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_${INTERFACE}_ipv6="inet6 accept_rtadv"
 		exit 0
 	else
 		break
diff --git a/usr.sbin/bsdinstall/scripts/time b/usr.sbin/bsdinstall/scripts/time
index 1d66fa4d5fcf..fe82ce274729 100755
--- a/usr.sbin/bsdinstall/scripts/time
+++ b/usr.sbin/bsdinstall/scripts/time
@@ -44,7 +44,7 @@ DATE=$(bsddialog --backtitle "$OSNAME Installer" \
 	--cancel-label 'Skip' \
 	--default-no \
 	--date-format '%Y%m%d%H%M.%S' \
-	--datebox '' 0 40 \
+	--calendar '' 0 40 \
 2>&1 1>&5) && date $DATE
 exec 5>&-
 
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index a671841b15e5..619d11c56000 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -396,7 +396,7 @@ dialog_menu_main()
 		--default-item \"\$defaultitem\" \
 		--menu \"\$prompt\"              \
 		$height $width $rows             \
-		$menu_list                       \
+		${USE_DIALOG:+--} $menu_list     \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
 	)
 	local retval=$?
diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh
index c216734a6e9a..b7d3a95bc7d7 100755
--- a/usr.sbin/certctl/certctl.sh
+++ b/usr.sbin/certctl/certctl.sh
@@ -26,32 +26,62 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+set -u
+
 ############################################################ CONFIGURATION
 
 : ${DESTDIR:=}
 : ${DISTBASE:=}
-: ${FILEPAT:="\.pem$|\.crt$|\.cer$|\.crl$"}
-: ${VERBOSE:=0}
 
 ############################################################ GLOBALS
 
 SCRIPTNAME="${0##*/}"
 ERRORS=0
-NOOP=0
-UNPRIV=0
+NOOP=false
+UNPRIV=false
+VERBOSE=false
 
 ############################################################ FUNCTIONS
 
+info()
+{
+	echo "${0##*/}: $@" >&2
+}
+
+verbose()
+{
+	if "${VERBOSE}" ; then
+		info "$@"
+	fi
+}
+
+perform()
+{
+	if ! "${NOOP}" ; then
+		"$@"
+	fi
+}
+
+cert_files_in()
+{
+	find -L "$@" -type f \( \
+	     -name '*.pem' -or \
+	     -name '*.crt' -or \
+	     -name '*.cer' -or \
+	     -name '*.crl' \
+	\) 2>/dev/null
+}
+
 do_hash()
 {
 	local hash
 
-	if hash=$( openssl x509 -noout -subject_hash -in "$1" ); then
+	if hash=$(openssl x509 -noout -subject_hash -in "$1") ; then
 		echo "$hash"
 		return 0
 	else
-		echo "Error: $1" >&2
-		ERRORS=$(( $ERRORS + 1 ))
+		info "Error: $1"
+		ERRORS=$((ERRORS + 1))
 		return 1
 	fi
 }
@@ -64,7 +94,7 @@ get_decimal()
 	hash=$2
 	decimal=0
 
-	while [ -e "$checkdir/$hash.$decimal" ]; do
+	while [ -e "$checkdir/$hash.$decimal" ] ; do
 		decimal=$((decimal + 1))
 	done
 
@@ -72,24 +102,32 @@ get_decimal()
 	return 0
 }
 
-create_trusted_link()
+create_trusted()
 {
-	local blisthash certhash hash
+	local hash certhash otherfile otherhash
 	local suffix
-
-	hash=$( do_hash "$1" ) || return
-	certhash=$( openssl x509 -sha1 -in "$1" -noout -fingerprint )
-	for blistfile in $(find $UNTRUSTDESTDIR -name "$hash.*"); do
-		blisthash=$( openssl x509 -sha1 -in "$blistfile" -noout -fingerprint )
-		if [ "$certhash" = "$blisthash" ]; then
-			echo "Skipping untrusted certificate $1 ($blistfile)"
+	local link=${2:+-lm}
+
+	hash=$(do_hash "$1") || return
+	certhash=$(openssl x509 -sha1 -in "$1" -noout -fingerprint)
+	for otherfile in $(find $UNTRUSTDESTDIR -name "$hash.*") ; do
+		otherhash=$(openssl x509 -sha1 -in "$otherfile" -noout -fingerprint)
+		if [ "$certhash" = "$otherhash" ] ; then
+			info "Skipping untrusted certificate $hash ($otherfile)"
 			return 1
 		fi
 	done
+	for otherfile in $(find $CERTDESTDIR -name "$hash.*") ; do
+		otherhash=$(openssl x509 -sha1 -in "$otherfile" -noout -fingerprint)
+		if [ "$certhash" = "$otherhash" ] ; then
+			verbose "Skipping duplicate entry for certificate $hash"
+			return 0
+		fi
+	done
 	suffix=$(get_decimal "$CERTDESTDIR" "$hash")
-	[ $VERBOSE -gt 0 ] && echo "Adding $hash.$suffix to trust store"
-	[ $NOOP -eq 0 ] && \
-		install ${INSTALLFLAGS} -lrs $(realpath "$1") "$CERTDESTDIR/$hash.$suffix"
+	verbose "Adding $hash.$suffix to trust store"
+	perform install ${INSTALLFLAGS} -m 0444 ${link} \
+		"$(realpath "$1")" "$CERTDESTDIR/$hash.$suffix"
 }
 
 # Accepts either dot-hash form from `certctl list` or a path to a valid cert.
@@ -99,13 +137,13 @@ resolve_certname()
 	local suffix
 
 	# If it exists as a file, we'll try that; otherwise, we'll scan
-	if [ -e "$1" ]; then
-		hash=$( do_hash "$1" ) || return
+	if [ -e "$1" ] ; then
+		hash=$(do_hash "$1") || return
 		srcfile=$(realpath "$1")
 		suffix=$(get_decimal "$UNTRUSTDESTDIR" "$hash")
 		filename="$hash.$suffix"
 		echo "$srcfile" "$hash.$suffix"
-	elif [ -e "${CERTDESTDIR}/$1" ];  then
+	elif [ -e "${CERTDESTDIR}/$1" ] ;  then
 		srcfile=$(realpath "${CERTDESTDIR}/$1")
 		hash=$(echo "$1" | sed -Ee 's/\.([0-9])+$//')
 		suffix=$(get_decimal "$UNTRUSTDESTDIR" "$hash")
@@ -117,22 +155,24 @@ resolve_certname()
 create_untrusted()
 {
 	local srcfile filename
+	local link=${2:+-lm}
 
 	set -- $(resolve_certname "$1")
 	srcfile=$1
 	filename=$2
 
-	if [ -z "$srcfile" -o -z "$filename" ]; then
+	if [ -z "$srcfile" -o -z "$filename" ] ; then
 		return
 	fi
 
-	[ $VERBOSE -gt 0 ] && echo "Adding $filename to untrusted list"
-	[ $NOOP -eq 0 ] && install ${INSTALLFLAGS} -lrs "$srcfile" "$UNTRUSTDESTDIR/$filename"
+	verbose "Adding $filename to untrusted list"
+	perform install ${INSTALLFLAGS} -m 0444 ${link} \
+		"$srcfile" "$UNTRUSTDESTDIR/$filename"
 }
 
 do_scan()
 {
-	local CFUNC CSEARCH CPATH CFILE
+	local CFUNC CSEARCH CPATH CFILE CERT SPLITDIR
 	local oldIFS="$IFS"
 	CFUNC="$1"
 	CSEARCH="$2"
@@ -140,14 +180,25 @@ do_scan()
 	IFS=:
 	set -- $CSEARCH
 	IFS="$oldIFS"
-	for CPATH in "$@"; do
-		[ -d "$CPATH" ] || continue
-		echo "Scanning $CPATH for certificates..."
-		for CFILE in $(ls -1 "${CPATH}" | grep -Ee "${FILEPAT}"); do
-			[ -e "$CPATH/$CFILE" ] || continue
-			[ $VERBOSE -gt 0 ] && echo "Reading $CFILE"
-			"$CFUNC" "$CPATH/$CFILE"
-		done
+	for CFILE in $(cert_files_in "$@") ; do
+		verbose "Reading $CFILE"
+		case $(grep -c '^Certificate:$' "$CFILE") in
+		0)
+			;;
+		1)
+			"$CFUNC" "$CFILE" link
+			;;
+		*)
+			verbose "Multiple certificates found, splitting..."
+			SPLITDIR=$(mktemp -d)
+			egrep '^[^#]' "$CFILE" | \
+				split -p '^Certificate:$' - "$SPLITDIR/x"
+			for CERT in $(find "$SPLITDIR" -type f) ; do
+				"$CFUNC" "$CERT"
+			done
+			rm -rf "$SPLITDIR"
+			;;
+		esac
 	done
 }
 
@@ -155,94 +206,88 @@ do_list()
 {
 	local CFILE subject
 
-	if [ -e "$1" ]; then
-		cd "$1"
-		for CFILE in *.[0-9]; do
-			if [ ! -s "$CFILE" ]; then
-				echo "Unable to read $CFILE" >&2
-				ERRORS=$(( $ERRORS + 1 ))
-				continue
-			fi
-			subject=
-			if [ $VERBOSE -eq 0 ]; then
-				subject=$( openssl x509 -noout -subject -nameopt multiline -in "$CFILE" |
-				    sed -n '/commonName/s/.*= //p' )
-			fi
-			[ "$subject" ] ||
-			    subject=$( openssl x509 -noout -subject -in "$CFILE" )
-			printf "%s\t%s\n" "$CFILE" "$subject"
-		done
-		cd -
-	fi
+	for CFILE in $(find "$@" \( -type f -or -type l \) -name '*.[0-9]') ; do
+		if [ ! -s "$CFILE" ] ; then
+			info "Unable to read $CFILE"
+			ERRORS=$((ERRORS + 1))
+			continue
+		fi
+		subject=
+		if ! "$VERBOSE" ; then
+			subject=$(openssl x509 -noout -subject -nameopt multiline -in "$CFILE" | sed -n '/commonName/s/.*= //p')
+		fi
+		if [ -z "$subject" ] ; then
+			subject=$(openssl x509 -noout -subject -in "$CFILE")
+		fi
+		printf "%s\t%s\n" "${CFILE##*/}" "$subject"
+	done
 }
 
 cmd_rehash()
 {
 
-	if [ $NOOP -eq 0 ]; then
-		if [ -e "$CERTDESTDIR" ]; then
-			find "$CERTDESTDIR" -type link -delete
-		else
-			mkdir -p "$CERTDESTDIR"
-		fi
-		if [ -e "$UNTRUSTDESTDIR" ]; then
-			find "$UNTRUSTDESTDIR" -type link -delete
-		else
-			mkdir -p "$UNTRUSTDESTDIR"
-		fi
+	if [ -e "$CERTDESTDIR" ] ; then
+		perform find "$CERTDESTDIR" \( -type f -or -type l \) -delete
+	else
+		perform install -d -m 0755 "$CERTDESTDIR"
+	fi
+	if [ -e "$UNTRUSTDESTDIR" ] ; then
+		perform find "$UNTRUSTDESTDIR" \( -type f -or -type l \) -delete
+	else
+		perform install -d -m 0755 "$UNTRUSTDESTDIR"
 	fi
 
 	do_scan create_untrusted "$UNTRUSTPATH"
-	do_scan create_trusted_link "$TRUSTPATH"
+	do_scan create_trusted "$TRUSTPATH"
 }
 
 cmd_list()
 {
-	echo "Listing Trusted Certificates:"
+	info "Listing Trusted Certificates:"
 	do_list "$CERTDESTDIR"
 }
 
 cmd_untrust()
 {
-	local BPATH
+	local UTFILE
 
 	shift # verb
-	[ $NOOP -eq 0 ] && mkdir -p "$UNTRUSTDESTDIR"
-	for BFILE in "$@"; do
-		echo "Adding $BFILE to untrusted list"
-		create_untrusted "$BFILE"
+	perform install -d -m 0755 "$UNTRUSTDESTDIR"
+	for UTFILE in "$@"; do
+		info "Adding $UTFILE to untrusted list"
+		create_untrusted "$UTFILE"
 	done
 }
 
 cmd_trust()
 {
-	local BFILE blisthash certhash hash
+	local UTFILE untrustedhash certhash hash
 
 	shift # verb
-	for BFILE in "$@"; do
-		if [ -s "$BFILE" ]; then
-			hash=$( do_hash "$BFILE" )
-			certhash=$( openssl x509 -sha1 -in "$BFILE" -noout -fingerprint )
-			for BLISTEDFILE in $(find $UNTRUSTDESTDIR -name "$hash.*"); do
-				blisthash=$( openssl x509 -sha1 -in "$BLISTEDFILE" -noout -fingerprint )
-				if [ "$certhash" = "$blisthash" ]; then
-					echo "Removing $(basename "$BLISTEDFILE") from untrusted list"
-					[ $NOOP -eq 0 ] && rm -f $BLISTEDFILE
+	for UTFILE in "$@"; do
+		if [ -s "$UTFILE" ] ; then
+			hash=$(do_hash "$UTFILE")
+			certhash=$(openssl x509 -sha1 -in "$UTFILE" -noout -fingerprint)
+			for UNTRUSTEDFILE in $(find $UNTRUSTDESTDIR -name "$hash.*") ; do
+				untrustedhash=$(openssl x509 -sha1 -in "$UNTRUSTEDFILE" -noout -fingerprint)
+				if [ "$certhash" = "$untrustedhash" ] ; then
+					info "Removing $(basename "$UNTRUSTEDFILE") from untrusted list"
+					perform rm -f $UNTRUSTEDFILE
 				fi
 			done
-		elif [ -e "$UNTRUSTDESTDIR/$BFILE" ]; then
-			echo "Removing $BFILE from untrusted list"
-			[ $NOOP -eq 0 ] && rm -f "$UNTRUSTDESTDIR/$BFILE"
+		elif [ -e "$UNTRUSTDESTDIR/$UTFILE" ] ; then
+			info "Removing $UTFILE from untrusted list"
+			perform rm -f "$UNTRUSTDESTDIR/$UTFILE"
 		else
-			echo "Cannot find $BFILE" >&2
-			ERRORS=$(( $ERRORS + 1 ))
+			info "Cannot find $UTFILE"
+			ERRORS=$((ERRORS + 1))
 		fi
 	done
 }
 
 cmd_untrusted()
 {
-	echo "Listing Untrusted Certificates:"
+	info "Listing Untrusted Certificates:"
 	do_list "$UNTRUSTDESTDIR"
 }
 
@@ -270,18 +315,23 @@ while getopts D:d:M:nUv flag; do
 	D) DESTDIR=${OPTARG} ;;
 	d) DISTBASE=${OPTARG} ;;
 	M) METALOG=${OPTARG} ;;
-	n) NOOP=1 ;;
-	U) UNPRIV=1 ;;
-	v) VERBOSE=$(( $VERBOSE + 1 )) ;;
+	n) NOOP=true ;;
+	U) UNPRIV=true ;;
+	v) VERBOSE=true ;;
 	esac
 done
-shift $(( $OPTIND - 1 ))
+shift $((OPTIND - 1))
 
 DESTDIR=${DESTDIR%/}
 
+if ! [ -z "${CERTCTL_VERBOSE:-}" ] ; then
+	VERBOSE=true
+fi
 : ${METALOG:=${DESTDIR}/METALOG}
 INSTALLFLAGS=
-[ $UNPRIV -eq 1 ] && INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR}"
+if "$UNPRIV" ; then
+	INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR}"
+fi
 : ${LOCALBASE:=$(sysctl -n user.localbase)}
 : ${TRUSTPATH:=${DESTDIR}${DISTBASE}/usr/share/certs/trusted:${DESTDIR}${LOCALBASE}/share/certs:${DESTDIR}${LOCALBASE}/etc/ssl/certs}
 : ${UNTRUSTPATH:=${DESTDIR}${DISTBASE}/usr/share/certs/untrusted:${DESTDIR}${LOCALBASE}/etc/ssl/untrusted:${DESTDIR}${LOCALBASE}/etc/ssl/blacklisted}
@@ -302,7 +352,9 @@ blacklisted)	cmd_untrusted ;;
 esac
 
 retval=$?
-[ $ERRORS -gt 0 ] && echo "Encountered $ERRORS errors" >&2
+if [ $ERRORS -gt 0 ] ; then
+	info "Encountered $ERRORS errors"
+fi
 exit $retval
 
 ################################################################################
diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c
index dfbb609ce10d..65e6bb7ca190 100644
--- a/usr.sbin/daemon/daemon.c
+++ b/usr.sbin/daemon/daemon.c
@@ -420,6 +420,7 @@ daemon_eventloop(struct daemon_state *state)
 	close(state->pipe_fd[1]);
 	state->pipe_fd[1] = -1;
 	setproctitle("%s[%d]", state->title, (int)state->pid);
+	setbuf(stdout, NULL);
 
 	while (state->mode != MODE_NOCHILD) {
 		ret = kevent(kq, NULL, 0, &event, 1, NULL);
diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8
index 471ae359c917..0d50ac8822de 100644
--- a/usr.sbin/freebsd-update/freebsd-update.8
+++ b/usr.sbin/freebsd-update/freebsd-update.8
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 10, 2022
+.Dd October 4, 2023
 .Dt FREEBSD-UPDATE 8
 .Os
 .Sh NAME
@@ -251,7 +251,11 @@ configuration file.
 .It Pa /var/db/freebsd-update/
 Default location where
 .Nm
-stores temporary files and downloaded updates.
+stores temporary files, downloaded updates, and files required for rollback.
+All files under
+.Pa /var/db/freebsd-update/
+may be deleted if an upgrade is not in progress and rollback will not be
+required.
 .El
 .Sh SEE ALSO
 .Xr freebsd-version 1 ,
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index c6432dcd6b0e..438e13a51154 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -916,7 +916,7 @@ install_create_be () {
 			echo -n "Creating snapshot of existing boot environment... "
 			VERSION=`freebsd-version -ku | sort -V | tail -n 1`
 			TIMESTAMP=`date +"%Y-%m-%d_%H%M%S"`
-			bectl create ${VERSION}_${TIMESTAMP}
+			bectl create -r ${VERSION}_${TIMESTAMP}
 			if [ $? -eq 0 ]; then
 				echo "done.";
 			else
diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile
index dc7ad7096448..f66ee35674c9 100644
--- a/usr.sbin/ftp-proxy/Makefile
+++ b/usr.sbin/ftp-proxy/Makefile
@@ -12,6 +12,9 @@ CFLAGS+= -I${SRCTOP}/lib/libpfctl -I${OBJTOP}/lib/libpfctl
 
 LIBADD=	event1 pfctl
 
+# ld.lld: error: could not determine size of cap reloc against local object nla_p_donemsg
+LD_FATAL_WARNINGS=no
+
 WARNS?=	3
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/jexec/jexec.8 b/usr.sbin/jexec/jexec.8
index 69f380676c30..4400cbbe56a3 100644
--- a/usr.sbin/jexec/jexec.8
+++ b/usr.sbin/jexec/jexec.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 24, 2016
+.Dd October 7, 2023
 .Dt JEXEC 8
 .Os
 .Sh NAME
@@ -65,6 +65,44 @@ The user name from jailed environment as whom the
 .Ar command
 should run.
 .El
+.Sh EXAMPLES
+.Ss Example 1 : Open a shell in a jail
+The following command specifies a jail by its name and utilizes the current
+user's shell:
+.Pp
+.Dl # jexec name
+.Pp
+It is also possible to specify a jail by its jid:
+.Pp
+.Dl # jexec JID
+.Ss Example 2 : Run a single command without opening a shell
+The following command runs
+.Ql uname -a
+in a jail called
+.Dq name .
+Since a command is specified explicitly,
+.Nm
+does not spawn an interactive shell.
+Instead,
+.Nm
+executes the specified command directly.
+.Pp
+.Dl # jexec name uname -a
+.Ss Example 3 : Open a shell in a jail with a clean environment
+The following command opens a
+.Xr sh 1
+shell in a jail with a clean environment:
+.Pp
+.Dl # jexec -l name sh
+.Ss Example 4 : Open a shell in a jail with the login command
+The following command utilizes
+.Xr login 1
+to access the jail, submitting an audit record, and displaying the
+user's last login, system copyright, and
+.Xr motd 5
+message:
+.Pp
+.Dl # jexec -l name login -f root
 .Sh SEE ALSO
 .Xr jail_attach 2 ,
 .Xr jail 8 ,
diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c
index db302fe1e760..b16a48564f04 100644
--- a/usr.sbin/makefs/zfs.c
+++ b/usr.sbin/makefs/zfs.c
@@ -681,14 +681,14 @@ _dnode_cursor_flush(zfs_opt_t *zfs, struct dnode_cursor *c, unsigned int levels)
 	off_t blkid, blksz, loc;
 
 	assert(levels > 0);
-	assert(levels <= c->dnode->dn_nlevels - 1);
+	assert(levels <= c->dnode->dn_nlevels - 1U);
 
 	blksz = MAXBLOCKSIZE;
 	blkid = (c->dataoff / c->datablksz) / BLKPTR_PER_INDIR;
 	for (unsigned int level = 1; level <= levels; level++) {
 		buf = c->inddir[level - 1];
 
-		if (level == c->dnode->dn_nlevels - 1) {
+		if (level == c->dnode->dn_nlevels - 1U) {
 			pbp = &c->dnode->dn_blkptr[0];
 		} else {
 			uint64_t iblkid;
@@ -736,7 +736,7 @@ dnode_cursor_next(zfs_opt_t *zfs, struct dnode_cursor *c, off_t off)
 	/* Do we need to flush any full indirect blocks? */
 	if (off > 0) {
 		blkid = off / c->datablksz;
-		for (levels = 0; levels < c->dnode->dn_nlevels - 1; levels++) {
+		for (levels = 0; levels < c->dnode->dn_nlevels - 1U; levels++) {
 			if (blkid % BLKPTR_PER_INDIR != 0)
 				break;
 			blkid /= BLKPTR_PER_INDIR;
diff --git a/usr.sbin/spkrtest/spkrtest.8 b/usr.sbin/spkrtest/spkrtest.8
index e0530dc5d2ce..b30b9b11e444 100644
--- a/usr.sbin/spkrtest/spkrtest.8
+++ b/usr.sbin/spkrtest/spkrtest.8
@@ -21,7 +21,7 @@
 .\" 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.
-.Dd March 6, 2022
+.Dd October 11, 2023
 .Dt SPKRTEST 8
 .Os
 .Sh NAME
@@ -33,6 +33,16 @@
 The
 .Nm
 utility is an easy to use test script for the speaker driver.
+.Pp
+.Nm
+requires the
+.Xr spkr 4
+driver.
+To load the driver as a module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+speaker_load="YES"
+.Ed
 .Sh FILES
 .Bl -tag -width /dev/speakerxx
 .It Pa /dev/speaker
diff --git a/usr.sbin/syslogd/tests/Makefile b/usr.sbin/syslogd/tests/Makefile
index 9f7e151a3938..781730a1102a 100644
--- a/usr.sbin/syslogd/tests/Makefile
+++ b/usr.sbin/syslogd/tests/Makefile
@@ -1,3 +1,5 @@
 ATF_TESTS_SH+=	syslogd_test
+# Several syslogd listening on the same port prevent parallel operation
+TEST_METADATA+=	is_exclusive="true"
 
 .include <bsd.test.mk>
diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c
index f220155dbe28..f6440a0ea736 100644
--- a/usr.sbin/tzsetup/tzsetup.c
+++ b/usr.sbin/tzsetup/tzsetup.c
@@ -276,6 +276,7 @@ struct country {
 	char		*tlc;
 	int		nzones;
 	struct continent *override;	/* continent override */
+	struct continent *alternate;	/* extra continent */
 	TAILQ_HEAD(, zone) zones;
 	dialogMenuItem	*submenu;
 };
@@ -374,6 +375,18 @@ find_country(int lineno, const char *tlc)
 	return (cp);
 }
 
+static void
+add_cont_to_country(struct country *cp, struct continent *cont)
+{
+	struct zone	*zp;
+
+	TAILQ_FOREACH(zp, &cp->zones, link) {
+		if (zp->continent == cont)
+			return;
+	}
+	cp->alternate = cont;
+}
+
 static void
 add_zone_to_country(int lineno, struct country *cp, const char *descr,
     const char *file, struct continent *cont)
@@ -441,13 +454,13 @@ read_zones(void)
 	struct country	*cp;
 	size_t		len;
 	char		*line, *country_list, *tlc, *file, *descr;
+	char		*p, *q;
 	int		lineno;
-	bool		pass1;
+	int		pass = 1;
 
 	fp = fopen(path_zonetab, "r");
 	if (!fp)
 		err(1, "%s", path_zonetab);
-	pass1 = true;
 
 again:
 	lineno = 0;
@@ -457,7 +470,9 @@ read_zones(void)
 			errx(1, "%s:%d: invalid format", path_zonetab, lineno);
 		line[len - 1] = '\0';
 
-		if (pass1) {
+		switch (pass)
+		{
+		case 1:
 			/*
 			 * First pass: collect overrides, only looking for
 			 * single continent ones for the moment.
@@ -481,7 +496,8 @@ read_zones(void)
 				cp = find_country(lineno, tlc);
 				cp->override = cont;
 			}
-		} else {
+			break;
+		case 2:
 			/* Second pass: parse actual data */
 			if (line[0] == '#')
 				continue;
@@ -498,11 +514,34 @@ read_zones(void)
 				add_zone_to_country(lineno, cp, descr, file,
 				    cont);
 			}
+			break;
+		case 3:
+			/* Third pass: collect multi-continent overrides */
+			if (strncmp(line, "#@", strlen("#@")) != 0)
+				continue;
+			line += 2;
+			country_list = strsep(&line, "\t");
+			/* Skip single-continent overrides */
+			if (strchr(line, ',') == NULL)
+				continue;
+			while (line != NULL) {
+				cont = find_continent(lineno, line);
+				p = q = strdup(country_list);
+				if (p == NULL)
+					errx(1, "malloc failed");
+				while (q != NULL) {
+					tlc = strsep(&q, ",");
+					cp = find_country(lineno, tlc);
+					add_cont_to_country(cp, cont);
+				}
+				free(p);
+				strsep(&line, ",");
+			}
+			break;
 		}
 	}
 
-	if (pass1) {
-		pass1 = false;
+	if (pass++ < 3) {
 		errno = 0;
 		rewind(fp);
 		if (errno != 0)
@@ -555,6 +594,12 @@ make_menus(void)
 			if (zp2 == zp)
 				zp->continent->nitems++;
 		}
+
+		for (i = 0; i < NCONTINENTS; i++) {
+			if (cp->alternate == continent_names[i].continent) {
+				continent_names[i].continent->nitems++;
+			}
+		}
 	}
 
 	/*
@@ -611,6 +656,16 @@ make_menus(void)
 			dmi->fire = set_zone_menu;
 			dmi->data = cp;
 		}
+
+		if (cp->alternate != NULL) {
+			cont = cp->alternate;
+			dmi = &cont->menu[cont->nitems];
+			memset(dmi, 0, sizeof(*dmi));
+			asprintf(&dmi->prompt, "%d", ++cont->nitems);
+			dmi->title = cp->name;
+			dmi->fire = set_zone_menu;
+			dmi->data = cp;
+		}
 	}
 }
 
diff --git a/usr.sbin/ypldap/ypldap.c b/usr.sbin/ypldap/ypldap.c
index 9a6dc303dd9d..ff1965dd6e2c 100644
--- a/usr.sbin/ypldap/ypldap.c
+++ b/usr.sbin/ypldap/ypldap.c
@@ -1,5 +1,4 @@
 /*	$OpenBSD: ypldap.c,v 1.16 2015/11/02 10:06:06 jmatthew Exp $ */
-/*	$FreeBSD */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>