diff --git a/share/man/man4/puc.4 b/share/man/man4/puc.4
index 6fde07548e18..a29376d3f2d5 100644
--- a/share/man/man4/puc.4
+++ b/share/man/man4/puc.4
@@ -1,430 +1,289 @@
+.\"
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
 .\" Copyright (c) 2002 John Hay.
 .\" 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 May 5, 2025
+.Dd June 11, 2025
 .Dt PUC 4
 .Os
 .Sh NAME
 .Nm puc
 .Nd PCI
 .Dq Universal
 Communications driver
 .Sh SYNOPSIS
 .Cd "device pci"
 .Cd "device puc"
 .Cd "device uart"
 .Cd "device ppc"
 .Sh DESCRIPTION
 The
 .Nm
 driver acts as a shim to connect
 PCI multi-port serial and parallel adapters to the
 .Xr uart 4
 and
 .Xr ppc 4
 driver.
-.Pp
-The list of supported devices is in
-.Pa sys/dev/puc/pucdata.c .
-Support for new cards should be added there.
 .Sh HARDWARE
 The
 .Nm
 driver supports the following
-PCI multi-port serial and parallel adapters:
+PCI/PCIe multi-port serial and parallel adapters:
 .Pp
 .Bl -bullet -compact
 .It
-Sunix SUN1889
-.It
-HP Diva Serial [GSP] Multiport UART:
-.Bl -dash -compact
+Advantech 2-port PCI PCI-1602/1603 Rev A/B1
 .It
-Tosca Console
-.It
-Tosca Secondary
-.It
-Maestro SP2
+Applied Micro Circuits PCI 8 Port UART
 .It
-Superdome Console
+Avlab Technology PCI IO 2S
 .It
-Keystone SP2
+Avlab Low Profile PCI 4 Serial
 .It
-Everest SP2
-.El
+Boca Research PCI Turbo Serial 658/654
 .It
-VScom:
+Brainboxes:
 .Bl -dash -compact
 .It
-PCI-200, PCI-400, and PCI-800
-.El
+Instashield PCIe IX-400, IX-200, IX-100
 .It
-Boca Research Turbo Serial:
-.Bl -dash -compact
+Instashield PCI IS-400, IS-200
 .It
-654 and 658
-.El
+PX Series PCIe RS232/RS422/RS485/LPT
 .It
-Dolphin Peripherals:
-.Bl -dash -compact
+UC Series Universal PCI RS232/RS422/RS485/LPT
 .It
-4014 and 4035
+UP Series PCI Dual RS232
 .El
 .It
-Applied Micro Circuits 8 Port UART
-.It
-Digi Neo:
-.Bl -dash -compact
+Comtrol RocketPort 550 PCI 16/8/4 port
 .It
-PCI 4 and 8 Port
+Decision Computer PCCOM PCI 8/4/2 port
 .It
-PCIe 4 and 8 Port (with and without RJ45)
-.El
+Digi Neo PCIe 4 and 8 Port (with and without RJ45)
 .It
-Comtrol RocketPort:
-.Bl -dash -compact
-550/4 Normal and RJ45
+Digi Neo PCI 4 and 8 Port
 .It
-550/8 Normal, RJ11 and Octa
+Dolphin Peripherals PCI 4035/4014
 .It
-550/16
-.El
-.It
-IBM SurePOS 300 Series (481033H) serial ports
-.It
-SIIG Cyber Series of UART and parallel port boars:
+Exar:
 .Bl -dash -compact
 .It
-Cyber 2S and 2SP1 PCI 16550
-.It
-Cyber 4 PCI 16550
-.It
-Cyber 4S PCI 16C650 (20x family)
-.It
-Cyber I/O PCI (10x family and 20x family):
+XR17C/D152
 .It
-Cyber Parallel Dual PCI (10x family and 20x family):
+XR17C154
 .It
-Cyber Serial Dual PCI (10x family and 20x family):
+XR17C158
 .It
-Cyber 2S1P PCI (10x family and 20x family):
+XR17V258IV
 .It
-Cyber 4S PCI (10x family and 20x family):
+XR17V352
 .It
-PS8000 8S PCI 16C650 (20x family)
+XR17V354
 .It
-Quartet Serial 850
+XR17V358
 .El
 .It
-Brainboxes:
-.Bl -dash -compact
+Feasso PCI FPP-02 2S1P
 .It
