diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index 09a658c1..f2faa062 100644
--- a/src/etc/etc.amd64/MAKEDEV
+++ b/src/etc/etc.amd64/MAKEDEV
@@ -69,7 +69,7 @@
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uscanner*	Scanners
 # Special purpose devices:
-#	acpi	Advanced Configuration and Power Interface
+#	apm	Power Management Interface
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bthub*	Bluetooth Hubs
@@ -379,8 +379,9 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
-acpi*)
-	M acpi	c 83 0 644
+apm*)
+	M apm	c 83 0 644
+	M apmctl	c 83 8 644
 	;;
 
 uscanner*)
@@ -578,7 +579,7 @@ all)
 	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
 	R radio0 music0 speaker audio0 uk0 random joy0 joy1 lpa0 lpa1
 	R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1
-	R ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 acpi crypto pf pctr
+	R ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto pf pctr
 	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
 	R fd mcd0
 	;;
diff --git a/src/etc/etc.amd64/MAKEDEV.md b/src/etc/etc.amd64/MAKEDEV.md
index b3f7e5f6..57e2dd0b 100644
--- a/src/etc/etc.amd64/MAKEDEV.md
+++ b/src/etc/etc.amd64/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.19 2007/08/02 16:40:26 deraadt Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.20 2007/11/25 15:46:06 tedu Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -17,7 +17,7 @@ dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl
-__devitem(acpi, acpi, Advanced Configuration and Power Interface)dnl
+__devitem(apm, apm, Power Management Interface)dnl
 __devitem(nvram, nvram, NVRAM access)dnl
 _mkdev(nvram, nvram, {-M nvram c major_nvram_c 0 440 kmem-})dnl
 _TITLE(make)
@@ -66,7 +66,7 @@ _DEV(usb, 61)
 _DEV(uscan, 77)
 _TITLE(spec)
 dnl _DEV(apm, 21)
-_DEV(acpi, 83)
+_DEV(apm, 83)
 _DEV(au, 42)
 _DEV(bio, 79)
 _DEV(bthub, 84)
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 0c5f6259..f1dae1b0 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -70,7 +70,6 @@
 #	uscanner*	Scanners
 # Special purpose devices:
 #	apm	Power management device
-#	acpi	Advanced Configuration and Power Interface
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
@@ -385,10 +384,6 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
-acpi*)
-	M acpi	c 85 0 644
-	;;
-
 apm*)
 	M apm	c 21 0 644
 	M apmctl	c 21 8 644
@@ -590,7 +585,7 @@ all)
 	R rmidi6 rmidi7 tuner0 radio0 music0 speaker audio0 uk0 random
 	R joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01
 	R tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
-	R acpi apm crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1
+	R apm crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1
 	R raid2 raid3 std st0 st1 fd mcd0
 	;;
 
diff --git a/src/etc/etc.i386/MAKEDEV.md b/src/etc/etc.i386/MAKEDEV.md
index aa25cca4..2510184f 100644
--- a/src/etc/etc.i386/MAKEDEV.md
+++ b/src/etc/etc.i386/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.38 2007/07/23 23:21:25 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.39 2007/11/25 15:46:06 tedu Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -18,7 +18,6 @@ dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl
 __devitem(apm, apm, Power management device)dnl
-__devitem(acpi, acpi, Advanced Configuration and Power Interface)dnl
 __devitem(nvram, nvram, NVRAM access)dnl
 _mkdev(nvram, nvram, {-M nvram c major_nvram_c 0 440 kmem-})dnl
 _TITLE(make)
@@ -67,7 +66,6 @@ _DEV(usb, 61)
 _DEV(uscan, 77)
 _TITLE(spec)
 _DEV(apm, 21)
-_DEV(acpi, 85)
 _DEV(au, 42)
 _DEV(bio, 79)
 _DEV(bktr, 49)