diff --git a/src/etc/rc b/src/etc/rc
index da5a2eee..3d8333ae 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.113 1999/09/27 23:41:18 deraadt Exp $
+#	$OpenBSD: rc,v 1.114 1999/09/28 07:20:01 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -375,6 +375,16 @@ if [ -f /var/account/acct ]; then
 	echo 'turning on accounting';	accton /var/account/acct
 fi
 
+if [ ! -f /etc/ssh_host_key ]; then
+	umask 022
+	echo -n "ssh-keygen: generating new host key... "
+	if /usr/bin/ssh-keygen -q -b 1024 -f /etc/ssh_host_key -N ''; then
+		echo done.
+	else
+		echo failed.
+	fi
+fi
+
 echo -n starting network daemons:
 
 # $gated and $routed_flags are imported from /etc/rc.conf.
@@ -468,6 +478,11 @@ if [ "X${mopd_flags}" != X"NO" -a -d /tftpboot/mop ]; then
 	echo -n ' mopd';		mopd ${mopd_flags}
 fi
 
+if [ X"${sshd}" == X"YES" -a -x /usr/sbin/sshd ]; then
+	echo -n ' sshd';	/usr/sbin/sshd
+	#echo -n ' sshd2022';	/usr/sbin/sshd -p 2022
+fi
+
 if [ -x /usr/sbin/screenblank ]; then
 	echo -n ' screenblank';	/usr/sbin/screenblank
 fi