diff --git a/share/sushi/system/rcconf/Makefile b/share/sushi/system/rcconf/Makefile
index 5d58d230eb09..d10bedd79e2e 100644
--- a/share/sushi/system/rcconf/Makefile
+++ b/share/sushi/system/rcconf/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.2 2001/12/12 01:49:30 tv Exp $
+#	$NetBSD: Makefile,v 1.3 2004/03/24 18:47:08 garbled Exp $
 
 FILES=	form
 FILESDIR=${BINDIR}/sushi/system/rcconf
-SCRIPTS= script script1 script2 script3
+SCRIPTS= script script1 script2 script3 script4
 SCRIPTSDIR=${BINDIR}/sushi/system/rcconf
 NOOBJ=	# defined
 
diff --git a/share/sushi/system/rcconf/form b/share/sushi/system/rcconf/form
index da8967a72fe2..12c56c935f4f 100644
--- a/share/sushi/system/rcconf/form
+++ b/share/sushi/system/rcconf/form
@@ -1,4 +1,4 @@
-# $NetBSD: form,v 1.10 2004/03/09 21:36:37 garbled Exp $
+# $NetBSD: form,v 1.11 2004/03/24 18:47:08 garbled Exp $
 escript:30,script2,rc_rcorder_flags	Flags to rcorder at boot
 script:script1,do_rcshutdown	Run /etc/rc.shutdown?
 escript:30,script2,rcshutdown_rcorder_flags	Flags to rcorder at shutdown
@@ -42,7 +42,7 @@ escript:30,script2,dhclient_flags	Flags for DHCP, if blank, config all interface
 script:script1,ntpdate		Run ntpdate at boot?
 escript:30,script2,ntpdate_flags	Flags for ntpdate.
 escript:30,script2,ppp_peers	/etc/ppp/peers to call
-list:host,autohost,router	IPv6 mode
+script:script4	IPv6 mode
 script:script1,ip6sitelocal	IPv6 sitelocal addresses
 script:script1,rtsol		IPv6 autoconfig on non routers
 escript:30,script2,rtsol_flags	Flags to pass to rtsol
diff --git a/share/sushi/system/rcconf/script4 b/share/sushi/system/rcconf/script4
new file mode 100755
index 000000000000..8d426ac0afb8
--- /dev/null
+++ b/share/sushi/system/rcconf/script4
@@ -0,0 +1,17 @@
+#!/bin/sh
+# $NetBSD: script4,v 1.1 2004/03/24 18:47:08 garbled Exp $
+. /etc/rc.conf
+
+if [ -z "$ip6mode" ]; then
+	ip6mode=host
+fi
+
+
+echo "$ip6mode"
+MODES="host autohost router"
+for n in $MODES;
+do
+	if [ "$n" != "$ip6mode" ]; then
+		echo $n
+	fi
+done