diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 516c1ab156bc..7591761a3bc9 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.262 1996/06/10 00:50:34 alex Exp $
+#	$Id: LINT,v 1.263 1996/06/10 08:15:29 peter Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -69,6 +69,16 @@ options		GPL_MATH_EMULATE	#Support for x87 emulation via
 options		FAILSAFE
 
 
+# When this is set, copyin/copyout will use an unrolled loop using
+# floating point registers.  It makes copyin/copyout run 30-100%
+# faster on Pentiums and makes no difference or slower on non-Pentium
+# (including P6) systems.
+#
+# However, even when this is set, there is a run-time check for CPU
+# type so the routine will never be invoked for a wrong architecture.
+# It will become the default after some testing period.
+options		"I586_FAST_BCOPY"
+
 #
 # This directive defines a number of things:
 #  - The compiled kernel is to be called `kernel'
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 516c1ab156bc..7591761a3bc9 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.262 1996/06/10 00:50:34 alex Exp $
+#	$Id: LINT,v 1.263 1996/06/10 08:15:29 peter Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -69,6 +69,16 @@ options		GPL_MATH_EMULATE	#Support for x87 emulation via
 options		FAILSAFE
 
 
+# When this is set, copyin/copyout will use an unrolled loop using
+# floating point registers.  It makes copyin/copyout run 30-100%
+# faster on Pentiums and makes no difference or slower on non-Pentium
+# (including P6) systems.
+#
+# However, even when this is set, there is a run-time check for CPU
+# type so the routine will never be invoked for a wrong architecture.
+# It will become the default after some testing period.
+options		"I586_FAST_BCOPY"
+
 #
 # This directive defines a number of things:
 #  - The compiled kernel is to be called `kernel'
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 516c1ab156bc..7591761a3bc9 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.262 1996/06/10 00:50:34 alex Exp $
+#	$Id: LINT,v 1.263 1996/06/10 08:15:29 peter Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -69,6 +69,16 @@ options		GPL_MATH_EMULATE	#Support for x87 emulation via
 options		FAILSAFE
 
 
+# When this is set, copyin/copyout will use an unrolled loop using
+# floating point registers.  It makes copyin/copyout run 30-100%
+# faster on Pentiums and makes no difference or slower on non-Pentium
+# (including P6) systems.
+#
+# However, even when this is set, there is a run-time check for CPU
+# type so the routine will never be invoked for a wrong architecture.
+# It will become the default after some testing period.
+options		"I586_FAST_BCOPY"
+
 #
 # This directive defines a number of things:
 #  - The compiled kernel is to be called `kernel'