diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 87ac896a8fb4..6708656a6ab2 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1319 2011/06/06 16:52:15 jruoho Exp $
+# $NetBSD: mi,v 1.1320 2011/06/22 19:34:53 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1598,6 +1598,7 @@
 ./usr/share/man/cat4/swsensor.0			man-sys-catman		.cat
 ./usr/share/man/cat4/swwdog.0			man-sys-catman		.cat
 ./usr/share/man/cat4/sysbeep.0			man-sys-catman		.cat
+./usr/share/man/cat4/sysmon.0			man-sys-catman		.cat
 ./usr/share/man/cat4/systrace.0			man-obsolete		obsolete
 ./usr/share/man/cat4/tap.0			man-sys-catman		.cat
 ./usr/share/man/cat4/tb.0			man-obsolete		obsolete
@@ -4315,6 +4316,7 @@
 ./usr/share/man/html4/swsensor.html		man-sys-htmlman		html
 ./usr/share/man/html4/swwdog.html		man-sys-htmlman		html
 ./usr/share/man/html4/sysbeep.html		man-sys-htmlman		html
+./usr/share/man/html4/sysmon.html		man-sys-htmlman		html
 ./usr/share/man/html4/tap.html			man-sys-htmlman		html
 ./usr/share/man/html4/tc.html			man-sys-htmlman		html
 ./usr/share/man/html4/tcds.html			man-sys-htmlman		html
@@ -6951,6 +6953,7 @@
 ./usr/share/man/man4/swsensor.4			man-sys-man		.man
 ./usr/share/man/man4/swwdog.4			man-sys-man		.man
 ./usr/share/man/man4/sysbeep.4			man-sys-man		.man
+./usr/share/man/man4/sysmon.4			man-sys-man		.man
 ./usr/share/man/man4/systrace.4			man-obsolete		obsolete
 ./usr/share/man/man4/tap.4			man-sys-man		.man
 ./usr/share/man/man4/tb.4			man-obsolete		obsolete
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index a0619b8a622f..936f86e9a87d 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.558 2011/04/05 11:24:46 phx Exp $
+#	$NetBSD: Makefile,v 1.559 2011/06/22 19:34:53 jruoho Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -55,7 +55,7 @@ MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
 	shpcic.4 siisata.4 siop.4 sip.4 siside.4 sk.4 sl.4 slide.4 \
 	sm.4 smsh.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 ss.4 \
 	st.4 ste.4 stge.4 sti.4 stpcide.4 sv.4 strip.4 \
-	svwsata.4 swsensor.4 swwdog.4 \
+	svwsata.4 swsensor.4 swwdog.4 sysmon.4 \
 	tap.4 tc.4 tcds.4 tcp.4 termios.4 tfb.4 thinkpad.4 \
 	ti.4 tl.4 tlp.4 tlphy.4 \
 	tp.4 tr.4 tra.4 trm.4 tty.4 tun.4 tqphy.4 twa.4 twe.4 txp.4 \
diff --git a/share/man/man4/sysmon.4 b/share/man/man4/sysmon.4
new file mode 100644
index 000000000000..eed3a7463446
--- /dev/null
+++ b/share/man/man4/sysmon.4
@@ -0,0 +1,75 @@
+.\" $NetBSD: sysmon.4,v 1.1 2011/06/22 19:34:53 jruoho Exp $
+.\"
+.\" Copyright (c) 2011 Jukka Ruohonen <jruohonen@iki.fi>
+.\"
+.\" 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 COPYRIGHT HOLDERS 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 COPYRIGHT
+.\" OWNER 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 June 22, 2011
+.Dt SYSMON 4
+.Os
+.Sh NAME
+.Nm sysmon
+.Nd system monitoring and power management interface
+.Sh DESCRIPTION
+The machine-independent
+.Nm
+is a general purpose framework for system monitorin and power management.
+The main components of
+.Nm
+include:
+.Bl -bullet -offset indent
+.It
+An
+.Xr ioctl 2
+interface available via
+.Pa /dev/sysmon .
+The userland counterparts
+include utilities such as
+.Xr envstat 8
+and daemons such as
+.Xr powerd 8 .
+.It
+An interface for the purpose of delivering different
+system and power events to userspace;
+.Xr sysmon_pswitch 9 .
+.It
+A general purpose sensor framework,
+.Xr sysmon_envsys 9 .
+.It
+A general purpose task queue,
+.Xr sysmon_taskq 9 .
+.It
+An interface for watchdog timers.
+.Sh SEE ALSO
+.Xr envsys 4 ,
+.Xr swsensor 4 ,
+.Xr envstat 8 ,
+.Xr powerd 8 ,
+.Xr wdogctl 8 ,
+.Xr pmf 9
+.Sh FILES
+.Bd -literal
+/dev/sysmon
+.Ed
+.Sh AUTHORS
+.An Jason R. Thorpe Aq thorpej@NetBSD.org