diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index f8a7db90..1696a0bb 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.22 1998/06/03 17:12:05 millert Exp $
+#	$OpenBSD: rc.conf,v 1.23 1998/06/15 18:41:14 deraadt Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for 'normal' use: routed_flags="-q"
@@ -34,6 +34,7 @@ portmap=YES		# almost always needed
 inetd=YES		# almost always needed
 lpd=NO			# printing daemons
 check_quotas=YES	# NO may be desireable in some YP environments
+sshd=YES		# run sshd if it exists
 
 # miscellaneous other flags
 # only used if the appropriate server is marked YES above
diff --git a/src/etc/rc.local b/src/etc/rc.local
index 18a912d9..8a87afc6 100644
--- a/src/etc/rc.local
+++ b/src/etc/rc.local
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.local,v 1.22 1998/04/07 16:32:55 deraadt Exp $
+#	$OpenBSD: rc.local,v 1.23 1998/06/15 18:41:12 deraadt Exp $
 
 # site-specific startup actions, daemons, and other things which
 # can be done AFTER your system goes into securemode.  For actions
@@ -10,7 +10,7 @@
 
 echo -n 'starting local daemons:'
 
-if [ -x /usr/local/sbin/sshd ]; then
+if [ X"${sshd}" == X"YES" -a -x /usr/local/sbin/sshd ]; then
 	echo -n ' sshd';	/usr/local/sbin/sshd
 	#echo -n ' sshd2022';	/usr/local/sbin/sshd -p 2022
 fi