diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 662bad8a22a8..de2290deb4d1 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.6 1994/10/26 19:20:26 jkh Exp $
+#	$Id: GENERIC,v 1.7 1994/11/03 01:46:59 gpalmer Exp $
 #
 
 machine		"i386"
@@ -22,7 +22,6 @@ options		"FAT_CURSOR"		#block cursor in syscons or pccons
 options		"SCSI_DELAY=15"		#Be pessimistic about Joe SCSI device
 options		"NCONS=4"		#4 virtual consoles
 options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
-options		USERCONFIG		#Allow user configuration with -c
 
 config		kernel	root on wd0 swap on wd0 and wd1 and sd0 and sd1 dumps on wd0
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 9648b8ebcf0f..13e3574f2856 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.103 1994/10/30 20:57:07 joerg Exp $
+#	$Id: LINT,v 1.104 1994/11/02 01:11:03 wollman Exp $
 #
 
 #
@@ -103,11 +103,6 @@ options		KTRACE			#kernel tracing
 #
 options		DIAGNOSTIC
 
-#
-# Enable the in-kernel boot-time device configuration utility (boot with -c)
-#
-options		USERCONFIG
-
 
 #####################################################################
 # NETWORKING OPTIONS
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 03637bf02697..e04f1d527e24 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.57 1994/10/28 15:09:38 jkh Exp $
+#	$Id: files.i386,v 1.58 1994/11/01 01:47:17 pst Exp $
 #
 i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
@@ -27,7 +27,7 @@ i386/i386/support.s		standard
 i386/i386/swtch.s		standard
 i386/i386/sys_machdep.c		standard
 i386/i386/trap.c		standard
-i386/i386/userconfig.c		optional	userconfig
+i386/i386/userconfig.c		standard
 i386/i386/vm_machdep.c		standard
 i386/ibcs2/ibcs2_dummy.c	optional 	ibcs2
 i386/ibcs2/ibcs2_file.c		optional 	ibcs2
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 662bad8a22a8..de2290deb4d1 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.6 1994/10/26 19:20:26 jkh Exp $
+#	$Id: GENERIC,v 1.7 1994/11/03 01:46:59 gpalmer Exp $
 #
 
 machine		"i386"
@@ -22,7 +22,6 @@ options		"FAT_CURSOR"		#block cursor in syscons or pccons
 options		"SCSI_DELAY=15"		#Be pessimistic about Joe SCSI device
 options		"NCONS=4"		#4 virtual consoles
 options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
-options		USERCONFIG		#Allow user configuration with -c
 
 config		kernel	root on wd0 swap on wd0 and wd1 and sd0 and sd1 dumps on wd0
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 9648b8ebcf0f..13e3574f2856 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.103 1994/10/30 20:57:07 joerg Exp $
+#	$Id: LINT,v 1.104 1994/11/02 01:11:03 wollman Exp $
 #
 
 #
@@ -103,11 +103,6 @@ options		KTRACE			#kernel tracing
 #
 options		DIAGNOSTIC
 
-#
-# Enable the in-kernel boot-time device configuration utility (boot with -c)
-#
-options		USERCONFIG
-
 
 #####################################################################
 # NETWORKING OPTIONS
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 9648b8ebcf0f..13e3574f2856 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.103 1994/10/30 20:57:07 joerg Exp $
+#	$Id: LINT,v 1.104 1994/11/02 01:11:03 wollman Exp $
 #
 
 #
@@ -103,11 +103,6 @@ options		KTRACE			#kernel tracing
 #
 options		DIAGNOSTIC
 
-#
-# Enable the in-kernel boot-time device configuration utility (boot with -c)
-#
-options		USERCONFIG
-
 
 #####################################################################
 # NETWORKING OPTIONS
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 03637bf02697..e04f1d527e24 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.57 1994/10/28 15:09:38 jkh Exp $
+#	$Id: files.i386,v 1.58 1994/11/01 01:47:17 pst Exp $
 #
 i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
@@ -27,7 +27,7 @@ i386/i386/support.s		standard
 i386/i386/swtch.s		standard
 i386/i386/sys_machdep.c		standard
 i386/i386/trap.c		standard
-i386/i386/userconfig.c		optional	userconfig
+i386/i386/userconfig.c		standard
 i386/i386/vm_machdep.c		standard
 i386/ibcs2/ibcs2_dummy.c	optional 	ibcs2
 i386/ibcs2/ibcs2_file.c		optional 	ibcs2