diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index d1252ea70694..4f0ee5ec9958 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -1,6 +1,6 @@
-.\"	$NetBSD: apm.8,v 1.19 2008/09/25 22:44:51 reed Exp $
+.\"	$NetBSD: apm.8,v 1.20 2010/03/20 07:59:44 jruoho Exp $
 .\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
+.\" Copyright (c) 1996, 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 18, 1996
+.Dd March 20, 2010
 .Dt APM 8
 .Os
 .Sh NAME
@@ -46,11 +46,14 @@
 .Op Fl f Ar sockname
 .Ek
 .Sh DESCRIPTION
+The
 .Nm
-communicates with the Advanced Power Management daemon,
+program communicates with the Advanced Power Management
+.Pq Tn APM
+daemon,
 .Xr apmd 8 ,
-making requests of it for current power status or to place the system
-into a suspend or stand-by state.
+making requests of the current power status or placing the system either
+into suspend or stand-by state.
 The
 .Nm
 tool is only installed on supported platforms.
@@ -60,7 +63,7 @@ With no flags,
 displays the current power management state in verbose form.
 .Pp
 Available command-line flags are:
-.Bl -tag -width indent -compact
+.Bl -tag -width "-f sockname" -compact
 .It Fl z
 Put the system into suspend (deep sleep) mode.
 .It Fl S
@@ -70,10 +73,11 @@ Display the estimated battery lifetime in percent.
 .It Fl m
 Display the estimated battery lifetime in minutes.
 .It Fl b
-Display the battery status.  0 means high, 1 means low, 2 means
-critical, 3 means charging, 4 means absent, and 255 means unknown.
+Display the battery status:
+0 means high, 1 means low, 2 means critical, 3 means charging,
+4 means absent, and 255 means unknown.
 .It Fl a
-Display the external charger (A/C status).  0 means disconnected, 1
+Display the external charger (A/C status):  0 means disconnected, 1
 means connected, 2 means backup power source, and 255 means unknown.
 .It Fl s
 Display if power management is enabled.
@@ -122,13 +126,37 @@ flag to work successfully.
 is the status device used when the socket is not accessible; it must be
 readable to provide current APM status.
 .Sh SEE ALSO
+.Xr acpi 4 ,
 .Xr apm 4 ,
 .Xr apmd 8
-.Sh REFERENCES
-Advanced Power Management (APM) BIOS Interface Specification (revision
-1.1), Intel Corporation and Microsoft Corporation
+.Rs
+.%A Intel Corporation
+.%A Microsoft Corporation
+.%T Advanced Power Management (APM) BIOS Interface Specification
+.%N Revision 1.2
+.%D February 1996
+.Re
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Nx 1.3 .
+.Pp
+The
+.Tn APM
+specification first appeared in 1992.
+The last update to the standard was made in 1996 -
+the same year when it was superceded by the
+.Tn ACPI 1.0
+standard.
+Thereafter power management on IBM-compatible personal computers has relied on
+.Tn ACPI ,
+implemented in
+.Nx
+by the
+.Xr acpi 4
+subsystem.
+The
+.Xr acpi 4
+provides an emulation layer for the legacy
+.Nm .