diff --git a/share/sushi/system/Makefile b/share/sushi/system/Makefile
index 73ff3ef60e0b..529cf12569a9 100644
--- a/share/sushi/system/Makefile
+++ b/share/sushi/system/Makefile
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2001/03/11 06:36:38 garbled Exp $
+#	$NetBSD: Makefile,v 1.4 2001/04/26 02:44:46 garbled Exp $
 
 SUBDIR= rcconf dailyconf weeklyconf securityconf inetdconf mailerconf
-SUBDIR+= usermgmtconf
+SUBDIR+= usermgmtconf sysctl
 
 FILES=	index help
 FILESDIR=${BINDIR}/sushi/system
diff --git a/share/sushi/system/help b/share/sushi/system/help
index fba0aaf2900b..3e47731c68fb 100644
--- a/share/sushi/system/help
+++ b/share/sushi/system/help
@@ -26,4 +26,8 @@ Security.conf is the configuration for the security verification script that
 is optionally executed by the daily cronjob.  You may configure which 
 security verifications are run on a daily basis by editing this file.
 
-$NetBSD: help,v 1.1 2001/03/06 21:48:08 garbled Exp $
+The sysctl menu allows you to both change current kernel settings, and
+cause them to be automatically set on reboot using the /etc/sysctl.conf
+file. 
+
+$NetBSD: help,v 1.2 2001/04/26 02:44:47 garbled Exp $
diff --git a/share/sushi/system/index b/share/sushi/system/index
index 5483bf585e08..f6e8b6511380 100644
--- a/share/sushi/system/index
+++ b/share/sushi/system/index
@@ -1,4 +1,4 @@
-# $NetBSD: index,v 1.2 2001/03/06 21:48:08 garbled Exp $
+# $NetBSD: index,v 1.3 2001/04/26 02:44:47 garbled Exp $
 rcconf		rcconf		Edit startup configuration
 inetdconf	inetdconf	Edit inetd.conf
 mailerconf	mailerconf	Change your default mailer (mailer.conf)
@@ -6,3 +6,4 @@ usermgmtconf	usermgmtconf	Edit usermgmt.conf
 dailyconf	dailyconf	Edit daily.conf
 weeklyconf	weeklyconf	Edit weekly.conf
 securityconf	securityconf	Edit security.conf