-PX-101
+HP Diva Serial [GSP] Multiport UART:
+.Bl -dash -compact
 .It
-PX-246, PX-257, PX-260, PX-279
+Tosca Console
 .It
-PX-310, PX-313, PX-320, PX-346, PX-368
+Tosca Secondary
 .It
-PX-420, PX-431, PX-475
+Maestro SP2
 .It
-PX-803, PX-820, PX-831, PX-846, PX-857
+Superdome Console
 .It
-UC-101
+Keystone SP2
 .It
-UC-203, UC-253, UC-257, UC-260, UC-268, UC-279
+Everest SP2
+.El
 .It
-UC-302, UC-310, UC-313, UC-346, UC-357, UC-368
+I-O DATA RSA-PCI2/R
 .It
-UC-414, UC-420, UC-431, UC-475
+IBM SurePOS 300 Series (481033H) serial ports
 .It
-UC-607
+IC Book Labs:
+.Bl -dash -compact
 .It
-UC-836
+Dreadnought x16 Pro/Lite
 .It
-UP-189
+Ironclad x8 Pro
 .It
-UP-200
+Gunboat x4 Pro/Lite/Low Profile
 .It
-UP-869, UP-880
+Gunboat x2 Low Profile
 .El
 .It
-Intashield:
-.Bl -dash -compact
-.It
-IS-200, IS-400
-.It
-IX-100, IX-200, IX-400
-.El
+Kuroutoshikou SERIAL4P-LPPCI2
 .It
-Quatech:
+Lava Computers:
 .Bl -dash -compact
 .It
-DSC-100
-.It
-DSC-200/300
-.It
-DSCLP-100
-.It
-DSCLP-200/300
-.It
-ESC-100D
+Dual Serial PCI
 .It
-ESC-100M
+Quattro-PCIe
 .It
-QSC-100
-.It
-QSC-200/300
+Quattro-PCI
 .It
-QSCLP-100
+Octopus-550 PCI
 .El
 .It
 Moxa Technologies:
 .Bl -dash -compact
 .It
 Smartio CP-102E/PCIe
 .It
 Smartio CP-102EL/PCIe
 .It
 Smartio C104H/PCI
 .It
 Smartio CP-104UL/PCI
 .It
 Smartio CP-104JU/PCI
 .It
 Smartio CP-104EL/PCIe
 .It
 Smartio CP-104EL-A/PCIe
 .It
-CP-112UL
+CP-112UL PCI
 .It
 Industio CP-114
 .It
 Smartio CP-114EL/PCIe
 .It
 Smartio CP-118EL-A/PCIe
 .It
 C168H/PCI
 .It
 C168U/PCI
 .It
 CP-168EL/PCIe
 .It
 Smartio CP-168EL-A/PCIe
 .El
 .It
-Exar:
-.Bl -dash -compact
-.It
-XR17C/D152
-.It
-XR17C154
-.It
-XR17C158
-.It
-XR17V258IV
-.It
-XR17V352
-.It
-XR17V354
-.It
-XR17V358
-.El
-.It
-Advantech
-.Bl -dash -compact
-.It
-PCI-1602 Rev A
-.It
-2-port PCI (PCI-1602 Rev B1/PCI-1603)
-.El
-.It
-Lava Computers:
-.Bl -dash -compact
-.It
-Dual Serial
-.It
-Quattro
-.It
-Quattro-PCI
+NetMos NM9815 Dual 1284 Printer port PCI
 .It
-Octopus-550 
-.El
+NetMos NM9835 2/1 port UART + 1284 Printer PCI
 .It
-I-O DATA RSA-PCI2/R
+NetMos NM9845 4/6 port UART + 1284 Printer PCI
 .It
-Kuroutoshikou SERIAL4P-LPPCI2
+NetMos NM9865 4/3/2 port UART + 1/2 port 1284 Printer PCI
 .It
 Oxford Semiconductor based boards:
 .Bl -dash -compact
 .It
 OX16PCI952 UART (with and without Parallel port)
 .It
 OX16PCI954 UART
 .It
 OX9160/OX16PCI954 UARTs
 .It
 OX16PCI958 UART
 .El
 .It
-Perle:
-.Bl -dash -compact
-.It
-Ultraport4 Express
-.It
-Speed2 LE
+Perle Ultraport4 Express PCIe Serial
 .It
