diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 694220fd2faa..46a9c585463a 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.68 1996/04/29 20:03:41 jkh Exp $
+#	$Id: GENERIC,v 1.69 1996/05/01 03:26:58 bde Exp $
 #
 
 machine		"i386"
@@ -98,6 +98,10 @@ device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 #
 device		apm0    at isa?	disable	# Advanced Power Management
 options		APM_BROKEN_STATCLOCK	# Workaround some buggy APM BIOS
+# PCCARD (PCMCIA) support
+#controller	crd0
+#device		pcic0	at crd?
+#device		pcic1	at crd?
 
 device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
 device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 45bb4c6f0e21..83c7938ed432 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.255 1996/05/03 05:44:44 asami Exp $
+#	$Id: LINT,v 1.256 1996/05/10 13:26:03 peter Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -716,6 +716,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # apm: Laptop Advanced Power Management (experimental)
 # spigot: The Creative Labs Video Spigot video-acquisition board
 # meteor: Matrox Meteor video capture board
+# crd: PCCARD (PCMCIA) slot controller (see pcic)
 # cy: Cyclades serial driver
 # dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!)
 # gp:  National Instruments AT-GPIB and AT-GPIB/TNT board
@@ -723,6 +724,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # gsc: Genius GS-4500 hand scanner.
 # joy: joystick
 # labpc: National Instrument's Lab-PC and Lab-PC+
+# pcic: PCCARD (PCMCIA) slot (see crd)
 # rc: RISCom/8 multiport card
 # tw: TW-523 power line interface for use with X-10 home control products
 # si: Specialix SI/XIO 4-32 port terminal multiplexor
@@ -789,6 +791,9 @@ device		spigot0 at isa? port 0xad6 irq 15 iomem 0xee000 vector spigintr
 device		qcam0	at isa? port "IO_LPT3" tty
 device		apm0	at isa?
 options		APM_BROKEN_STATCLOCK
+controller	crd0
+device		pcic0 at crd?
+device		pcic1 at crd?
 device		gp0	at isa? port 0x2c0 tty
 device		gsc0	at isa? port "IO_GSC1" tty drq 3
 device		joy0	at isa? port "IO_GAME"
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 694220fd2faa..46a9c585463a 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.68 1996/04/29 20:03:41 jkh Exp $
+#	$Id: GENERIC,v 1.69 1996/05/01 03:26:58 bde Exp $
 #
 
 machine		"i386"
@@ -98,6 +98,10 @@ device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 #
 device		apm0    at isa?	disable	# Advanced Power Management
 options		APM_BROKEN_STATCLOCK	# Workaround some buggy APM BIOS
+# PCCARD (PCMCIA) support
+#controller	crd0
+#device		pcic0	at crd?
+#device		pcic1	at crd?
 
 device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
 device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 45bb4c6f0e21..83c7938ed432 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.255 1996/05/03 05:44:44 asami Exp $
+#	$Id: LINT,v 1.256 1996/05/10 13:26:03 peter Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -716,6 +716,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # apm: Laptop Advanced Power Management (experimental)
 # spigot: The Creative Labs Video Spigot video-acquisition board
 # meteor: Matrox Meteor video capture board
+# crd: PCCARD (PCMCIA) slot controller (see pcic)
 # cy: Cyclades serial driver
 # dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!)
 # gp:  National Instruments AT-GPIB and AT-GPIB/TNT board
@@ -723,6 +724,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # gsc: Genius GS-4500 hand scanner.
 # joy: joystick
 # labpc: National Instrument's Lab-PC and Lab-PC+
+# pcic: PCCARD (PCMCIA) slot (see crd)
 # rc: RISCom/8 multiport card
 # tw: TW-523 power line interface for use with X-10 home control products
 # si: Specialix SI/XIO 4-32 port terminal multiplexor
@@ -789,6 +791,9 @@ device		spigot0 at isa? port 0xad6 irq 15 iomem 0xee000 vector spigintr
 device		qcam0	at isa? port "IO_LPT3" tty
 device		apm0	at isa?
 options		APM_BROKEN_STATCLOCK
+controller	crd0
+device		pcic0 at crd?
+device		pcic1 at crd?
 device		gp0	at isa? port 0x2c0 tty
 device		gsc0	at isa? port "IO_GSC1" tty drq 3
 device		joy0	at isa? port "IO_GAME"
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 45bb4c6f0e21..83c7938ed432 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.255 1996/05/03 05:44:44 asami Exp $
+#	$Id: LINT,v 1.256 1996/05/10 13:26:03 peter Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -716,6 +716,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # apm: Laptop Advanced Power Management (experimental)
 # spigot: The Creative Labs Video Spigot video-acquisition board
 # meteor: Matrox Meteor video capture board
+# crd: PCCARD (PCMCIA) slot controller (see pcic)
 # cy: Cyclades serial driver
 # dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!)
 # gp:  National Instruments AT-GPIB and AT-GPIB/TNT board
@@ -723,6 +724,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # gsc: Genius GS-4500 hand scanner.
 # joy: joystick
 # labpc: National Instrument's Lab-PC and Lab-PC+
+# pcic: PCCARD (PCMCIA) slot (see crd)
 # rc: RISCom/8 multiport card
 # tw: TW-523 power line interface for use with X-10 home control products
 # si: Specialix SI/XIO 4-32 port terminal multiplexor
@@ -789,6 +791,9 @@ device		spigot0 at isa? port 0xad6 irq 15 iomem 0xee000 vector spigintr
 device		qcam0	at isa? port "IO_LPT3" tty
 device		apm0	at isa?
 options		APM_BROKEN_STATCLOCK
+controller	crd0
+device		pcic0 at crd?
+device		pcic1 at crd?
 device		gp0	at isa? port 0x2c0 tty
 device		gsc0	at isa? port "IO_GSC1" tty drq 3
 device		joy0	at isa? port "IO_GAME"