diff --git a/games/worms/worms.6 b/games/worms/worms.6
index db9b6cb7424..1f87e3be414 100644
--- a/games/worms/worms.6
+++ b/games/worms/worms.6
@@ -34,6 +34,7 @@
 .\"
 .Dd May 31, 1993
 .Dt WORMS 6
+.Os
 .Sh NAME
 .Nm worms
 .Nd animate worms on a display terminal
diff --git a/lib/libc/rpc/rpc.5 b/lib/libc/rpc/rpc.5
index b559020bf42..f9a6d933763 100644
--- a/lib/libc/rpc/rpc.5
+++ b/lib/libc/rpc/rpc.5
@@ -2,6 +2,7 @@
 .\" @(#)rpc.5	2.2 88/08/03 4.0 RPCSRC; from 1.4 87/11/27 SMI;
 .Dd September 26, 1985
 .Dt RPC 5
+.Os
 .Sh NAME
 .Nm rpc
 .Nd rpc program number data base
diff --git a/lib/libc/rpc/rpc_secure.3 b/lib/libc/rpc/rpc_secure.3
index f3e57cc8a42..73ca959939e 100644
--- a/lib/libc/rpc/rpc_secure.3
+++ b/lib/libc/rpc/rpc_secure.3
@@ -3,6 +3,7 @@
 .\"
 .Dd February 16, 1988
 .Dt RPC 3
+.Os
 .Sh NAME
 .Nm rpc_secure
 .Nd library routines for secure remote procedure calls
diff --git a/lib/libc/sys/rtprio.2 b/lib/libc/sys/rtprio.2
index 55c10d6b7d1..51d33671a8b 100644
--- a/lib/libc/sys/rtprio.2
+++ b/lib/libc/sys/rtprio.2
@@ -31,6 +31,7 @@
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 2
+.Os FreeBSD
 .Sh NAME
 .Nm rtprio
 .Nd examine or modify a process realtime or idle priority
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index f78d406e382..68b009cac24 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -2,7 +2,7 @@
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
-.\".Os BSD 4
+.Os FreeBSD
 .Sh NAME
 .Nm fdisk
 .Nd PC partition table maintenance program
diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8
index d39ce8c19f5..bc8b9462206 100644
--- a/sbin/fdisk_pc98/fdisk.8
+++ b/sbin/fdisk_pc98/fdisk.8
@@ -2,7 +2,7 @@
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
-.\".Os BSD 4
+.Os FreeBSD
 .Sh NAME
 .Nm fdisk
 .Nd PC partition table maintenance program
diff --git a/sbin/i386/fdisk/fdisk.8 b/sbin/i386/fdisk/fdisk.8
index f78d406e382..68b009cac24 100644
--- a/sbin/i386/fdisk/fdisk.8
+++ b/sbin/i386/fdisk/fdisk.8
@@ -2,7 +2,7 @@
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
-.\".Os BSD 4
+.Os FreeBSD
 .Sh NAME
 .Nm fdisk
 .Nd PC partition table maintenance program
diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8
index 3afe41b98d6..d88386bbb34 100644
--- a/sbin/i386/nextboot/nextboot.8
+++ b/sbin/i386/nextboot/nextboot.8
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
-.\".Os BSD 4
+.Os FreeBSD
 .Sh NAME
 .Nm nextboot
 .Nd install a default bootstring block on the boot disk
diff --git a/sbin/nextboot/nextboot.8 b/sbin/nextboot/nextboot.8
index 3afe41b98d6..d88386bbb34 100644
--- a/sbin/nextboot/nextboot.8
+++ b/sbin/nextboot/nextboot.8
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
-.\".Os BSD 4
+.Os FreeBSD
 .Sh NAME
 .Nm nextboot
 .Nd install a default bootstring block on the boot disk
diff --git a/sbin/pc98/fdisk/fdisk.8 b/sbin/pc98/fdisk/fdisk.8
index d39ce8c19f5..bc8b9462206 100644
--- a/sbin/pc98/fdisk/fdisk.8
+++ b/sbin/pc98/fdisk/fdisk.8
@@ -2,7 +2,7 @@
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
-.\".Os BSD 4
+.Os FreeBSD
 .Sh NAME
 .Nm fdisk
 .Nd PC partition table maintenance program
