diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 5996d8641a8f..2338e4d1911f 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,12 +1,17 @@
-#	$NetBSD: Makefile,v 1.35 1997/02/18 01:01:48 jonathan Exp $
+#	$NetBSD: Makefile,v 1.36 1997/02/23 22:20:48 jonathan Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	ahb.4 ahc.4 audio.4 bha.4 bpf.4 ccd.4 cd.4 clnp.4 cltp.4 ddb.4 \
 	drum.4 eisa.4 esis.4 ep.4 fd.4 fpa.4 icmp.4 idp.4 imp.4 inet.4 ip.4 \
 	iso.4 lkm.4 lo.4 ncr.4 netintro.4 ns.4 nsip.4 null.4 \
-	options.4 ppp.4 pty.4 route.4 sd.4 sl.4 spp.4 st.4 \
+	options.4 pci.4 ppp.4 pty.4 route.4 sd.4 sl.4 spp.4 st.4 \
 	strip.4 tb.4 tcp.4 termios.4 tp.4 tty.4 tun.4 udp.4 uha.4 uk.4 \
 	unix.4 vnd.4
+
+#	machine-independent ISA devices
+MAN+=	aha.4 aic.4 ast.4 boca.4 cy.4 eg.4 el.4 gus.4 iy.4 mcd.4 pss.4	\
+	rtfps.4 sb.4 sea.4 wss.4 wt.4
+
 MLINKS+=bha.4 bt.4
 MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4
 MLINKS+=netintro.4 networking.4
diff --git a/share/man/man4/aha.4 b/share/man/man4/aha.4
index 702a0f41efbe..f785d3f804f2 100644
--- a/share/man/man4/aha.4
+++ b/share/man/man4/aha.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: aha.4,v 1.2 1997/02/23 22:20:20 jonathan Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -22,7 +23,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd November 29, 1994
-.Dt AHA 4 i386
+.Dt AHA 4
 .Os NetBSD 
 .Sh NAME
 .Nm aha
diff --git a/share/man/man4/aic.4 b/share/man/man4/aic.4
index c70871271edd..0bcf0438256c 100644
--- a/share/man/man4/aic.4
+++ b/share/man/man4/aic.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: aic.4,v 1.2 1997/02/23 22:20:22 jonathan Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -23,7 +24,7 @@
 .\"
 .\"
 .Dd November 29, 1994
-.Dt AIC 4 i386
+.Dt AIC 4
 .Os NetBSD 
 .Sh NAME
 .Nm aic
diff --git a/share/man/man4/ast.4 b/share/man/man4/ast.4
index f2ba886c3c76..2f00e87a739a 100644
--- a/share/man/man4/ast.4
+++ b/share/man/man4/ast.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ast.4,v 1.7 1996/03/16 00:07:07 thorpej Exp $
+.\"	$NetBSD: ast.4,v 1.8 1997/02/23 22:20:24 jonathan Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -38,7 +38,7 @@
 .\"	from: Id: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
 .\"
 .Dd March 30, 1994
-.Dt AST 4 i386
+.Dt AST 4
 .Os NetBSD 0.9a
 .Sh NAME
 .Nm ast
diff --git a/share/man/man4/boca.4 b/share/man/man4/boca.4
index 103dfa053b31..7b5ffe464b8b 100644
--- a/share/man/man4/boca.4
+++ b/share/man/man4/boca.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: boca.4,v 1.2 1997/02/23 22:20:26 jonathan Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -35,10 +36,9 @@
 .\"
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: Id: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
-.\"	$Id: boca.4,v 1.1 1995/01/03 22:26:36 mycroft Exp $
 .\"
 .Dd January 3, 1995
-.Dt BOCA 4 i386
+.Dt BOCA 4
 .Os NetBSD 1.1
 .Sh NAME
 .Nm boca
diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4
index 6fcf39ac2dbe..78c9f4f0a534 100644
--- a/share/man/man4/cy.4
+++ b/share/man/man4/cy.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: cy.4,v 1.3 1997/02/23 22:20:27 jonathan Exp $
 .\"
 .\" Copyright (c) 1993 Andrew Herbert.
 .\" All rights reserved.
@@ -24,16 +25,16 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: cy.4,v 1.2 1995/02/17 09:43:40 jtc Exp $
-.\"
 .Dd 5 October, 1993
-.Dt CY 4 i386
+.Dt CY 4
 .Sh NAME
 .Nm cy
 .Nd
 Cyclades Cyclom-{4, 8, 16}Y asynchronous comms board device driver
 .Sh SYNOPSIS
-.Cd "cy0 at isa? tty irq 10 iomem 0xdc000 iosiz 8192 vector cyintr"
+.\".Cd "cy0 at isa? tty irq 10 iomem 0xdc000 iosiz 8192 vector cyintr"
+.Cd "cy0 at isa? iomem 0xd4000 irq 12"
+.Cd "cy* at pci? dev ? function ?"
 .Sh DESCRIPTION
 This driver provides an interface to Cyclades Cyclom-4Y, Cyclom-8Y and
 Cyclom-16Y asynchronous multiport serial boards.  These boards are based
diff --git a/share/man/man4/eg.4 b/share/man/man4/eg.4
index 39e8308fb3d7..418d813db64c 100644
--- a/share/man/man4/eg.4
+++ b/share/man/man4/eg.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: eg.4,v 1.3 1997/02/23 22:20:29 jonathan Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -22,7 +23,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd July 10, 1995
-.Dt EG 4 i386
+.Dt EG 4
 .Os
 .Sh NAME
 .Nm eg