+sysctl		sysctl		Edit NetBSD kernel parameters (sysctls)
diff --git a/share/sushi/system/sysctl/Makefile b/share/sushi/system/sysctl/Makefile
new file mode 100644
index 000000000000..55e45582614b
--- /dev/null
+++ b/share/sushi/system/sysctl/Makefile
@@ -0,0 +1,10 @@
+#	$NetBSD: Makefile,v 1.1 2001/04/26 02:44:47 garbled Exp $
+
+FILES=	form preform help sysctls
+FILESDIR=${BINDIR}/sushi/system/sysctl
+SCRIPTS= script script1 script2
+SCRIPTSDIR=${BINDIR}/sushi/system/sysctl
+MKOBJ=	no
+
+.include "../../../Makefile.inc"
+.include <bsd.prog.mk>
diff --git a/share/sushi/system/sysctl/form b/share/sushi/system/sysctl/form
new file mode 100644
index 000000000000..c5b8634a6d57
--- /dev/null
+++ b/share/sushi/system/sysctl/form
@@ -0,0 +1,4 @@
+#$NetBSD: form,v 1.1 2001/04/26 02:44:47 garbled Exp $
+noedit:@@@1@@@			Sysctl name
+escript:18,script2,@@@1@@@	Sysctl value
+list:both,now,boot		Modify at boot time, now, or both?
diff --git a/share/sushi/system/sysctl/help b/share/sushi/system/sysctl/help
new file mode 100644
index 000000000000..aadf3e97600e
--- /dev/null
+++ b/share/sushi/system/sysctl/help
@@ -0,0 +1,6 @@
+Using this form you may edit any number of tunable kernel parameters supplied
+in NetBSD.  More information on what these values mean can be found in
+the sysctl(8) and sysctl(3) manpages.  It is reccomended that you understand
+what it is that you are tuning, before you fiddle with these values.
+
+$NetBSD: help,v 1.1 2001/04/26 02:44:47 garbled Exp $
diff --git a/share/sushi/system/sysctl/preform b/share/sushi/system/sysctl/preform
new file mode 100644
index 000000000000..183052144277
--- /dev/null
+++ b/share/sushi/system/sysctl/preform
@@ -0,0 +1,2 @@
+# $NetBSD: preform,v 1.1 2001/04/26 02:44:47 garbled Exp $
+script:script1		Which sysctl would you like to edit?
diff --git a/share/sushi/system/sysctl/script b/share/sushi/system/sysctl/script
new file mode 100755
index 000000000000..05129dc862c1
--- /dev/null
+++ b/share/sushi/system/sysctl/script
@@ -0,0 +1,13 @@
+#!/bin/sh
+# $NetBSD: script,v 1.1 2001/04/26 02:44:47 garbled Exp $
+
+if [ "$3" = "now" -o "$3" = "both" ]; then
+	sysctl -w $1=$2
+fi
+
+if [ "$3" = "boot" -o "$3" = "both" ]; then
+	IFS=" "
+	CONF=`cat /etc/sysctl.conf`
+	echo $CONF | grep -v $1 > /etc/sysctl.conf
+	echo "$1=$2" >>/etc/sysctl.conf
+fi
diff --git a/share/sushi/system/sysctl/script1 b/share/sushi/system/sysctl/script1
new file mode 100755
index 000000000000..dd39bd4a1edd
--- /dev/null
+++ b/share/sushi/system/sysctl/script1
@@ -0,0 +1,4 @@
+#!/bin/sh
+# $NetBSD: script1,v 1.1 2001/04/26 02:44:47 garbled Exp $
+
+tail +2 /usr/share/sushi/system/sysctl/sysctls
diff --git a/share/sushi/system/sysctl/script2 b/share/sushi/system/sysctl/script2
new file mode 100755
index 000000000000..9e6b64b4451f
--- /dev/null
+++ b/share/sushi/system/sysctl/script2
@@ -0,0 +1,4 @@
+#!/bin/sh
+# $NetBSD: script2,v 1.1 2001/04/26 02:44:47 garbled Exp $
+
+sysctl -n $1
diff --git a/share/sushi/system/sysctl/sysctls b/share/sushi/system/sysctl/sysctls
new file mode 100644
index 000000000000..1471d49e1d9f
--- /dev/null
+++ b/share/sushi/system/sysctl/sysctls
@@ -0,0 +1,118 @@
+$NetBSD: sysctls,v 1.1 2001/04/26 02:44:48 garbled Exp $
+ddb.fromconsole
+ddb.lines
+ddb.maxoff
+ddb.maxwidth
+ddb.onpanic
+ddb.radix
+ddb.tabstops
+kern.autonicetime
+kern.autoniceval
+kern.defcorename
+kern.hostid
+kern.hostname
+kern.logsigexit
+kern.maxfiles
+kern.maxproc
+kern.maxvnodes
+kern.mbuf.mblowat
+kern.mbuf.mcllowat
+kern.mbuf.nmbclusters
+kern.securelevel
+net.inet.icmp.errppslimit
+net.inet.icmp.maskrepl
+net.inet.ip.allowsrcrt
+net.inet.ip.anonportmax
+net.inet.ip.anonportmin
+net.inet.ip.directed-broadcast
+net.inet.ip.forwarding
+net.inet.ip.forwsrcrt
+net.inet.ip.lowportmax
+net.inet.ip.lowportmin
+net.inet.ip.mtudisc
+net.inet.ip.mtudisctimeout
+net.inet.ip.redirect
+net.inet.ip.subnetsarelocal
+net.inet.ip.ttl
+net.inet.ipsec.ah_cleartos
+net.inet.ipsec.ah_net_deflev
+net.inet.ipsec.ah_offsetmask
+net.inet.ipsec.ah_trans_deflev
+net.inet.ipsec.def_policy
+net.inet.ipsec.dfbit
+net.inet.ipsec.ecn
+net.inet.ipsec.esp_net_deflev
+net.inet.ipsec.esp_trans_deflev
+net.inet.ipsec.inbound_call_ike
+net.inet.tcp.ack_on_push
+net.inet.tcp.compat_42
+net.inet.tcp.cwm
+net.inet.tcp.cwm_burstsize
+net.inet.tcp.init_win
+net.inet.tcp.init_win
+net.inet.tcp.keepcnt
+net.inet.tcp.keepidle
+net.inet.tcp.keepintvl
+net.inet.tcp.log_refused
+net.inet.tcp.mss_ifmtu
+net.inet.tcp.mssdflt
+net.inet.tcp.recvspace
+net.inet.tcp.rfc1323
+net.inet.tcp.rstppslimit
+net.inet.tcp.sack
+net.inet.tcp.sendspace
+net.inet.tcp.syn_bucket_limit
+net.inet.tcp.syn_cache_interval
+net.inet.tcp.syn_cache_limit
+net.inet.tcp.timestamps
+net.inet.tcp.win_scale
+net.inet.udp.checksum
+net.inet.udp.recvspace
+net.inet.udp.sendspace
+net.inet6.icmp6.errppslimit
+net.inet6.icmp6.nd6_delay
+net.inet6.icmp6.nd6_maxnudhint
+net.inet6.icmp6.nd6_mmaxtries
+net.inet6.icmp6.nd6_prune
+net.inet6.icmp6.nd6_umaxtries
+net.inet6.icmp6.nd6_useloopback
+net.inet6.icmp6.nodeinfo
+net.inet6.icmp6.rediraccept
+net.inet6.icmp6.redirtimeout
+net.inet6.ip6.accept_rtadv
+net.inet6.ip6.anonportmax
+net.inet6.ip6.anonportmin
+net.inet6.ip6.auto_flowlabel
+net.inet6.ip6.bindv6only
+net.inet6.ip6.dad_count
+net.inet6.ip6.defmcasthlim
+net.inet6.ip6.forwarding
+net.inet6.ip6.gif_hlim
+net.inet6.ip6.hdrnestlimit
+net.inet6.ip6.hlim
+net.inet6.ip6.keepfaith
+net.inet6.ip6.log_interval
+net.inet6.ip6.lowportmax
+net.inet6.ip6.lowportmin
+net.inet6.ip6.maxfragpackets
+net.inet6.ip6.redirect
+net.inet6.ip6.rr_prune
+net.inet6.ip6.use_deprecated
+net.inet6.ipsec6.ah_net_deflev
+net.inet6.ipsec6.ah_trans_deflev
+net.inet6.ipsec6.def_policy
+net.inet6.ipsec6.ecn
+net.inet6.ipsec6.esp_net_deflev
+net.inet6.ipsec6.esp_trans_deflev
+net.inet6.ipsec6.inbound_call_ike
+net.inet6.udp6.recvspace
+net.inet6.udp6.sendspace
+net.key.acq_exp_int
+net.key.acq_maxtime
+net.key.debug
+net.key.kill_int
+net.key.random_int
+net.key.spi_max_value
+net.key.spi_min_value
+net.key.spi_try
+vfs.generic.usermount