diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index a49f5375a59..b3dbbc5d706 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.94 1998/12/05 03:19:51 dillon Exp $
+#	$Id: options.i386,v 1.95 1998/12/12 08:16:00 imp Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -32,13 +32,8 @@ I586_PMC_GUPROF		opt_i586_guprof.h
 WLCACHE			opt_wavelan.h
 WLDEBUG			opt_wavelan.h
 
-# These two SMP options have dramatic implications all over the kernel
-SMP			opt_global.h
+# i386 SMP options
 APIC_IO			opt_global.h
-
-# Standard SMP options
-NCPU			opt_smp.h
-NBUS			opt_smp.h
 NAPIC			opt_smp.h
 NINTR			opt_smp.h
 
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index a49f5375a59..b3dbbc5d706 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.94 1998/12/05 03:19:51 dillon Exp $
+#	$Id: options.i386,v 1.95 1998/12/12 08:16:00 imp Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -32,13 +32,8 @@ I586_PMC_GUPROF		opt_i586_guprof.h
 WLCACHE			opt_wavelan.h
 WLDEBUG			opt_wavelan.h
 
-# These two SMP options have dramatic implications all over the kernel
-SMP			opt_global.h
+# i386 SMP options
 APIC_IO			opt_global.h
-
-# Standard SMP options
-NCPU			opt_smp.h
-NBUS			opt_smp.h
 NAPIC			opt_smp.h
 NINTR			opt_smp.h