diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/sshd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/sshd.conf
index 588f3da3..1af2c8a9 100644
--- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/sshd.conf
+++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/sshd.conf
@@ -1,2 +1,2 @@
-task [S] /usr/bin/ssh-genhostkeys --
+task    [S]       <pid/syslogd> /usr/bin/ssh-genhostkeys -- Verifying SSH host keys
 service [2345789] <usr/ssh-hostkeys> env:-/etc/default/sshd /usr/sbin/sshd -D $SSHD_OPTS -- OpenSSH daemon
diff --git a/package/skeleton-init-finit/skeleton/usr/bin/ssh-genhostkeys b/package/skeleton-init-finit/skeleton/usr/bin/ssh-genhostkeys
index fb4fa906..ca73075b 100755
--- a/package/skeleton-init-finit/skeleton/usr/bin/ssh-genhostkeys
+++ b/package/skeleton-init-finit/skeleton/usr/bin/ssh-genhostkeys
@@ -1,15 +1,47 @@
 #!/bin/sh
+tmp=$(mktemp)
+dir=$(dirname $(grep -r '^HostKey' /etc/ssh/* |tail -1 | awk '{print $2}'))
 
-if sshd -t; then
+log()
+{
+    logger -sik -p security.notice -t sshd "$@"
+}
+warn()
+{
+    logger -sik -p security.warning -t sshd "$@"
+}
+err()
+{
+    logger -sik -p security.err -t sshd "$@"
+}
+
+check()
+{
+    if sshd -t >$tmp 2>&1; then
+	log "SSH hostkeys OK, setting ssh-hostkeys condition"
 	initctl cond set ssh-hostkeys
-	exit 0
+	return 0
+    fi
+    return 1
+}
+
+rc=0
+if ! check; then
+    files=$(awk '/invalid format/{print $6}' "$tmp" | sed 's/.*"\(.*\)".*/\1/')
+    for file in $files; do
+	warn "Removing $file: invalid format"
+	rm "$file"
+    done
+
+    log "Generating SSH hostkeys ..."
+    if ssh-keygen -A; then
+	mv /etc/ssh/ssh_host_* "$dir/"
+    fi
+    if ! check; then
+	err "Failed generating SSH hostkeys!"
+	rc=1
+    fi
 fi
 
-if sshd -t 2>&1 |grep hostkeys; then
-	ssh-keygen -A
-	initctl cond set ssh-hostkeys
-else
-	logger -t sshd "invadlid sshd_config, check with: sshd -t"
-fi
-
-exit 0
+rm "$tmp"
+exit $rc