diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index bf39a8d9de0f..87ac896a8fb4 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1318 2011/06/04 18:27:39 jruoho Exp $
+# $NetBSD: mi,v 1.1319 2011/06/06 16:52:15 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1792,6 +1792,7 @@
 ./usr/share/man/cat4/x68k/pow.0			man-sys-catman		.cat
 ./usr/share/man/cat4/x68k/vs.0			man-sys-catman		.cat
 ./usr/share/man/cat4/x86/amdpcib.0		man-sys-catman		.cat
+./usr/share/man/cat4/x86/apic.0			man-sys-catman		.cat
 ./usr/share/man/cat4/x86/balloon.0		man-sys-catman		.cat
 ./usr/share/man/cat4/x86/coretemp.0		man-sys-catman		.cat
 ./usr/share/man/cat4/x86/est.0			man-sys-catman		.cat
@@ -1799,6 +1800,7 @@
 ./usr/share/man/cat4/x86/hpet.0			man-sys-catman		.cat
 ./usr/share/man/cat4/x86/ichlpcib.0		man-sys-catman		.cat
 ./usr/share/man/cat4/x86/ioapic.0		man-sys-catman		.cat
+./usr/share/man/cat4/x86/lapic.0		man-sys-catman		.cat
 ./usr/share/man/cat4/x86/odcm.0			man-sys-catman		.cat
 ./usr/share/man/cat4/x86/powernow.0		man-sys-catman		.cat
 ./usr/share/man/cat4/xbd.0			man-sys-catman		.cat
@@ -4499,6 +4501,7 @@
 ./usr/share/man/html4/x68k/pow.html		man-sys-htmlman		html
 ./usr/share/man/html4/x68k/vs.html		man-sys-htmlman		html
 ./usr/share/man/html4/x86/amdpcib.html		man-sys-htmlman		html
+./usr/share/man/html4/x86/apic.html		man-sys-htmlman		html
 ./usr/share/man/html4/x86/balloon.html		man-sys-htmlman		html
 ./usr/share/man/html4/x86/coretemp.html		man-sys-htmlman		html
 ./usr/share/man/html4/x86/est.html		man-sys-htmlman		html
@@ -4506,6 +4509,7 @@
 ./usr/share/man/html4/x86/hpet.html		man-sys-htmlman		html
 ./usr/share/man/html4/x86/ichlpcib.html		man-sys-htmlman		html
 ./usr/share/man/html4/x86/ioapic.html		man-sys-htmlman		html
+./usr/share/man/html4/x86/lapic.html		man-sys-htmlman		html
 ./usr/share/man/html4/x86/odcm.html		man-sys-htmlman		html
 ./usr/share/man/html4/x86/powernow.html		man-sys-htmlman		html
 ./usr/share/man/html4/xbd.html			man-sys-htmlman		html
@@ -7141,6 +7145,7 @@
 ./usr/share/man/man4/x68k/pow.4			man-sys-man		.man
 ./usr/share/man/man4/x68k/vs.4			man-sys-man		.man
 ./usr/share/man/man4/x86/amdpcib.4		man-sys-man		.man
+./usr/share/man/man4/x86/apic.4			man-sys-man		.man
 ./usr/share/man/man4/x86/balloon.4		man-sys-man		.man
 ./usr/share/man/man4/x86/coretemp.4		man-sys-man		.man
 ./usr/share/man/man4/x86/est.4			man-sys-man		.man
@@ -7148,6 +7153,7 @@
 ./usr/share/man/man4/x86/hpet.4			man-sys-man		.man
 ./usr/share/man/man4/x86/ichlpcib.4		man-sys-man		.man
 ./usr/share/man/man4/x86/ioapic.4		man-sys-man		.man
+./usr/share/man/man4/x86/lapic.4		man-sys-man		.man
 ./usr/share/man/man4/x86/odcm.4			man-sys-man		.man
 ./usr/share/man/man4/x86/powernow.4		man-sys-man		.man
 ./usr/share/man/man4/xbd.4			man-sys-man		.man
diff --git a/share/man/man4/man4.x86/Makefile b/share/man/man4/man4.x86/Makefile
index f6e7e494e846..69da28bf21e6 100644
--- a/share/man/man4/man4.x86/Makefile
+++ b/share/man/man4/man4.x86/Makefile
@@ -1,7 +1,10 @@
-#	$NetBSD: Makefile,v 1.9 2011/03/04 05:56:49 jruoho Exp $
+#	$NetBSD: Makefile,v 1.10 2011/06/06 16:52:16 jruoho Exp $
 
-MAN=	amdpcib.4 balloon.4 coretemp.4 est.4 \
-	fwhrng.4 hpet.4 ichlpcib.4 ioapic.4 odcm.4 powernow.4
+MAN=	amdpcib.4 apic.4 balloon.4 coretemp.4 est.4 \
+	fwhrng.4 hpet.4 ichlpcib.4 odcm.4 powernow.4
+
+MLINKS+=apic.4 ioapic.4 \
+	apic.4 lapic.4
 
 MANSUBDIR=/x86
 
diff --git a/share/man/man4/man4.x86/ioapic.4 b/share/man/man4/man4.x86/apic.4
similarity index 95%
rename from share/man/man4/man4.x86/ioapic.4
rename to share/man/man4/man4.x86/apic.4
index d789852bef7f..8134086a85a1 100644
--- a/share/man/man4/man4.x86/ioapic.4
+++ b/share/man/man4/man4.x86/apic.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ioapic.4,v 1.4 2011/01/17 07:32:05 jruoho Exp $
+.\" $NetBSD: apic.4,v 1.1 2011/06/06 16:52:15 jruoho Exp $
 .\"
 .\" Copyright (c) 2011 Jukka Ruohonen <jruohonen@iki.fi>
 .\" All rights reserved.
@@ -24,18 +24,21 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 17, 2011
-.Dt IOAPIC 4 x86
+.Dd June 6, 2011
+.Dt APIC 4 x86
 .Os
 .Sh NAME
-.Nm ioapic
+.Nm apic ,
+.Nm ioapic ,
+.Nm lapic
 .Nd Intel APIC Architecture
 .Sh SYNOPSIS
 .Cd "ioapic* at mainbus*"
 .Sh DESCRIPTION
 The
 .Nm
-provides basis for a system of advanced programmable interrupt controllers
+subsystem provides basis for a system of advanced programmable
+interrupt controllers
 .Pq Tn APICs
 originally designed by Intel but now widely used on all x86 systems.
 .Pp