diff --git a/share/man/man4/joy.4 b/share/man/man4/joy.4
index f43c0490bf8..8b064b71443 100644
--- a/share/man/man4/joy.4
+++ b/share/man/man4/joy.4
@@ -3,6 +3,7 @@
 .\"
 .Dd January 23, 1995
 .Dt JOY 4 i386
+.Os FreeBSD
 .Sh NAME
 .Nm joy
 .Nd joystick device driver
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index 63f1919ba5c..219ad11c507 100644
--- a/share/man/man4/man4.i386/fe.4
+++ b/share/man/man4/man4.i386/fe.4
@@ -24,6 +24,7 @@
 .\" $FreeBSD$
 .Dd March 3, 1996
 .Dt FE 4 i386
+.Os FreeBSD
 .Sh NAME
 .Nm fe
 .Nd Fujitsu MB86960A/MB86965A based Ethernet adapters
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index faa966b7453..2df8ef947b2 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -39,6 +39,7 @@
 .\"
 .Dd March 26, 2000
 .Dt PCVT 4
+.Os FreeBSD
 .Sh NAME
 .Nm pcvt ,
 .Nm vt
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index 3d248cfc483..13eac04c753 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -38,6 +38,7 @@
 .\"
 .Dd October 5, 1999
 .Dt vinum 4
+.Os FreeBSD
 .Sh NAME
 .Nm vinum
 .Nd Logical Volume Manager
diff --git a/share/man/man5/pbm.5 b/share/man/man5/pbm.5
index 285ac43d232..228315b9f86 100644
--- a/share/man/man5/pbm.5
+++ b/share/man/man5/pbm.5
@@ -3,6 +3,7 @@
 .\"
 .Dd September 27, 1991
 .Dt PBM 5
+.Os
 .Sh NAME
 .Nm pbm
 .Nd portable bitmap file format
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index d452f92cf28..894fd9380b7 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -37,6 +37,7 @@
 .\"
 .Dd June 29, 1993
 .Dt AR 1
+.Os
 .Sh NAME
 .Nm ar
 .Nd create and maintain library archives
diff --git a/usr.bin/chkey/chkey.1 b/usr.bin/chkey/chkey.1
index b886c153346..89ee0a4113e 100644
--- a/usr.bin/chkey/chkey.1
+++ b/usr.bin/chkey/chkey.1
@@ -4,6 +4,7 @@
 .\"
 .Dd July 5, 1989
 .Dt CHKEY 1
+.Os
 .Sh NAME
 .Nm chkey
 .Nd change your encryption key
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index 65a776c0d26..b560ac11286 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -29,6 +29,7 @@
 .\"
 .Dd April 13, 1999
 .Dt SOCKSTAT 1
+.Os FreeBSD
 .Sh NAME
 .Nm sockstat
 .Nd list open sockets
diff --git a/usr.sbin/mrouted/map-mbone.8 b/usr.sbin/mrouted/map-mbone.8
index 6dba1890e14..502b76499bb 100644
--- a/usr.sbin/mrouted/map-mbone.8
+++ b/usr.sbin/mrouted/map-mbone.8
@@ -2,7 +2,7 @@
 .\"
 .Dd May 8, 1995
 .Dt MAP-MBONE 8
-.UC 5
+.Os
 .Sh NAME
 .Nm map-mbone
 .Nd multicast connection mapper
diff --git a/usr.sbin/pcvt/cursor/cursor.1 b/usr.sbin/pcvt/cursor/cursor.1
index e9eb7f3b649..28a0609fadc 100644
--- a/usr.sbin/pcvt/cursor/cursor.1
+++ b/usr.sbin/pcvt/cursor/cursor.1
@@ -28,6 +28,7 @@
 .\"
 .Dd March 27, 2000
 .Dt CURSOR 1
+.Os FreeBSD
 .Sh NAME
 .Nm cursor
 .Nd set cursor shape for the pcvt VT220 video driver
diff --git a/usr.sbin/pcvt/fed/fed.1 b/usr.sbin/pcvt/fed/fed.1
index 838bab8403a..cc74b7494fa 100644
--- a/usr.sbin/pcvt/fed/fed.1
+++ b/usr.sbin/pcvt/fed/fed.1
@@ -28,6 +28,7 @@
 .\"
 .Dd March 27, 2000
 .Dt FED 8
