diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index 4266c6bcbd9e..32074d662033 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,7 +1,7 @@
 #
 #	ALL -- everything that's currently supported
 #
-#	$Id: ALL,v 1.53 1994/07/01 20:09:56 mycroft Exp $
+#	$Id: ALL,v 1.54 1994/07/04 20:22:26 cgd Exp $
 #
 
 # architecture type and name of kernel; REQUIRED
@@ -65,7 +65,7 @@ options		NFSSERVER
 options		NFSCLIENT
 
 # ISO 9660 file system, with Rock Ridge
-options		ISOFS
+options		"CD9660"
 
 # MS-DOS file system
 options		MSDOSFS
@@ -73,7 +73,7 @@ options		MSDOSFS
 # /dev/fd
 options		FDESC
 
-# kernel file system; RECOMMENDED
+# kernel file system
 options		KERNFS
 
 # various types of networks and protocols
diff --git a/sys/arch/i386/conf/GENERICAHA b/sys/arch/i386/conf/GENERICAHA
index d20deb68c232..07b977fdcf19 100644
--- a/sys/arch/i386/conf/GENERICAHA
+++ b/sys/arch/i386/conf/GENERICAHA
@@ -1,7 +1,7 @@
 #
 # GENERICAHA -- Generic machine w/aha driver -- distribution floppy
 #
-#	$Id: GENERICAHA,v 1.47 1994/07/01 20:09:57 mycroft Exp $
+#	$Id: GENERICAHA,v 1.48 1994/07/04 20:22:38 cgd Exp $
 #
 
 machine		"i386"
@@ -13,7 +13,7 @@ timezone	8 dst
 maxusers	10
 options		SWAPPAGER,VNODEPAGER,DEVPAGER
 options		FFS
-options		INET,ISOFS,NFSCLIENT
+options		INET,"CD9660",NFSCLIENT
 options		"COMPAT_43"
 options		"TCP_COMPAT_42"
 options		XSERVER,UCONSOLE
diff --git a/sys/arch/i386/conf/GENERICBT b/sys/arch/i386/conf/GENERICBT
index 7ad3dee1fd33..3ed9439f33a5 100644
--- a/sys/arch/i386/conf/GENERICBT
+++ b/sys/arch/i386/conf/GENERICBT
@@ -1,7 +1,7 @@
 #
 # GENERICBT -- Generic machine w/bt driver -- distribution floppy
 #
-#	$Id: GENERICBT,v 1.11 1994/07/01 20:09:58 mycroft Exp $
+#	$Id: GENERICBT,v 1.12 1994/07/04 20:22:46 cgd Exp $
 #
 
 machine		"i386"
@@ -13,7 +13,7 @@ timezone	8 dst
 maxusers	10
 options		SWAPPAGER,VNODEPAGER,DEVPAGER
 options		FFS
-options		INET,ISOFS,NFSCLIENT
+options		INET,"CD9660",NFSCLIENT
 options		"COMPAT_43"
 options		"TCP_COMPAT_42"
 options		XSERVER,UCONSOLE
diff --git a/sys/arch/i386/conf/KICKME b/sys/arch/i386/conf/KICKME
index 22f1f34ce032..92107331bbad 100644
--- a/sys/arch/i386/conf/KICKME
+++ b/sys/arch/i386/conf/KICKME
@@ -1,7 +1,7 @@
 #
 # KICKME -- 486Cx-33 development machine.
 #
-#	$Id: KICKME,v 1.11 1994/06/29 06:29:44 cgd Exp $
+#	$Id: KICKME,v 1.12 1994/07/04 20:22:52 cgd Exp $
 #
 
 machine		"i386"
@@ -11,9 +11,9 @@ timezone	8 dst
 maxusers	10
 options		SWAPPAGER,VNODEPAGER,DEVPAGER
 options		FFS
-options		INET,ISOFS,NFSSERVER,NFSCLIENT,NULLFS
+options		INET,"CD9660",NFSSERVER,NFSCLIENT,NULLFS
 options		"COMPAT_43"
-#options		MSDOSFS
+#options	MSDOSFS
 options		SCSI
 options		"MATH_EMULATE"
 options 	"COMPAT_NOMID"
diff --git a/sys/arch/i386/conf/PAIN b/sys/arch/i386/conf/PAIN
index 1952005c1f1e..d0b6ba7b4189 100644
--- a/sys/arch/i386/conf/PAIN
+++ b/sys/arch/i386/conf/PAIN
@@ -1,7 +1,7 @@
 #
 # PAIN -- kernel for another of cgd's 486/50 EISA boxes...
 #
-#	$Id: PAIN,v 1.34 1994/06/29 06:29:45 cgd Exp $
+#	$Id: PAIN,v 1.35 1994/07/04 20:22:58 cgd Exp $
 #
 machine		"i386"
 cpu		"I486_CPU"
@@ -46,7 +46,7 @@ options		FFS
 options		MFS
 options		NFSSERVER,NFSCLIENT
 #options		MSDOSFS
-options		ISOFS,NULLFS
+options		"CD9660",NULLFS
 options		FDESC,FIFO,KERNFS,PORTAL,PROCFS
 
 # and even UFS quotas
diff --git a/sys/arch/i386/conf/SUN_LAMP b/sys/arch/i386/conf/SUN_LAMP
index f1ec75307a27..08789778d770 100644
--- a/sys/arch/i386/conf/SUN_LAMP
+++ b/sys/arch/i386/conf/SUN_LAMP
@@ -1,7 +1,7 @@
 #
 # SUN_LAMP -- kernel for one of cgd's 486/50 EISA boxes...
 #
-#	$Id: SUN_LAMP,v 1.48 1994/06/29 06:29:47 cgd Exp $
+#	$Id: SUN_LAMP,v 1.49 1994/07/04 20:23:08 cgd Exp $
 #
 machine		"i386"
 cpu		"I486_CPU"
@@ -10,7 +10,7 @@ timezone	8 dst
 maxusers	24
 options		SWAPPAGER,VNODEPAGER,DEVPAGER
 options		FFS
-options		INET,NFSSERVER,NFSCLIENT,MFS,ISOFS,NULLFS
+options		INET,NFSSERVER,NFSCLIENT,MFS,"CD9660",NULLFS
 options		"COMPAT_43"
 options		"TCP_COMPAT_42"
 options		UCONSOLE, XSERVER