diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 3d5bc30fbb9..4a85e618ff9 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.2 1993/08/26 17:55:58 rgrimes Exp $
+#	$Id: LINT,v 1.3 1993/08/27 02:10:12 rgrimes Exp $
 #
 
 machine		"i386"
@@ -13,6 +13,7 @@ ident		LINT
 timezone	8 dst
 maxusers	10
 maxfdescs	2048			#Max file descriptors per process
+options		MATH_EMULATE		#Support for x87 emulation
 
 config		"386bsd"	root on wd0 swap on wd0 and sd0
 
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index ce50da67d12..61060668633 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.8 1993/08/21 22:24:24 rgrimes Exp $
+#	$Id: files.i386,v 1.9 1993/08/21 23:52:36 rgrimes Exp $
 #
 i386/i386/autoconf.c		standard		device-driver
 i386/i386/cons.c		standard
@@ -10,7 +10,7 @@ i386/i386/db_interface.c	optional	ddb
 i386/i386/db_trace.c		optional	ddb
 i386/i386/in_cksum.c		optional	inet
 i386/i386/machdep.c		standard		config-dependent
-i386/i386/math_emulate.c	standard
+i386/i386/math_emulate.c	optional	math_emulate
 i386/i386/mem.c			standard
 i386/i386/microtime.s		standard
 i386/i386/ns_cksum.c		optional	ns
diff --git a/sys/i386/conf/GENERICAH b/sys/i386/conf/GENERICAH
index 3366830a41f..6551b1e1f68 100644
--- a/sys/i386/conf/GENERICAH
+++ b/sys/i386/conf/GENERICAH
@@ -1,7 +1,7 @@
 #
 # GENERICAH -- Generic machine with WD/AHx family disks
 #
-#	$Id: GENERICAH,v 1.4 1993/08/21 23:46:41 rgrimes Exp $
+#	$Id: GENERICAH,v 1.5 1993/08/26 17:55:55 rgrimes Exp $
 #
 
 machine		"i386"
@@ -10,6 +10,7 @@ ident		GENERICAH
 timezone	8 dst
 maxusers	10
 maxfdescs	2048			#Max file descriptors per process
+options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		ISOFS			#ISO File System
 options		NFS			#Network File System
@@ -49,16 +50,17 @@ device		cd1
 device		pc0	at isa? port "IO_KBD" tty irq 1 vector pcrint
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 
-device		com0	at isa? port "IO_COM1" tty irq 4 vector comintr
-device		com1	at isa? port "IO_COM2" tty irq 3 vector comintr
-device		com2	at isa? port "IO_COM3" tty irq 5 vector comintr
-device		com3	at isa? port "IO_COM4" tty irq 9 vector comintr
+#The old drivers are rearly needed anymore...
+#device		com0	at isa? port "IO_COM1" tty irq 4 vector comintr
+#device		com1	at isa? port "IO_COM2" tty irq 3 vector comintr
+#device		com2	at isa? port "IO_COM3" tty irq 5 vector comintr
+#device		com3	at isa? port "IO_COM4" tty irq 9 vector comintr
 
-#For high speed serial lines use these instead.
-#device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
-#device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
-#device		sio2	at isa? port "IO_COM3" tty irq 5 vector siointr
-#device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
+#For high speed serial lines.
+device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
+device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
+device		sio2	at isa? port "IO_COM3" tty irq 5 vector siointr
+device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
 
 device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
 device		lpa0	at isa? port "IO_LPT1" tty
diff --git a/sys/i386/conf/GENERICBT b/sys/i386/conf/GENERICBT
index b09ff6a4ed4..7334a2a4f5d 100644
--- a/sys/i386/conf/GENERICBT
+++ b/sys/i386/conf/GENERICBT
@@ -1,7 +1,7 @@
 #
 # GENERICBT -- Generic machine with WD/BTx family disks
 #
-#	$Id: GENERICBT,v 1.1 1993/08/21 23:46:42 rgrimes Exp $
+#	$Id: GENERICBT,v 1.2 1993/08/26 17:55:57 rgrimes Exp $
 #
 
 machine		"i386"
@@ -10,6 +10,7 @@ ident		GENERICBT
 timezone	8 dst
 maxusers	10
 maxfdescs	2048			#Max file descriptors per process
+options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		ISOFS			#ISO File System
 options		NFS			#Network File System
