diff --git a/sys/arch/x68k/conf/ALL b/sys/arch/x68k/conf/ALL
index 1f473167eb99..a40af29eb9ff 100644
--- a/sys/arch/x68k/conf/ALL
+++ b/sys/arch/x68k/conf/ALL
@@ -1,4 +1,4 @@
-#	$NetBSD: ALL,v 1.37 2000/09/24 15:59:38 jdolecek Exp $
+#	$NetBSD: ALL,v 1.38 2000/12/29 15:18:37 minoura Exp $
 
 #
 #	ALL -- everything that's currently supported
@@ -6,7 +6,7 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident 		"ALL-$Revision: 1.37 $"
+#ident 		"ALL-$Revision: 1.38 $"
 
 maxusers	32
 
@@ -18,6 +18,10 @@ maxusers	32
 options 	M68030
 options 	M68040
 options 	M68060
+## If you want an optimized kernel for a specific processor, use either:
+#makeoptions	CMACHFLAGS="-m68030"
+#makeoptions	CMACHFLAGS="-m68040 -Wa,-m68030 -Wa,-m68851"
+#makeoptions	CMACHFLAGS="-m68060 -Wa,-m68030 -Wa,-m68851"
 
 
 #### System options specific to the x68k port
diff --git a/sys/arch/x68k/conf/GENERIC b/sys/arch/x68k/conf/GENERIC
index e26571b3c08d..7fa20e81bb33 100644
--- a/sys/arch/x68k/conf/GENERIC
+++ b/sys/arch/x68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.54 2000/12/19 10:42:07 bouyer Exp $
+#	$NetBSD: GENERIC,v 1.55 2000/12/29 15:18:37 minoura Exp $
 
 #
 #	GENERIC
@@ -6,7 +6,7 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident 		"GENERIC-$Revision: 1.54 $"
+#ident 		"GENERIC-$Revision: 1.55 $"
 
 maxusers	8
 
@@ -18,6 +18,10 @@ maxusers	8
 options 	M68030
 options 	M68040
 options 	M68060
+## If you want an optimized kernel for a specific processor, use either:
+#makeoptions	CMACHFLAGS="-m68030"
+#makeoptions	CMACHFLAGS="-m68040 -Wa,-m68030 -Wa,-m68851"
+#makeoptions	CMACHFLAGS="-m68060 -Wa,-m68030 -Wa,-m68851"
 
 
 #### System options specific to the x68k port
diff --git a/sys/arch/x68k/conf/INSTALL b/sys/arch/x68k/conf/INSTALL
index 0356178a456b..f344c479ed8b 100644
--- a/sys/arch/x68k/conf/INSTALL
+++ b/sys/arch/x68k/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.36 2000/11/29 14:45:27 minoura Exp $
+#	$NetBSD: INSTALL,v 1.37 2000/12/29 15:18:37 minoura Exp $
 
 #
 #	INSTALL -- installation kernel.
@@ -6,7 +6,7 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident 		"INSTALL-$Revision: 1.36 $"
+#ident 		"INSTALL-$Revision: 1.37 $"
 
 makeoptions     COPTS="-Os"             # Optimise for space. Implies -O2
 
@@ -28,6 +28,10 @@ options 	MINIROOTSIZE=2400
 options 	M68030
 options 	M68040
 options 	M68060
+## If you want an optimized kernel for a specific processor, use either:
+#makeoptions	CMACHFLAGS="-m68030"
+#makeoptions	CMACHFLAGS="-m68040 -Wa,-m68030 -Wa,-m68851"
+#makeoptions	CMACHFLAGS="-m68060 -Wa,-m68030 -Wa,-m68851"
 
 
 #### System options specific to the x68k port
diff --git a/sys/arch/x68k/conf/Makefile.x68k b/sys/arch/x68k/conf/Makefile.x68k
index e4684cb862cb..3ab44200dc93 100644
--- a/sys/arch/x68k/conf/Makefile.x68k
+++ b/sys/arch/x68k/conf/Makefile.x68k
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.x68k,v 1.48 2000/12/17 15:52:44 jdolecek Exp $
+#	$NetBSD: Makefile.x68k,v 1.49 2000/12/29 15:18:37 minoura Exp $
 
 # Makefile for NetBSD
 #
@@ -41,19 +41,7 @@ X68K=	$S/arch/x68k
 HAVE_EGCS!=	${CC} --version | egrep "^(2\.8|egcs)" ; echo
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dx68k
-
-M68060!=	( echo '\#include "opt_m680x0.h"';	\
-		  echo '\#ifdef M68060';		\
-		  echo '1';				\
-		  echo '\#else';			\
-		  echo '0';				\
-		  echo '\#endif' )			\
-			| ${CPP} | sed -e '/^\#/d' -e '/^$$/d'
-.if ${M68060}
-CMACHFLAGS=	-m68020-60 -Wa,-m68030 -Wa,-m68851
-.else
-CMACHFLAGS=	-m68030
-.endif
+CMACHFLAGS?=	-m68020-60 -Wa,-m68030 -Wa,-m68851
 CWARNFLAGS?=	-Werror -Wstrict-prototypes -Wmissing-prototypes \
 		-Wpointer-arith
 # XXX Delete -Wuninitialized for now, since the compiler doesn't
diff --git a/sys/arch/x68k/conf/TOKOCHAN b/sys/arch/x68k/conf/TOKOCHAN
index 64f529a3d0b8..74f5bd35447e 100644
--- a/sys/arch/x68k/conf/TOKOCHAN
+++ b/sys/arch/x68k/conf/TOKOCHAN
@@ -1,4 +1,4 @@
-#	$NetBSD: TOKOCHAN,v 1.15 2000/09/24 15:59:39 jdolecek Exp $
+#	$NetBSD: TOKOCHAN,v 1.16 2000/12/29 15:18:38 minoura Exp $
 
 #
 #	TOKOCHAN -- Believe in the BSD power; Toko to issyo-ni make all!
@@ -6,7 +6,7 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident 		"TOKOCHAN-$Revision: 1.15 $"
+#ident 		"TOKOCHAN-$Revision: 1.16 $"
 
 maxusers	10
 
@@ -18,6 +18,10 @@ maxusers	10
 options 	M68030
 options 	M68040
 #options 	M68060
+## If you want an optimized kernel for a specific processor, use either:
+#makeoptions	CMACHFLAGS="-m68030"
+#makeoptions	CMACHFLAGS="-m68040 -Wa,-m68030 -Wa,-m68851"
+#makeoptions	CMACHFLAGS="-m68060 -Wa,-m68030 -Wa,-m68851"
 
 
 #### System options specific to the x68k port