diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 00cf0db0a3d8..b955856ccb2a 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.534 2003/01/02 12:36:51 tron Exp $
+# $NetBSD: GENERIC,v 1.535 2003/01/05 21:44:32 jmcneill Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.534 $"
+#ident 		"GENERIC-$Revision: 1.535 $"
 
 maxusers	32		# estimated number of users
 
@@ -236,7 +236,6 @@ cpu* at mainbus?
 #p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC
 
 #apm0	at mainbus0			# Advanced power management
-#acpi0	at mainbus0			# Advanced Control and Power Interface
 
 # Tuning for power management, see apm(4) for more details.
 #options 	APM_NO_IDLE		# Don't call BIOS CPU idle function
@@ -248,6 +247,32 @@ cpu* at mainbus?
 
 # Basic Bus Support
 
+# Advanced Control and Power Interface
+
+#acpi0		at mainbus0
+#options	ACPI_PCI_FIXUP=1	# PCI interrupt routing via ACPI
+#options	ACPI_ACTIVATE_DEV=0	# If set, activate inactive devices
+
+# ACPI devices
+#acpiacad*	at acpi?		# ACPI AC Adapter
+#acpibat*	at acpi?		# ACPI Battery
+#acpibut*	at acpi?		# ACPI Button
+#acpiec*	at acpi?		# ACPI Embedded Controller
+#acpilid*	at acpi?		# ACPI Lid Switch
+#acpitz*	at acpi?		# ACPI Thermal Zone
+
+# Mainboard devices
+#com*		at acpi?		# Serial communications interface
+#fdc*		at acpi?		# Floppy disk controller
+#lpt*		at acpi?		# Parallel port
+#npx*		at acpi?		# Math coprocessor
+#pckbc*		at acpi?		# PC keyboard controller
+#wss*		at acpi?		# NeoMagic 256AV in wss mode
+
+# Sony Vaio jog dial
+#spic*		at acpi?		# Sony Programmable I/O Controller
+#wsmouse*	at spic?
+
 # Plug-and-Play BIOS and attached devices
 
 #pnpbios*	at mainbus?
diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP
index ff9f0eac01a6..c2829a23974d 100644
--- a/sys/arch/i386/conf/GENERIC_LAPTOP
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_LAPTOP,v 1.63 2003/01/02 12:39:01 tron Exp $
+#	$NetBSD: GENERIC_LAPTOP,v 1.64 2003/01/05 21:44:34 jmcneill Exp $
 #	From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
 #
 #	GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.63 $"
+#ident 		"GENERIC-$Revision: 1.64 $"
 
 maxusers	32		# estimated number of users
 
@@ -201,7 +201,6 @@ cpu0 at mainbus0
 #ioapic* at mainbus?
 
 apm0	at mainbus0			# Advanced power management
-#acpi0	at mainbus0			# Advanced Control and Power Interface
 
 # Tuning for power management, see apm(4) for more details.
 #options 	APM_NO_IDLE		# Don't call BIOS CPU idle function
@@ -213,6 +212,32 @@ apm0	at mainbus0			# Advanced power management
 
 # Basic Bus Support
 
+# Advanced Control and Power Interface
+
+#acpi0		at mainbus0
+#options	ACPI_PCI_FIXUP=1	# PCI interrupt routing via ACPI
+#options	ACPI_ACTIVATE_DEV=0	# If set, activate inactive devices
+
+# ACPI devices
+#acpiacad*	at acpi?		# ACPI AC Adapter
+#acpibat*	at acpi?		# ACPI Battery
+#acpibut*	at acpi?		# ACPI Button
+#acpiec*	at acpi?		# ACPI Embedded Controller
+#acpilid*	at acpi?		# ACPI Lid Switch
+#acpitz*	at acpi?		# ACPI Thermal Zone
+
+# Mainboard devices
+#com*		at acpi?		# Serial communications interface
+#fdc*		at acpi?		# Floppy disk controller
+#lpt*		at acpi?		# Parallel port
+#npx*		at acpi?		# Math coprocessor
+#pckbc*		at acpi?		# PC keyboard controller
+#wss*		at acpi?		# NeoMagic 256AV in wss mode
+
+# Sony Vaio jog dial
+#spic*		at acpi?		# Sony Programmable I/O Controller
+#wsmouse*	at spic?
+
 # Plug-and-Play BIOS and attached devices
 
 #pnpbios*	at mainbus?