@@ -49,16 +50,17 @@ device		cd1
 device		pc0	at isa? port "IO_KBD" tty irq 1 vector pcrint
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 
-device		com0	at isa? port "IO_COM1" tty irq 4 vector comintr
-device		com1	at isa? port "IO_COM2" tty irq 3 vector comintr
-device		com2	at isa? port "IO_COM3" tty irq 5 vector comintr
-device		com3	at isa? port "IO_COM4" tty irq 9 vector comintr
+#The old drivers are rearly needed anymore...
+#device		com0	at isa? port "IO_COM1" tty irq 4 vector comintr
+#device		com1	at isa? port "IO_COM2" tty irq 3 vector comintr
+#device		com2	at isa? port "IO_COM3" tty irq 5 vector comintr
+#device		com3	at isa? port "IO_COM4" tty irq 9 vector comintr
 
-#For high speed serial lines use these instead.
-#device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
-#device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
-#device		sio2	at isa? port "IO_COM3" tty irq 5 vector siointr
-#device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
+#For high speed serial lines.
+device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
+device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
+device		sio2	at isa? port "IO_COM3" tty irq 5 vector siointr
+device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
 
 device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
 device		lpa0	at isa? port "IO_LPT1" tty
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 3d5bc30fbb9..4a85e618ff9 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.2 1993/08/26 17:55:58 rgrimes Exp $
+#	$Id: LINT,v 1.3 1993/08/27 02:10:12 rgrimes Exp $
 #
 
 machine		"i386"
@@ -13,6 +13,7 @@ ident		LINT
 timezone	8 dst
 maxusers	10
 maxfdescs	2048			#Max file descriptors per process
+options		MATH_EMULATE		#Support for x87 emulation
 
 config		"386bsd"	root on wd0 swap on wd0 and sd0
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 3d5bc30fbb9..4a85e618ff9 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.2 1993/08/26 17:55:58 rgrimes Exp $
+#	$Id: LINT,v 1.3 1993/08/27 02:10:12 rgrimes Exp $
 #
 
 machine		"i386"
@@ -13,6 +13,7 @@ ident		LINT
 timezone	8 dst
 maxusers	10
 maxfdescs	2048			#Max file descriptors per process
+options		MATH_EMULATE		#Support for x87 emulation
 
 config		"386bsd"	root on wd0 swap on wd0 and sd0
 
diff --git a/sys/i386/conf/SYSCONS b/sys/i386/conf/SYSCONS
index b668331a938..d18532f90a0 100644
--- a/sys/i386/conf/SYSCONS
+++ b/sys/i386/conf/SYSCONS
@@ -1,7 +1,7 @@
 #
 # SYSCONS -- Generic machine with WD/AHx family disks and syscons
 #
-#	$Id: SYSCONS,v 1.2 1993/08/21 23:48:06 rgrimes Exp $
+#	$Id: SYSCONS,v 1.3 1993/08/26 17:55:59 rgrimes Exp $
 #
 
 machine		"i386"
@@ -10,6 +10,7 @@ ident		SYSCONS
 timezone	8 dst
 maxusers	10
 maxfdescs	2048			#Max file descriptors per process
+options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		ISOFS			#ISO File System
 options		NFS			#Network File System
@@ -50,10 +51,17 @@ device		cd1
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 
-device		com0	at isa? port "IO_COM1" tty irq 4 vector comintr
-device		com1	at isa? port "IO_COM2" tty irq 3 vector comintr
-device		com2	at isa? port "IO_COM3" tty irq 5 vector comintr
-device		com3	at isa? port "IO_COM4" tty irq 9 vector comintr
+#The old drivers are rearly needed anymore...
+#device		com0	at isa? port "IO_COM1" tty irq 4 vector comintr
+#device		com1	at isa? port "IO_COM2" tty irq 3 vector comintr
+#device		com2	at isa? port "IO_COM3" tty irq 5 vector comintr
+#device		com3	at isa? port "IO_COM4" tty irq 9 vector comintr
+
+#For high speed serial lines.
+device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
+device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
+device		sio2	at isa? port "IO_COM3" tty irq 5 vector siointr
+device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
 
 device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
 device		lpa0	at isa? port "IO_LPT1" tty
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index ce50da67d12..61060668633 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.8 1993/08/21 22:24:24 rgrimes Exp $
+#	$Id: files.i386,v 1.9 1993/08/21 23:52:36 rgrimes Exp $
 #
 i386/i386/autoconf.c		standard		device-driver
 i386/i386/cons.c		standard
@@ -10,7 +10,7 @@ i386/i386/db_interface.c	optional	ddb
 i386/i386/db_trace.c		optional	ddb
 i386/i386/in_cksum.c		optional	inet
 i386/i386/machdep.c		standard		config-dependent
-i386/i386/math_emulate.c	standard
+i386/i386/math_emulate.c	optional	math_emulate
 i386/i386/mem.c			standard
 i386/i386/microtime.s		standard
 i386/i386/ns_cksum.c		optional	ns