diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7cf8b54aa788..c110470de9cf 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.88 1994/09/28 22:51:54 wollman Exp $
+#	$Id: LINT,v 1.89 1994/09/28 22:57:24 wollman Exp $
 #
 
 machine		"i386"
@@ -62,6 +62,9 @@ options		DSI_SOFT_MODEM		#code for DSI Softmodems
 options		DIAGNOSTIC
 options		MSDOSFS_DEBUG
 
+options		APM			#Advance Power Management support for laptops
+					#(Note: also need apm device)
+
 # See /sys/i386/doc/sound.doc for information about EXCLUDE options for
 #  the sound drivers.
 
@@ -127,6 +130,9 @@ controller	isa0
 #This is a preliminary PCI bus ``device''
 device		pci0
 
+#Driver for Advaced Power Management (also need options APM)
+device		apm0	isa?
+
 # driver for the Adaptec 154x SCSI cards.
 controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
 # driver for the Adaptec 174x SCSI cards.
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 7cf8b54aa788..c110470de9cf 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.88 1994/09/28 22:51:54 wollman Exp $
+#	$Id: LINT,v 1.89 1994/09/28 22:57:24 wollman Exp $
 #
 
 machine		"i386"
@@ -62,6 +62,9 @@ options		DSI_SOFT_MODEM		#code for DSI Softmodems
 options		DIAGNOSTIC
 options		MSDOSFS_DEBUG
 
+options		APM			#Advance Power Management support for laptops
+					#(Note: also need apm device)
+
 # See /sys/i386/doc/sound.doc for information about EXCLUDE options for
 #  the sound drivers.
 
@@ -127,6 +130,9 @@ controller	isa0
 #This is a preliminary PCI bus ``device''
 device		pci0
 
+#Driver for Advaced Power Management (also need options APM)
+device		apm0	isa?
+
 # driver for the Adaptec 154x SCSI cards.
 controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
 # driver for the Adaptec 174x SCSI cards.
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7cf8b54aa788..c110470de9cf 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.88 1994/09/28 22:51:54 wollman Exp $
+#	$Id: LINT,v 1.89 1994/09/28 22:57:24 wollman Exp $
 #
 
 machine		"i386"
@@ -62,6 +62,9 @@ options		DSI_SOFT_MODEM		#code for DSI Softmodems
 options		DIAGNOSTIC
 options		MSDOSFS_DEBUG
 
+options		APM			#Advance Power Management support for laptops
+					#(Note: also need apm device)
+
 # See /sys/i386/doc/sound.doc for information about EXCLUDE options for
 #  the sound drivers.
 
@@ -127,6 +130,9 @@ controller	isa0
 #This is a preliminary PCI bus ``device''
 device		pci0
 
+#Driver for Advaced Power Management (also need options APM)
+device		apm0	isa?
+
 # driver for the Adaptec 154x SCSI cards.
 controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
 # driver for the Adaptec 174x SCSI cards.