--- elwix/config/etc/default/rc.d/022.sshd.run	2011/07/05 23:43:00	1.1
+++ elwix/config/etc/default/rc.d/022.sshd.run	2014/09/15 19:06:45	1.4
@@ -31,8 +31,24 @@ sshd_keygen()
 		echo "Generating SSH version 2 RSA key ..." 
 		/usr/bin/ssh-keygen -t rsa -f ${CONFDIR}/ssh_host_rsa_key -N '' 1>/dev/null 2>&1
 	fi
+
+	if [ -f ${CONFDIR}/ssh_host_ecdsa_key ]; then
+		echo "You already have an ECDSA host key in ${CONFDIR}/ssh_host_ecdsa_key"
+		echo "Skipping protocol version 2 ECDSA Key Generation"
+	else
+		/usr/bin/ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N ''
+	fi
+
+	if [ -f ${CONFDIR}/ssh_host_ed25519_key ]; then
+		echo "You already have an ed25519 host key in ${CONFDIR}/ssh_host_ed25519_key"
+		echo "Skipping protocol version 2 ed25519 Key Generation"
+	else
+		/usr/bin/ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N ''
+	fi
 	)
 }
+
+[ ! -x /usr/sbin/sshd ] && exit
 
 if [ ! -f /etc/ssh/ssh_host_key -o \
 		! -f /etc/ssh/ssh_host_dsa_key -o \