-Speed4 LE
+Perle Speed8/Speed4/Speed2 LE PCI Serial
 .It
-Speed8 LE
-.El
-.It
-VScom:
+Quatech:
 .Bl -dash -compact
 .It
-PCI-100L
+DSC-300/200/100 PCI
 .It
-PCI-200L
+DSCLP-300/200/100 PCI
 .It
-200Li
-.El
+ESC-100/100D/100M PCI
 .It
-Titan:
-.Bl -dash -compact
-.It
-PCI-800H
-.It
-PCI-800H
+QSC-300/200/100 PCI
 .It
-PCI-200H
+QSCLP-100 PCI
 .El
 .It
-Titan VScom:
+SIIG Cyber Series of UART and parallel port boards:
 .Bl -dash -compact
 .It
-PCI-800L
-.It
-PCI-200HV2
-.It
-PCIex-800H
-.It
-PCIex-800H
-.El
+Cyber 2S and 2SP1 PCI 16550
 .It
-Avlab Technology PCI IO 2S
+Cyber 4 and 4S PCI 16C650 (10x family and 20x family)
 .It
-Avlab Low Profile PCI 4 Serial
+Cyber I/O PCI (10x family and 20x family)
 .It
-Syba Tech Ltd PCI-4S2P-550-ECP
+Cyber Parallel Dual PCI (10x family and 20x family)
 .It
-Sunix SUN1888
+Cyber Serial Dual PCI (10x family and 20x family)
 .It
-Sunix SER5xxxx
-.Bl -dash -compact
+Cyber 2S1P PCI (10x family and 20x family)
 .It
-2, 4 and 8 port serial
-.El
-.It
-Sunix MIO5xxxx (1284 Printer port):
-.Bl -dash -compact
+PS8000 8S PCI 16C650 (20x family)
 .It
-1, 2 and 4 port serial
+Quartet Serial 850 PCI
 .El
 .It
-Feasso PCI FPP-02 2S1P
-.It
 Sun 1040 PCI Quad Serial
 .It
-Decision Computer Inc PCCOM:
-.Bl -dash -compact
-.It
-4-port serial
-.It
-8-port serial
-.El
-.It
-PCCOM dual port RS232/422/485
+Sunix MIO5xxxx 4/2/1 port UART and 1284 Printer
 .It
-NetMos NM9815 Dual 1284 Printer port
+Sunix SUN1889/1888 PCI dual port serial
 .It
-NetMos NM9835:
-.Bl -dash -compact
-.It
-based 1 and 2 port serial
+Sunix SER5xxxx 8/4/2 port serial
 .It
-Dual UART and 1284 Printer port
-.El
-.It
-NetMos NM9845:
-.Bl -dash -compact
-.It
-6 Port UART
+Syba Tech Ltd PCI-4S2P-550-ECP
 .It
-Quad UART and 1284 Printer port
-.El
+Titan PCI-800H/PCI-200H
 .It
-NetMos NM9865:
+VScom:
 .Bl -dash -compact
 .It
-Dual UART
-.It
-Triple UART
+PCIex-800H
 .It
-Quad UART
+PCI-200HV2
 .It
-Single UART and 1284 Printer port
+200Li uPCI
 .It
-Dual UART and 1284 Printer port
+PCI-800L, PCI-200L, and PCI-100L
 .It
-Dual 1284 Printer port
+PCI-800, PCI-400, and PCI-200
 .El
-.It
-IC Book Labs:
-.Bl -dash -compact
-.It
-Gunboat x4 Lite
-.It
-Gunboat x4 Pro
-.It
-Ironclad x8 Lite
-.It
-Ironclad x8 Pro
-.It
-Dreadnought x16 Pro
-.It
-Dreadnought x16 Lite
-.It
-Gunboat x2 Low Profile
-.It
-Gunboat x4 Low Profile
 .El
+.Sh FILES
+.Bl -tag -width "sys/dev/puc/pucdata.c"
+.It Pa sys/dev/puc/pucdata.c
+list of supported devices
 .El
 .Sh SEE ALSO
 .Xr ppc 4 ,
 .Xr uart 4
 .Sh HISTORY
 This driver took the idea from the
 .Nx
 .Nm
 driver.
 It uses a substantial amount of the same data.