diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 33f71f04c0ea..8ad0b8bbb1e2 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -51,7 +51,6 @@ CPU_ELAN			opt_cpu.h
 CPU_ELAN_PPS			opt_cpu.h
 CPU_ELAN_XTAL			opt_cpu.h
 CPU_ENABLE_LONGRUN		opt_cpu.h
-CPU_ENABLE_SSE			opt_cpu.h
 CPU_FASTER_5X86_FPU		opt_cpu.h
 CPU_GEODE			opt_cpu.h
 CPU_I486_ON_386			opt_cpu.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 5f8db10fdc4c..f50c867a57d1 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -41,7 +41,6 @@ CPU_DIRECT_MAPPED_CACHE		opt_cpu.h
 CPU_DISABLE_5X86_LSSER		opt_cpu.h
 CPU_DISABLE_CMPXCHG		opt_global.h	# XXX global, unlike other CPU_*
 CPU_DISABLE_SSE			opt_cpu.h
-CPU_ENABLE_SSE			opt_cpu.h
 CPU_FASTER_5X86_FPU		opt_cpu.h
 CPU_GEODE			opt_cpu.h
 CPU_I486_ON_386			opt_cpu.h
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index b04750bca31b..50dbb6048631 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -116,9 +116,6 @@ cpu		I686_CPU		# aka Pentium Pro(tm)
 # technology which allows to restrict power consumption of the CPU by
 # using group of hw.crusoe.* sysctls.
 #
-# CPU_ENABLE_SSE enables SSE/MMX2 instructions support.  This is default
-# on I686_CPU and above.
-#
 # CPU_FASTER_5X86_FPU enables faster FPU exception handler.
 #
 # CPU_GEODE is for the SC1100 Geode embedded processor.  This option
@@ -194,7 +191,6 @@ options 	CPU_ELAN
 options 	CPU_ELAN_PPS
 options 	CPU_ELAN_XTAL=32768000
 options 	CPU_ENABLE_LONGRUN
-options 	CPU_ENABLE_SSE
 options 	CPU_FASTER_5X86_FPU
 options 	CPU_GEODE
 options 	CPU_I486_ON_386
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index 4594724b021c..cec1fa578ca6 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -41,12 +41,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 
-#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU)
+#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU)
 #define CPU_ENABLE_SSE
 #endif
-#if defined(CPU_DISABLE_SSE)
-#undef CPU_ENABLE_SSE
-#endif
 
 void initializecpu(void);
 #if defined(I586_CPU) && defined(CPU_WT_ALLOC)
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 909fbf847752..be715d044281 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -147,12 +147,9 @@ extern void initializecpu(void);
 #define	CS_SECURE(cs)		(ISPL(cs) == SEL_UPL)
 #define	EFL_SECURE(ef, oef)	((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
 
-#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU)
+#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU)
 #define CPU_ENABLE_SSE
 #endif
-#if defined(CPU_DISABLE_SSE)
-#undef CPU_ENABLE_SSE
-#endif
 
 static void cpu_startup(void *);
 static void fpstate_drop(struct thread *td);
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 54000065d6fc..9dc44c58f9bc 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -143,12 +143,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/smp.h>
 #endif
 
-#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU)
+#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU)
 #define CPU_ENABLE_SSE
 #endif
-#if defined(CPU_DISABLE_SSE)
-#undef CPU_ENABLE_SSE
-#endif
 
 #ifndef PMAP_SHPGPERPROC
 #define PMAP_SHPGPERPROC 200
diff --git a/sys/i386/i386/ptrace_machdep.c b/sys/i386/i386/ptrace_machdep.c
index 3c877df49b2d..c63daa90de67 100644
--- a/sys/i386/i386/ptrace_machdep.c
+++ b/sys/i386/i386/ptrace_machdep.c
@@ -35,12 +35,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/pcb.h>
 
-#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU)
+#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU)
 #define CPU_ENABLE_SSE
 #endif
-#if defined(CPU_DISABLE_SSE)
-#undef CPU_ENABLE_SSE
-#endif
 
 int
 cpu_ptrace(struct thread *td, int req, void *addr, int data)
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 2c7906adbeb0..ae2ca9b5bfcf 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -73,12 +73,9 @@ __FBSDID("$FreeBSD$");
 #include <isa/isavar.h>
 #endif
 
-#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU)
+#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU)
 #define CPU_ENABLE_SSE
 #endif
-#if defined(CPU_DISABLE_SSE)
-#undef CPU_ENABLE_SSE
-#endif
 
 /*
  * 387 and 287 Numeric Coprocessor Extension (NPX) Driver.
diff --git a/sys/i386/linux/linux_ptrace.c b/sys/i386/linux/linux_ptrace.c
index f7e3d8379b0a..94450287132f 100644
--- a/sys/i386/linux/linux_ptrace.c
+++ b/sys/i386/linux/linux_ptrace.c
@@ -46,12 +46,9 @@ __FBSDID("$FreeBSD$");
 #include <i386/linux/linux.h>
 #include <i386/linux/linux_proto.h>
 
-#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU)
+#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU)
 #define CPU_ENABLE_SSE
 #endif
-#if defined(CPU_DISABLE_SSE)
-#undef CPU_ENABLE_SSE
-#endif
 
 /*
  *   Linux ptrace requests numbers. Mostly identical to FreeBSD,
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 86f1426f6d15..dcac1e704938 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -88,9 +88,6 @@ cpu		I686_CPU		# aka Pentium Pro(tm)
 #
 # CPU_DISABLE_SSE explicitly prevents I686_CPU from turning on SSE.
 #
-# CPU_ENABLE_SSE enables SSE/MMX2 instructions support.  This is default
-# on I686_CPU and above.
-#
 # CPU_FASTER_5X86_FPU enables faster FPU exception handler.
 #
 # CPU_I486_ON_386 enables CPU cache on i486 based CPU upgrade products
@@ -156,7 +153,6 @@ options 	CPU_DIRECT_MAPPED_CACHE
 options 	CPU_DISABLE_5X86_LSSER
 options 	CPU_DISABLE_CMPXCHG
 #options 	CPU_DISABLE_SSE
-options 	CPU_ENABLE_SSE
 options 	CPU_FASTER_5X86_FPU
 options 	CPU_I486_ON_386
 options 	CPU_IORT
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index fa9c058dacd2..5c2fa32d7532 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -147,12 +147,9 @@ extern void initializecpu(void);
 #define	CS_SECURE(cs)		(ISPL(cs) == SEL_UPL)
 #define	EFL_SECURE(ef, oef)	((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
 
-#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU)
+#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU)
 #define CPU_ENABLE_SSE
 #endif
-#if defined(CPU_DISABLE_SSE)
-#undef CPU_ENABLE_SSE
-#endif
 
 static void cpu_startup(void *);
 static void fpstate_drop(struct thread *td);