diff --git a/sys/arch/x68k/conf/ALL b/sys/arch/x68k/conf/ALL
index a40af29eb9ff..8bda8b3e5c84 100644
--- a/sys/arch/x68k/conf/ALL
+++ b/sys/arch/x68k/conf/ALL
@@ -1,4 +1,4 @@
-#	$NetBSD: ALL,v 1.38 2000/12/29 15:18:37 minoura Exp $
+#	$NetBSD: ALL,v 1.39 2001/05/02 13:15:24 minoura Exp $
 
 #
 #	ALL -- everything that's currently supported
@@ -6,7 +6,7 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident 		"ALL-$Revision: 1.38 $"
+#ident 		"ALL-$Revision: 1.39 $"
 
 maxusers	32
 
@@ -243,9 +243,9 @@ pseudo-device	bell			# OPM bell
 xcom0	at mainbus0			# NS16550 fast serial
 xcom1	at mainbus0
 
-## Audio device; broken
-#okiadpcm0 at intio0 addr 0xe92000 intr 106 errintr 107 dma 3
-#audio*	at okiadpcm*
+## Audio device
+vs0 at intio0 addr 0xe92000 dma 3 dmaintr 106
+audio*	at vs?
 
 ## Network interfaces
 neptune0 at intio0 addr 0xece000 intr 249	# Neptune-X
@@ -302,13 +302,15 @@ pseudo-device	ipfilter
 
 ## for IPv6
 pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
+pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
+pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 #### Other device configuration
 
 ## Pseudo ttys, required for network logins and programs like screen.
 
-pseudo-device	pty			# pseudo-ttys (for network, etc.)
+pseudo-device	pty			# pseudo-terminals
 
 ## Random device, used to implement /dev/random (a source of random noise),
 ## and generate randomness for some kernel formulae.
diff --git a/sys/arch/x68k/conf/GENERIC b/sys/arch/x68k/conf/GENERIC
index ec7dfef16109..fd4e78de1e37 100644
--- a/sys/arch/x68k/conf/GENERIC
+++ b/sys/arch/x68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.56 2001/03/10 03:23:09 minoura Exp $
+#	$NetBSD: GENERIC,v 1.57 2001/05/02 13:15:24 minoura Exp $
 
 #
 #	GENERIC
@@ -6,7 +6,7 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident 		"GENERIC-$Revision: 1.56 $"
+#ident 		"GENERIC-$Revision: 1.57 $"
 
 maxusers	8
 
@@ -243,9 +243,9 @@ pseudo-device	bell			# OPM bell
 xcom0	at mainbus0			# NS16550 fast serial
 xcom1	at mainbus0
 
-## Audio device; broken
-#okiadpcm0 at intio0 addr 0xe92000 intr 106 errintr 107 dma 3
-#audio*	at okiadpcm*
+## Audio device
+vs0 at intio0 addr 0xe92000 dma 3 dmaintr 106
+audio*	at vs?
 
 ## Network interfaces
 neptune0 at intio0 addr 0xece000 intr 249	# Neptune-X
diff --git a/sys/arch/x68k/conf/INSTALL b/sys/arch/x68k/conf/INSTALL
index 3da21b732aab..542611bcb68b 100644
--- a/sys/arch/x68k/conf/INSTALL
+++ b/sys/arch/x68k/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.38 2001/03/10 03:23:10 minoura Exp $
+#	$NetBSD: INSTALL,v 1.39 2001/05/02 13:15:24 minoura Exp $
 
 #
 #	INSTALL -- installation kernel.
@@ -6,7 +6,7 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident 		"INSTALL-$Revision: 1.38 $"
+#ident 		"INSTALL-$Revision: 1.39 $"
 
 makeoptions     COPTS="-Os"             # Optimise for space. Implies -O2
 
@@ -148,7 +148,7 @@ options 	RTC_OFFSET=-540	# hardware clock is this many mins. west of GMT
 #options 	COMPAT_LINUX	# Linux/m68k binary compatibility
 #options 	EXEC_ELF32	# 32-bit ELF executables (Linux, SVR4)
 
-# File systems
+## File systems
 file-system	FFS		# Berkeley Fast Filesystem
 file-system	NFS		# Sun NFS-compatible filesystem client
 #file-system	KERNFS		# kernel data-structure filesystem
@@ -165,7 +165,7 @@ file-system	CD9660		# ISO 9660 + Rock Ridge file system
 file-system	MSDOSFS		# MS-DOS FAT filesystem(s).
 #file-system 	ADOSFS		# AmigaDOS filesystem
 
-# Filesystem options
+# File system options.
 #options 	NFSSERVER	# Sun NFS-compatible filesystem server
 #options 	QUOTA		# FFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
@@ -254,9 +254,9 @@ pseudo-device	sram			# battery-backuped static RAM
 #xcom0	at mainbus0			# NS16550 fast serial
 #xcom1	at mainbus0
 
-## Audio device; broken
-#okiadpcm0 at intio0 addr 0xe92000 intr 106 errintr 107 dma 3
-#audio*	at okiadpcm*
+## Audio device
+#vs0 at intio0 addr 0xe92000 dma 3 dmaintr 106
+#audio*	at vs?
 
 ## Network interfaces
 neptune0 at intio0 addr 0xece000 intr 249	# Neptune-X
diff --git a/sys/arch/x68k/conf/TOKOCHAN b/sys/arch/x68k/conf/TOKOCHAN
index 74f5bd35447e..0a136f81679f 100644
--- a/sys/arch/x68k/conf/TOKOCHAN
+++ b/sys/arch/x68k/conf/TOKOCHAN
@@ -1,4 +1,4 @@
-#	$NetBSD: TOKOCHAN,v 1.16 2000/12/29 15:18:38 minoura Exp $
+#	$NetBSD: TOKOCHAN,v 1.17 2001/05/02 13:15:24 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.16 $"
+#ident 		"TOKOCHAN-$Revision: 1.17 $"
 
 maxusers	10
 
@@ -152,7 +152,7 @@ file-system	LFS		# Log-structured filesystem (experimental)
 #file-system	PORTAL		# portal filesystem (experimental)
 file-system	PROCFS		# /proc
 file-system	CD9660		# ISO 9660 + Rock Ridge file system
-#file-system	UNION		# union file system
+#file-system	UNION		# union file system (a little buggy)
 file-system	MSDOSFS		# MS-DOS FAT filesystem(s).
 #file-system 	ADOSFS		# AmigaDOS filesystem
 
@@ -246,9 +246,9 @@ pseudo-device	bell			# OPM bell
 #xcom0	at mainbus0			# NS16550 fast serial
 #xcom1	at mainbus0
 
-## Audio device; broken
-#okiadpcm0 at intio0 addr 0xe92000 intr 106 errintr 107 dma 3
-#audio*	at okiadpcm*
+## Audio device
+vs0 at intio0 addr 0xe92000 dma 3 dmaintr 106
+audio*	at vs?
 
 ## Network interfaces
 neptune0 at intio0 addr 0xece000 intr 249	# Neptune-X
@@ -306,12 +306,14 @@ pseudo-device	ipfilter
 ## for IPv6
 #pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
+#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 #### Other device configuration
 
 ## Pseudo ttys, required for network logins and programs like screen.
 
-pseudo-device	pty			# pseudo-ttys (for network, etc.)
+pseudo-device	pty			# pseudo-terminals
 
 ## Random device, used to implement /dev/random (a source of random noise),
 ## and generate randomness for some kernel formulae.