diff --git a/openssh.changes b/openssh.changes
index 6581c76..9f24a62 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Aug 19 10:07:10 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
+
+- sshd-gen-keys-start:
+  - only source sysconfig file if it exists.
+  - create /etc/ssh if it does not exists.
+  Required for image based installation/updates.
+
 -------------------------------------------------------------------
 Mon Jul 19 14:51:08 UTC 2021 - Cristian Rodríguez <crrodriguez@opensuse.org>
 
diff --git a/sshd-gen-keys-start b/sshd-gen-keys-start
index b3f4f47..abc10df 100644
--- a/sshd-gen-keys-start
+++ b/sshd-gen-keys-start
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-. /etc/sysconfig/ssh
+test -f /etc/sysconfig/ssh && . /etc/sysconfig/ssh
 
 if [ "x$SSHD_AUTO_KEYGEN" != "xno" ]; then
     echo "Checking for missing server keys in /etc/ssh"
+    test -d /etc/ssh || mkdir -p /etc/ssh
     ssh-keygen -A
 fi