diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS
index 3c0444607c6f..a3d826664957 100644
--- a/sys/arch/sun3/conf/DISKLESS
+++ b/sys/arch/sun3/conf/DISKLESS
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.44 2004/11/10 17:54:07 christos Exp $
+# $NetBSD: DISKLESS,v 1.45 2005/01/21 12:19:25 tsutsui Exp $
 
 # DISKLESS - Root and swap on NFS
 # Desktop machines only (3/50, 3/60, 3/110)
@@ -50,8 +50,8 @@ options 	USERCONF	# userconf(4) support
 #options 	COMPAT_12	# NetBSD 1.2
 options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
-options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_20	# NetBSD 2.0
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sun3/conf/DISKLESS3X b/sys/arch/sun3/conf/DISKLESS3X
index a22176c37c27..b9cf29ae0a19 100644
--- a/sys/arch/sun3/conf/DISKLESS3X
+++ b/sys/arch/sun3/conf/DISKLESS3X
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS3X,v 1.31 2004/11/10 17:54:07 christos Exp $
+# $NetBSD: DISKLESS3X,v 1.32 2005/01/21 12:19:25 tsutsui Exp $
 
 # DISKLESS - Root and swap on NFS
 # Desktop machines only (3/80)
@@ -50,8 +50,8 @@ options 	USERCONF	# userconf(4) support
 #options 	COMPAT_12	# NetBSD 1.2
 options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
-options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_20	# NetBSD 2.0
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sun3/conf/FOUR_TTYS b/sys/arch/sun3/conf/FOUR_TTYS
index f4a78bed9bff..0ec83fdcd15f 100644
--- a/sys/arch/sun3/conf/FOUR_TTYS
+++ b/sys/arch/sun3/conf/FOUR_TTYS
@@ -1,4 +1,4 @@
-#	$NetBSD: FOUR_TTYS,v 1.37 2004/11/10 17:54:07 christos Exp $
+#	$NetBSD: FOUR_TTYS,v 1.38 2005/01/21 12:19:25 tsutsui Exp $
 
 # FOUR_TTYS Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
 # like GENERIC but both zs chips are used as ttys
@@ -50,8 +50,8 @@ options 	COMPAT_11	# NetBSD 1.1
 options 	COMPAT_12	# NetBSD 1.2
 options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
-options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_20	# NetBSD 2.0
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 options 	EXEC_AOUT	# support for a.out executables
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index e582779d6055..64238bd36933 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.109 2005/01/17 15:28:52 cube Exp $
+# $NetBSD: GENERIC,v 1.110 2005/01/21 12:19:25 tsutsui Exp $
 #
 # GENERIC machine description file
 # 
@@ -25,7 +25,7 @@ include 	"arch/sun3/conf/std.sun3"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.109 $"
+#ident 		"GENERIC-$Revision: 1.110 $"
 
 # Machines to be supported by this kernel
 options 	FPU_EMULATE
@@ -81,8 +81,8 @@ options 	COMPAT_11	# NetBSD 1.1
 options 	COMPAT_12	# NetBSD 1.2
 options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
-options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_20	# NetBSD 2.0
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 options 	EXEC_AOUT	# support for a.out executables
diff --git a/sys/arch/sun3/conf/GENERIC3X b/sys/arch/sun3/conf/GENERIC3X
index 203f1ad841f0..db55c7e5947f 100644
--- a/sys/arch/sun3/conf/GENERIC3X
+++ b/sys/arch/sun3/conf/GENERIC3X
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.66 2005/01/17 15:28:52 cube Exp $
+# $NetBSD: GENERIC3X,v 1.67 2005/01/21 12:19:25 tsutsui Exp $
 
 # GENERIC Sun3X (3/80, 3/470)
 # Supports root on: ie0, le0, sd*, ...
@@ -61,8 +61,8 @@ options 	COMPAT_11	# NetBSD 1.1
 options 	COMPAT_12	# NetBSD 1.2
 options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
-options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_20	# NetBSD 2.0
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 options 	EXEC_AOUT	# support for a.out executables
diff --git a/sys/arch/sun3/conf/INSTALL b/sys/arch/sun3/conf/INSTALL
index e20c4de3cde6..6506a47eaec6 100644
--- a/sys/arch/sun3/conf/INSTALL
+++ b/sys/arch/sun3/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.24 2004/11/10 17:54:08 christos Exp $
+# $NetBSD: INSTALL,v 1.25 2005/01/21 12:19:25 tsutsui Exp $
 #
 # INSTALL - Installation kernel for the Sun3
 #
@@ -57,8 +57,8 @@ options 	MALLOC_NOINLINE		# Not inlining MALLOC saves memory
 #options 	COMPAT_12	# NetBSD 1.2
 options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
-options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_20	# NetBSD 2.0
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sun3/conf/INSTALL3X b/sys/arch/sun3/conf/INSTALL3X
index 42863aef0756..384dad2fb7cf 100644
--- a/sys/arch/sun3/conf/INSTALL3X
+++ b/sys/arch/sun3/conf/INSTALL3X
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL3X,v 1.22 2004/07/15 03:53:52 atatat Exp $
+# $NetBSD: INSTALL3X,v 1.23 2005/01/21 12:19:25 tsutsui Exp $
 #
 # INSTALL3X - Installation kernel for the Sun3X
 #
@@ -57,8 +57,8 @@ options 	MALLOC_NOINLINE		# Not inlining MALLOC saves memory
 #options 	COMPAT_12	# NetBSD 1.2
 options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
-options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_20	# NetBSD 2.0
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
diff --git a/sys/arch/sun3/conf/KGDB b/sys/arch/sun3/conf/KGDB
index 6404e4d14b14..5ced2ad0c4bd 100644
--- a/sys/arch/sun3/conf/KGDB
+++ b/sys/arch/sun3/conf/KGDB
@@ -1,4 +1,4 @@
-#	$NetBSD: KGDB,v 1.37 2004/11/10 17:54:08 christos Exp $
+#	$NetBSD: KGDB,v 1.38 2005/01/21 12:19:25 tsutsui Exp $
 
 # KGDB Sun3 (3/50, 3/60, 3/110, 3/160, 3/260, 3/E)
 # like GENERIC but supports gdb on other machine, i.e.:
@@ -53,8 +53,8 @@ options 	COMPAT_11	# NetBSD 1.1
 options 	COMPAT_12	# NetBSD 1.2
 options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
-options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_20	# NetBSD 2.0
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 options 	EXEC_AOUT	# support for a.out executables
diff --git a/sys/arch/sun3/conf/KGDB3X b/sys/arch/sun3/conf/KGDB3X
index 9112b9779486..80ad1af0f8c3 100644
--- a/sys/arch/sun3/conf/KGDB3X
+++ b/sys/arch/sun3/conf/KGDB3X
@@ -1,4 +1,4 @@
-# $NetBSD: KGDB3X,v 1.39 2004/11/10 17:54:08 christos Exp $
+# $NetBSD: KGDB3X,v 1.40 2005/01/21 12:19:25 tsutsui Exp $
 
 # KGDB3X Sun3X (3/80, 3/470)
 # like GENERIC but supports gdb on other machine, i.e.:
@@ -53,8 +53,8 @@ options 	COMPAT_11	# NetBSD 1.1
 options 	COMPAT_12	# NetBSD 1.2
 options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
-options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_20	# NetBSD 2.0
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 options 	EXEC_AOUT	# support for a.out executables