diff --git a/usr.sbin/wsfontload/wsfontload.8 b/usr.sbin/wsfontload/wsfontload.8
index 6f67c199b0f0..249346383ffa 100644
--- a/usr.sbin/wsfontload/wsfontload.8
+++ b/usr.sbin/wsfontload/wsfontload.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: wsfontload.8,v 1.31 2021/04/24 09:18:44 nia Exp $
+.\"	$NetBSD: wsfontload.8,v 1.32 2022/06/08 22:38:29 uwe Exp $
 .\"
 .\" Copyright (c) 1999, 2001
 .\" 	Matthias Drochner.  All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 24, 2021
+.Dd June 9, 2022
 .Dt WSFONTLOAD 8
 .Os
 .Sh NAME
@@ -39,7 +39,8 @@
 .Op Fl N Ar name
 .Op Fl w Ar width
 .Op Ar fontfile
-.Nm Fl l
+.Nm
+.Fl l
 .Sh DESCRIPTION
 The
 .Nm
@@ -54,7 +55,7 @@ or from standard input if
 is not provided.
 .Pp
 The options are:
-.Bl -tag -width xxxxxxxxxxx
+.Bl -tag -width Fl
 .It Fl B
 Specifies that the font data is ordered right-to-left byte wise.
 The default is left-to-right.
@@ -63,25 +64,26 @@ Specifies that the font data is ordered right-to-left bit wise.
 The default is left-to-right.
 .It Fl e Ar encoding
 Sets the encoding of the font.
-This can be either a symbolic abbreviation or a numeric value.
-Currently recognized abbreviations are:
-.Bl -tag -width xxxxxxx
+This can be either a symbolic name or a numeric value.
+Currently recognized names are:
+.Bl -tag -width Ql
 .It Ql iso
 ISO-8859-1 encoding
 .It Ql ibm
-IBM encoded fonts
+IBM CP437 encoding
 .It Ql pcvt
 the custom encoding of the supplemental fonts which came with the
 .Bx
 .Dq pcvt
 console driver
 .It Ql iso2
-ISO-8859-2 (east european) encoding
+ISO-8859-2 (Eastern European) encoding
 .It Ql iso7
-ISO-8859-7 (greek) encoding
+ISO-8859-7 (Greek) encoding
 .It Ql koi8r
-KOI8-R (russian) encoding
+KOI8-R (Russian) encoding
 .El
+.Pp
 Per default,
 .Ql iso
 is assumed.
@@ -106,43 +108,78 @@ Sets the width of a font character in pixels.
 Default is 8.
 .El
 .Pp
+.Nm
+supports
+.Ql \&.wsf
+file format that contains the necessary information about the font in
+the font file itself.
+Such files can be loaded without specifying any arguments,
+though
+.Fl N
+can be used to override the font name.
+.Pp
 Typically, the
 .Nm
-utility will be executed in system startup by the
-.Pa /etc/rc.d/wscons
-script, controlled by the
-.Pa /etc/wscons.conf
-configuration file.
+utility will be executed during system startup by the
+.Xr rc 8
+script.
+See
+.Xr wscons.conf 5 .
 .Sh FILES
-.Pa /etc/wscons.conf
+.Bl -item -compact
+.It
 .Pa /usr/share/wscons/fonts
+.El
 .Sh EXAMPLES
-Load the ISO-encoded 16x32 Spleen font and switch the first console
-screen to use it:
+Load ISO-encoded 20-pixel high Terminus font
+and use it on the current console
 .Pp
-.Bd -offset indent -unfilled
-# wsfontload -w 16 -h 32 -e iso -N spleen32 \\
+.Bd -literal -offset indent
+# wsfontload /usr/share/wscons/fonts/ter-120n.wsf
+# wsfontload -l | grep Terminus
+Terminus20-ISO8859-1 10x20
+# wsconsctl -f `tty` -dw font=Terminus20-ISO8859-1
+.Ed
+.Pp
+Load the ISO-encoded 16\[tmu]32 Spleen font
+and switch the first console screen to use it:
+.Pp
+.Bd -literal -offset indent
+# wsfontload -w 16 -h 32 -e iso -N spleen32 \e
 	/usr/share/wscons/fonts/spleen-16x32.fnt
 # wsconsctl -dw font=spleen32
 .Ed
 .Pp
-Load the IBM-encoded 8\(mu8-font from the
+Load the IBM-encoded 8\[tmu]8-font from the
 .Xr wscons 4
 distribution:
 .Pp
-.Bd -offset indent -unfilled
-# wsfontload -N myname -h 8 -e ibm /usr/share/wscons/fonts/vt220l.808
+.Bd -literal -offset indent
+# wsfontload -N myname -h 8 -e ibm \e
+    /usr/share/wscons/fonts/vt220l.808
 .Ed
 .Pp
-This (or another 8\(mu8-font) is necessary to use the
+This or another 8\[tmu]8-font is necessary to use the
 50-line screen type on
 .Xr vga 4
 displays.
 .Sh SEE ALSO
 .Xr wscons 4 ,
-.Xr wsconscfg 8 ,
+.Xr wsfont 4 ,
+.Xr wscons.conf 5 ,
+.\" XXX: BUGS: not yet
+.\" .Xr wsf 5 ,
 .Xr wsconsctl 8
+.Sh HISTORY
+Support for
+.Ql \&.wsf
+font files appeared in
+.Nx 10.0 .
 .Sh BUGS
 Many features are missing.
 .Pp
+The
+.Ql \&.wsf
+file format is undocumented.
+.Pp
 There is no way to remove a loaded font.