diff --git a/kbd.changes b/kbd.changes
index c8c8bec..1051d32 100644
--- a/kbd.changes
+++ b/kbd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 23 12:03:51 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
+
+- Only run kbdsettings.service if /etc/sysconfig/keyboard exists.
+  Necessary for image based installations without admin made changes.
+
 -------------------------------------------------------------------
 Wed Jun  2 08:08:53 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kbd.spec b/kbd.spec
index dc25b9f..dd30904 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kbd
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -82,7 +82,7 @@ BuildRequires:  xz
 # Temporarily require -legacy
 Requires:       %{name}-legacy = %{version}-%{release}
 Requires(post): coreutils
-Requires(postun): coreutils
+Requires(postun):coreutils
 Requires(pre):  %fillup_prereq
 Provides:       vlock = 2.2.3
 Obsoletes:      vlock <= 2.2.3
diff --git a/kbdsettings.service b/kbdsettings.service
index c40d8c0..7c5c947 100644
--- a/kbdsettings.service
+++ b/kbdsettings.service
@@ -3,6 +3,7 @@ Description=Apply settings from /etc/sysconfig/keyboard
 After=basic.target
 After=systemd-vconsole-setup.service
 PartOf=systemd-vconsole-setup.service
+ConditionPathExists=/etc/sysconfig/keyboard
 ConditionPathExists=/dev/tty0
 
 [Service]