diff --git a/share/man/man5/cd9660.5 b/share/man/man5/cd9660.5
index 224816e16c57..33a93ef77431 100644
--- a/share/man/man5/cd9660.5
+++ b/share/man/man5/cd9660.5
@@ -1,81 +1,84 @@
 .\"
+.\" SPDX-License-Identifier: BSD-3-Clause
+.\"
 .\" Copyright (c) 2017 Enji Cooper
 .\"
 .\" 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.
 .\" 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 DOCUMENTATION 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.
 .\"
-.Dd April 25, 2023
+.Dd January 18, 2025
 .Dt CD9660 5
 .Os
 .Sh NAME
 .Nm cd9660
 .Nd "ISO-9660 file system"
 .Sh SYNOPSIS
 To link into the kernel:
 .Bd -ragged -offset indent
 .Cd "options CD9660"
 .Ed
 .Pp
 Alternatively, to load the driver as a
 module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 cd9660_load="YES"
 .Ed
 .Sh DESCRIPTION
 The
 .Nm
 driver will permit the
 .Fx
 kernel to access the
 .Tn cd9660
 file system.
 .Sh EXAMPLES
 To mount a
 .Nm
 volume located on
 .Pa /dev/cd0 :
 .Pp
 .Dl "mount -t cd9660 /dev/cd0 /mnt"
 .Sh SEE ALSO
+.Xr etdump 1 ,
 .Xr nmount 2 ,
 .Xr unmount 2 ,
 .Xr cd 4 ,
 .Xr fstab 5 ,
 .Xr mount 8 ,
 .Xr mount_cd9660 8
 .Sh HISTORY
 The
 .Nm
 driver first appeared in
 .Bx 4.4 Lite .
 .Sh AUTHORS
 .An -nosplit
 The
 .Nm
 kernel implementation was originally written by
 .An Pace Willisson Aq Mt pace@blitz.com
 and
 .An Atsushi Murai Aq Mt amurai@spec.co.jp .
 .Pp
 This manual page was written by
 .An Enji Cooper Aq Mt ngie@FreeBSD.org .
diff --git a/usr.bin/etdump/etdump.1 b/usr.bin/etdump/etdump.1
index bec8d201eb4f..a86a5e24742c 100644
--- a/usr.bin/etdump/etdump.1
+++ b/usr.bin/etdump/etdump.1
@@ -1,102 +1,110 @@
+.\"
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
 .\" Copyright (c) 2018 iXsystems, Inc
 .\" 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.
 .\"
-.Dd April 25, 2018
-.Dt ETDUMP 8
+.Dd January 18, 2025
+.Dt ETDUMP 1
 .Os
 .Sh NAME
 .Nm etdump
-.Nd Dump El Torito boot catalog information from ISO images
+.Nd dump ISO-9660 El Torito boot catalog information
 .Sh SYNOPSIS
 .Nm
 .Op Fl f Ar format
 .Op Fl o Ar file
 .Ar
 .Sh DESCRIPTION
-This program reads El Torito boot catalog information from an ISO image and
-outputs it in various formats.
-It can be used to check the catalog in an image or to output catalog data in
-a format that can be used by other tools such as shell scripts.
+This program reads El Torito boot catalog information
+from an ISO-9660 image and outputs it in various formats.
+It can be used to check the catalog in an image or
+to output catalog data in a format that can be used by other tools
+such as shell scripts.
 .Pp
 Supported options are:
 .Bl -tag -width flag
-.It Fl f Ar format Fl -format Ar format
+.It Fl f Ar format | Fl -format Ar format
 Select the output format.
 Supported output formats are:
-.Bl -tag -width shell -offset indent
-.It Sy text
+.Bl -tag -width indent
+.It Cm text
 Human-readable text (default)
-.It Sy shell
-Each boot entry is emitted as a string suitable for passing to a sh-compatible
-eval command.
+.It Cm shell
+Each boot entry is emitted as a string
+suitable for passing to a sh-compatible eval command.
 The variables emitted are:
-.Bl -tag -width et_platform -offset indent
-.It et_platform
+.Bl -tag -width "et_platform"
+.It Dv et_platform
 The platform ID from the section header.
 Set to 'default' for the initial (default) entry.
-.It et_system
+.It Dv et_system
 The system ID from the boot entry.
-.It et_lba
+.It Dv et_lba
 The starting LBA (2048-byte blocks) of the boot image.
-.It et_sectors
+.It Dv et_sectors
 The number of sectors (512-byte sectors) that comprise the boot image.
 .El
 .El
-.It Fl o Ar file Fl -output Ar file
+.It Fl o Ar file | Fl -output Ar file
 Write output to
 .Ar file .
-If '-' is specified then standard out is used.
+If
+.Ql -
+is specified then standard out is used.
 .El
 .Sh EXAMPLES
 To see what entries are in a given boot catalog run
 .Nm
 passing the filename of the image as an argument like so:
 .Bd -literal -offset indent
 % etdump bootonly.iso
 Image in bootonly.iso
 Default entry
 	System i386
 	Start LBA 420 (0x1a4), sector count 4 (0x4)
 	Media type: no emulation
 
 Section header: efi, final
 	Section entry
 		System i386
 		Start LBA 20 (0x14), sector count 1600 (0x640)
 		Media type: no emulation
 .Ed
 .Pp
-To use the output in a shell script a for loop can be used to iterate over the
-entries returned using eval:
+To use the output in a shell script a for loop can be used
+to iterate over the entries returned using eval:
 .Bd -literal -offset indent
 for entry in `etdump --format shell bootonly.iso`; do
 	eval $entry
 	echo $et_platform $et_system $et_lba $et_sectors
 done
 .Ed
+.Sh SEE ALSO
+.Xr cd9660 4
 .Sh HISTORY
 The
 .Nm
 utility first appeared in
 .Fx 11.2