diff --git a/UPDATING b/UPDATING
index 0684cf5d0626..13c6c68b0ced 100644
--- a/UPDATING
+++ b/UPDATING
@@ -21,14 +21,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW:
 	developers choose to disable these features on build machines
 	to maximize performance.
 
-20061025:
+20061026:
 	KSE in the kernel has now been made optional and turned on by
-	default in the GENERIC kernels. Either add 'options KSE' to your
-	custom kernel or edit /etc/libmap.conf to redirect libpthread.so.2
-	to libthr.so.2. All kernel modules *must* be recompiled after
-	this change. There-after, modules from a KSE kernel should be
-	compatible with modules from a NOKSE kernel due to the temporary
-	padding fields added to 'struct proc'.
+	default. Use 'nooption KSE' in your kernel config to turn it
+	off. All kernel modules *must* be recompiled after this change.
+	There-after, modules from a KSE kernel should be compatible with
+	modules from a NOKSE kernel due to the temporary padding fields
+	added to 'struct proc'.
 
 20060929:
 	mrouted and its utilities have been removed from the base system.
diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
index b95c711628a5..4cf775f2d622 100644
--- a/sys/amd64/conf/DEFAULTS
+++ b/sys/amd64/conf/DEFAULTS
@@ -14,3 +14,6 @@ device		io		# I/O device
 
 # UART chips on this platform
 device		uart_ns8250
+
+# KSE support went from being default to a kernel option
+options 	KSE
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS
index f0c64c1b0182..50a30ee7d594 100644
--- a/sys/i386/conf/DEFAULTS
+++ b/sys/i386/conf/DEFAULTS
@@ -18,3 +18,6 @@ device		io		# I/O device
 
 # UART chips on this platform
 device		uart_ns8250
+
+# KSE support went from being default to a kernel option
+options 	KSE
diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS
index 71accdcd6a9d..c36a9674e41b 100644
--- a/sys/ia64/conf/DEFAULTS
+++ b/sys/ia64/conf/DEFAULTS
@@ -18,3 +18,5 @@ options 	GEOM_BSD
 options 	GEOM_GPT
 options 	GEOM_MBR
 
+# KSE support went from being default to a kernel option
+options 	KSE
diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS
index 4a26c6899432..7fd3dbaecd61 100644
--- a/sys/pc98/conf/DEFAULTS
+++ b/sys/pc98/conf/DEFAULTS
@@ -20,3 +20,6 @@ device		io		# I/O device
 # UART chips on this platform
 device		uart_ns8250
 #device		uart_i8251
+
+# KSE support went from being default to a kernel option
+options 	KSE
diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS
index 6537172490ae..c25145a75b08 100644
--- a/sys/powerpc/conf/DEFAULTS
+++ b/sys/powerpc/conf/DEFAULTS
@@ -11,3 +11,6 @@ device		mem		# Memory and kernel memory devices
 # UART chips on this platform
 device		uart_ns8250
 device		uart_z8530
+
+# KSE support went from being default to a kernel option
+options 	KSE
diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS
index 1c6863f48d60..8545b37e4cb6 100644
--- a/sys/sparc64/conf/DEFAULTS
+++ b/sys/sparc64/conf/DEFAULTS
@@ -12,3 +12,6 @@ device		mem		# Memory and kernel memory devices
 device		uart_ns8250
 device		uart_sab82532
 device		uart_z8530
+
+# KSE support went from being default to a kernel option
+options 	KSE
diff --git a/sys/sun4v/conf/DEFAULTS b/sys/sun4v/conf/DEFAULTS
index 5695ed658457..a4bea1ad1d82 100644
--- a/sys/sun4v/conf/DEFAULTS
+++ b/sys/sun4v/conf/DEFAULTS
@@ -1,5 +1,5 @@
 #
-# DEFAULTS -- Default kernel configuration file for FreeBSD/sparc64
+# DEFAULTS -- Default kernel configuration file for FreeBSD/sun4v
 #
 # $FreeBSD$