+.Os FreeBSD
 .Sh NAME
 .Nm fed
 .Nd fonteditor for pcvt EGA/VGA font files
diff --git a/usr.sbin/pcvt/ispcvt/ispcvt.8 b/usr.sbin/pcvt/ispcvt/ispcvt.8
index efc5d864e8b..44cd75e975c 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.8
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.8
@@ -28,6 +28,7 @@
 .\"
 .Dd March 27, 2000
 .Dt ISPCVT 8
+.Os FreeBSD
 .Sh NAME
 .Nm ispcvt
 .Nd verify if current video driver is pcvt driver
diff --git a/usr.sbin/pcvt/kcon/kcon.1 b/usr.sbin/pcvt/kcon/kcon.1
index a576ca9c48f..900f81e915f 100644
--- a/usr.sbin/pcvt/kcon/kcon.1
+++ b/usr.sbin/pcvt/kcon/kcon.1
@@ -28,6 +28,7 @@
 .\"
 .Dd March 27, 2000
 .Dt KCON 1
+.Os FreeBSD
 .Sh NAME
 .Nm kcon
 .Nd pcvt keyboard control and remapping
@@ -116,10 +117,8 @@ The command
 .Dq Li kcon -m gb
 loads the entry 'gb' from the keycap file into the keyboard to switch to
 a british keyboard behaviour.
-
+.Pp
 The command
 .Dq Li kcon -r 0 -d 0
 switches the keyboard to emit characters at a rate of 30 characters per second
 after a key has been held down for 250 milliseconds.
-
-
diff --git a/usr.sbin/pcvt/keycap/keycap.3 b/usr.sbin/pcvt/keycap/keycap.3
index ac4efd29948..d219dbc5dbf 100644
--- a/usr.sbin/pcvt/keycap/keycap.3
+++ b/usr.sbin/pcvt/keycap/keycap.3
@@ -38,6 +38,7 @@
 .\"
 .Dd January 3, 1993
 .Dt KEYCAP 3
+.Os FreeBSD
 .Sh NAME
 .Nm kgetent ,
 .Nm kgetnum ,
diff --git a/usr.sbin/pcvt/keycap/man5/keycap.5 b/usr.sbin/pcvt/keycap/man5/keycap.5
index 68c308f452a..06d06eec07b 100644
--- a/usr.sbin/pcvt/keycap/man5/keycap.5
+++ b/usr.sbin/pcvt/keycap/man5/keycap.5
@@ -38,6 +38,7 @@
 .\"
 .Dd January 3, 1993
 .Dt KEYCAP 5
+.Os FreeBSD
 .Sh NAME
 .Nm keycap
 .Nd keyboard mapping data base
diff --git a/usr.sbin/pcvt/loadfont/loadfont.1 b/usr.sbin/pcvt/loadfont/loadfont.1
index bac652470cd..f89348a2fcd 100644
--- a/usr.sbin/pcvt/loadfont/loadfont.1
+++ b/usr.sbin/pcvt/loadfont/loadfont.1
@@ -28,6 +28,7 @@
 .\"
 .Dd March 27, 2000
 .Dt LOADFONT 1
+.Os FreeBSD
 .Sh NAME
 .Nm loadfont
 .Nd pcvt utility for loading fonts into VGA/EGA boards
diff --git a/usr.sbin/pcvt/scon/scon.1 b/usr.sbin/pcvt/scon/scon.1
index a270657d6b5..42f79e1c49c 100644
--- a/usr.sbin/pcvt/scon/scon.1
+++ b/usr.sbin/pcvt/scon/scon.1
@@ -29,6 +29,7 @@
 .\"
 .Dd March 27, 2000
 .Dt SCON 1
+.Os FreeBSD
 .Sh NAME
 .Nm scon
 .Nd controls screen modes for pcvt video driver
diff --git a/usr.sbin/pcvt/vgaio/vgaio.8 b/usr.sbin/pcvt/vgaio/vgaio.8
index 07d124b8fe5..87af495972e 100644
--- a/usr.sbin/pcvt/vgaio/vgaio.8
+++ b/usr.sbin/pcvt/vgaio/vgaio.8
@@ -36,6 +36,7 @@
 .\" 
 .Dd December 31, 1994
 .Dt VGAIO 8
+.Os FreeBSD
 .Sh NAME
 .Nm vgaio
 .Nd perform input/output on a Video Graphics Array