diff --git a/share/man/man4/iwlwifi.4 b/share/man/man4/iwlwifi.4
index 5d96b263c9e2..1f79319aad61 100644
--- a/share/man/man4/iwlwifi.4
+++ b/share/man/man4/iwlwifi.4
@@ -1,81 +1,92 @@
 .\"-
 .\" Copyright (c) 2021 The FreeBSD Foundation
 .\"
 .\" This documentation was written by Bj\xc3\xb6rn Zeeb 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.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 27, 2021
+.Dd January 1, 2022
 .Dt iwlwifi 4
 .Os
 .Sh NAME
 .Nm iwlwifi
 .Nd Intel IEEE 802.11a/b/g/n/ac/ax wireless network driver
 .Sh SYNOPSIS
 To load the driver as a module at boot time, place the following lines in
-.Xr loader.conf 5 :
+.Xr rc.conf 5 :
 .Bd -literal -offset indent
-if_iwlwifi_load="YES"
+kld_list="${kld_list} if_iwlwifi"
 .Ed
 .Pp
 The driver should automatically load any
 .Xr iwlwififw 4
-firmware needed for the particular chipset.
+firmware needed for the particular chipset in that case.
+.Pp
+It is anticipated that the driver will support auto-loading via
+.Xr devmatch 8
+in the future and will need no configuration at all.
+.Pp
+It is discouraged to load the driver from
+.Xr loader 8 .
 .Sh DESCRIPTION
 The
 .Nm
 driver is derived from Intel's Linux iwlwifi driver and provides support for
 all chipsets supported by the
 .Em mvm
 part of that driver.
-This superseeds the
+.\" XXX-BZ find way to add full list of chipsets automatically
+.Nm
+will be a successor to
 .Xr iwm 4
-driver which provided support for a subset of these chipsets and still
-complements the
+and may superseed that driver in the future.
+It still complements the
 .Xr iwn 4
-driver supporting older chipsets.
+driver which supports older chipsets.
 .Pp
 The driver uses the
 .\" No LinuxKPI man pages so no .Xr here.
 .Em linuxkpi_wlan
 and
 .Em linuxkpi
 compat framework to bridge between the Linux and
-native FreeBSD driver code.
+native FreeBSD driver code as well as to the native
+.Xr net80211 4
+wireless stack.
 .Pp
 While
 .Nm
 supports all 802.11 a/b/g/n/ac/ax
 the compatibility code currently only supports 802.11 a/b/g modes.
 Support for 802.11 n/ac is to come. 802.11ax and 6Ghz support are planned.
 .Sh BUGS
 Certainly.
 .Sh SEE ALSO
 .Xr iwlwififw 4 ,
 .Xr iwm 4 ,
 .Xr iwn 4 ,
 .Xr wlan 4 ,
 .Xr ifconfig 8 ,
 .Xr wpa_supplicant 8
diff --git a/share/man/man4/iwlwififw.4 b/share/man/man4/iwlwififw.4
index 81daaa02817a..d38d38f28695 100644
--- a/share/man/man4/iwlwififw.4
+++ b/share/man/man4/iwlwififw.4
@@ -1,52 +1,54 @@
 .\"-
 .\" Copyright (c) 2021 The FreeBSD Foundation
 .\"
 .\" This documentation was written by Bj\xc3\xb6rn Zeeb 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.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 30, 2021
+.Dd January 1, 2022
 .Dt iwlwififw 4
 .Os
 .Sh NAME
 .Nm iwlwififw
 .Nd Firmware modules for Intel iwlwifi wireless network driver
 .Sh SYNOPSIS
 The
 .Xr iwlwifi 4
 driver should auto-load any firmware needed.
+It is discouraged to load the driver or firmware manually from
+.Xr loader 8 .
 .Sh DESCRIPTION
 Multiple modules provide access to firmware for the various chipset
 models supported by the
 .Xr iwlwifi 4
 driver.
 .Sh FILES
 A copy of the
 .Xr iwlwifi 4
 firmware license is installed at
 .Em /usr/share/doc/legal/intel_iwlwifi_firmware.LICENCE .
 .Sh SEE ALSO
 .Xr iwlwifi 4 ,
 .Xr firmware 9