diff --git a/share/man/man4/el.4 b/share/man/man4/el.4
index fb1e4e804d58..e68e9225451d 100644
--- a/share/man/man4/el.4
+++ b/share/man/man4/el.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: el.4,v 1.3 1997/02/23 22:20:30 jonathan Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -22,7 +23,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd July 10, 1995
-.Dt EL 4 i386
+.Dt EL 4
 .Os
 .Sh NAME
 .Nm el
diff --git a/share/man/man4/gus.4 b/share/man/man4/gus.4
index 84783c5dddfb..4db8cbc1163c 100644
--- a/share/man/man4/gus.4
+++ b/share/man/man4/gus.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: gus.4,v 1.2 1996/02/27 22:39:39 jtc Exp $
+.\"	$NetBSD: gus.4,v 1.3 1997/02/23 22:20:32 jonathan Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -35,7 +35,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd November 4, 1995
-.Dt GUS 4 i386
+.Dt GUS 4
 .Os 
 .Sh NAME
 .Nm gus
diff --git a/share/man/man4/iy.4 b/share/man/man4/iy.4
index 523c2cac0afe..8537db78c1b8 100644
--- a/share/man/man4/iy.4
+++ b/share/man/man4/iy.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: iy.4,v 1.2 1996/05/23 16:52:39 thorpej Exp $
+.\"	$NetBSD: iy.4,v 1.3 1997/02/23 22:20:33 jonathan Exp $
 .\"
 .\" Copyright (c) 1994 Herb Peyerl
 .\" All rights reserved.
@@ -28,6 +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 May 22, 1996
 .Dt IY 4
 .Os
diff --git a/share/man/man4/mcd.4 b/share/man/man4/mcd.4
index eaf0566c015d..690b8e948a84 100644
--- a/share/man/man4/mcd.4
+++ b/share/man/man4/mcd.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: mcd.4,v 1.2 1997/02/23 22:20:35 jonathan Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -23,7 +24,7 @@
 .\"
 .\"
 .Dd November 29, 1994
-.Dt MCD 4 i386
+.Dt MCD 4
 .Os NetBSD 
 .Sh NAME
 .Nm mcd
diff --git a/share/man/man4/pss.4 b/share/man/man4/pss.4
index d6f274ddebe8..c63ac9812549 100644
--- a/share/man/man4/pss.4
+++ b/share/man/man4/pss.4
@@ -1,4 +1,4 @@
-.\"   $NetBSD: pss.4,v 1.1 1995/11/13 09:44:15 pk Exp $
+.\"   $NetBSD: pss.4,v 1.2 1997/02/23 22:20:37 jonathan Exp $
 .\"
 .\" Copyright (c) 1995 Michael Long.
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd November 8, 1995
-.Dt PSS 4 i386
+.Dt PSS 4
 .Os NetBSD
 .Sh NAME
 .Nm pss
diff --git a/share/man/man4/rtfps.4 b/share/man/man4/rtfps.4
index 6ed96a7b7071..e6112de5d228 100644
--- a/share/man/man4/rtfps.4
+++ b/share/man/man4/rtfps.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: rtfps.4,v 1.5 1997/02/23 22:20:38 jonathan Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -35,10 +36,9 @@
 .\"
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: Id: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
-.\"	$Id: rtfps.4,v 1.4 1995/02/17 09:43:49 jtc Exp $
 .\"
 .Dd August 7, 1994
-.Dt RTFPS 4 i386
+.Dt RTFPS 4
 .Os NetBSD 1.0
 .Sh NAME
 .Nm rtfps
diff --git a/share/man/man4/sb.4 b/share/man/man4/sb.4
index dac4684964cc..9d1b143f5483 100644
--- a/share/man/man4/sb.4
+++ b/share/man/man4/sb.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sb.4,v 1.4 1996/03/16 17:21:58 jtk Exp $
+.\"	$NetBSD: sb.4,v 1.5 1997/02/23 22:20:40 jonathan Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -35,7 +35,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd November 4, 1995
-.Dt SB 4 i386
+.Dt SB 4
 .Os 
 .Sh NAME
 .Nm sb
diff --git a/share/man/man4/sea.4 b/share/man/man4/sea.4
index 1e20421bf206..0c2179de06fb 100644
--- a/share/man/man4/sea.4
+++ b/share/man/man4/sea.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: sea.4,v 1.2 1997/02/23 22:20:42 jonathan Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -23,7 +24,7 @@
 .\"
 .\"
 .Dd November 29, 1994
-.Dt SEA 4 i386
+.Dt SEA 4
 .Os NetBSD 
 .Sh NAME
 .Nm sea
diff --git a/share/man/man4/wss.4 b/share/man/man4/wss.4
index 62cdcf315fc4..378027debd6f 100644
--- a/share/man/man4/wss.4
+++ b/share/man/man4/wss.4
@@ -1,4 +1,4 @@
-.\"   $NetBSD: wss.4,v 1.2 1996/12/05 07:18:28 mikel Exp $
+.\"   $NetBSD: wss.4,v 1.3 1997/02/23 22:20:44 jonathan Exp $
 .\"
 .\" Copyright (c) 1995 Michael Long.
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd November 8, 1995
-.Dt WSS 4 i386
+.Dt WSS 4
 .Os NetBSD
 .Sh NAME
 .Nm wss
diff --git a/share/man/man4/wt.4 b/share/man/man4/wt.4
index f9782bfb38b2..fd08533a922c 100644
--- a/share/man/man4/wt.4
+++ b/share/man/man4/wt.4
@@ -1,3 +1,4 @@
+.\"	$NetBSD: wt.4,v 1.3 1997/02/23 22:20:46 jonathan Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -22,7 +23,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd July 10, 1995
-.Dt WT 4 i386
+.Dt WT 4
 .Os 
 .Sh NAME
 .Nm wt