diff --git a/sys/arch/sparc/conf/MRCOFFEE b/sys/arch/sparc/conf/MRCOFFEE
index b4c37e14f1a1..25f1cf51aa52 100644
--- a/sys/arch/sparc/conf/MRCOFFEE
+++ b/sys/arch/sparc/conf/MRCOFFEE
@@ -1,5 +1,5 @@
-# $NetBSD: MRCOFFEE,v 1.19 2006/09/27 21:42:06 manu Exp $
-# From: NetBSD: GENERIC,v 1.160 2004/07/10 12:05:35 uwe Exp
+# $NetBSD: MRCOFFEE,v 1.20 2007/05/12 22:44:45 uwe Exp $
+# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
 #
 # Mr.Coffee (JavaStation 1) machine description file
 #
@@ -12,7 +12,7 @@ include 	"arch/sparc/conf/std.sparc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"MRCOFFEE-$Revision: 1.19 $"
+#ident 		"MRCOFFEE-$Revision: 1.20 $"
 
 maxusers	32
 
@@ -179,12 +179,15 @@ file-system	PROCFS		# /proc
 #file-system	MSDOSFS		# MS-DOS FAT filesystem(s).
 #file-system	CODA		# Coda File System; also needs vcoda (below)
 file-system	PTYFS		# /dev/pts/N support
+#file-system	TMPFS		# Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 ## File system options.
 #options 	NFSSERVER	# Sun NFS-compatible filesystem server
 #options 	QUOTA		# FFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
 #options 	SOFTDEP		# FFS soft updates support.
+#options	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
 options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 
 ## Network protocol support.  In most environments, INET is required.
@@ -257,7 +260,7 @@ ms0	at pckbc0
 ## miniroot images, etc.
 
 #pseudo-device	vnd	
-
+#options 	VND_COMPRESSION		# compressed vnd(4)
 
 #### Network interfaces
 
@@ -281,6 +284,7 @@ pseudo-device	loop
 ## Network "tunnel" device, allowing protocol stacks to run in the userland.
 ## This is used by the third-party user-mode "ppp" program, and others.
 #pseudo-device	tun		
+#pseudo-device	tap			# virtual Ethernet
 
 ## Generic L3 over IP tunnel
 #pseudo-device	gre			# generic L3 over IP tunnel
@@ -289,6 +293,8 @@ pseudo-device	loop
 ## interface that allows selective examining of incoming packets.
 pseudo-device	bpfilter
 
+#pseudo-device	carp			# Common Address Redundancy Protocol
+
 ## IP Filter, used in firewall and NAT applications.  See ipnat(8) for
 ## one example of the use of the IP Filter.
 #pseudo-device	ipfilter