diff --git a/src/etc/rc b/src/etc/rc
index 158652ce..8ae6e975 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.118 1999/10/06 04:41:46 millert Exp $
+#	$OpenBSD: rc,v 1.119 1999/10/07 04:41:07 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -490,8 +490,13 @@ if [ "X${mopd_flags}" != X"NO" -a -d /tftpboot/mop ]; then
 fi
 
 if [ X"${sshd}" == X"YES" -a -x /usr/sbin/sshd ]; then
-	echo -n ' sshd';	/usr/sbin/sshd
-	#echo -n ' sshd(2022)';	/usr/sbin/sshd -p 2022
+	if /usr/sbin/sshd -Q ; then
+		echo -n ' sshd';
+		#echo -n ' sshd(2022)';	/usr/sbin/sshd -p 2022
+	elif [ -f /usr/local/sbin/sshd ]; then
+		/usr/local/sbin/sshd
+		echo -n ' sshd';
+	fi
 fi
 
 echo '.'