diff --git a/kbd-1.15.5-loadkeys-search-path.patch b/kbd-1.15.5-loadkeys-search-path.patch
index 7bb5edf..e6565a8 100644
--- a/kbd-1.15.5-loadkeys-search-path.patch
+++ b/kbd-1.15.5-loadkeys-search-path.patch
@@ -7,7 +7,7 @@ Index: kbd-2.2.0/src/loadkeys.c
  #include "keymap.h"
  
 -static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
-+static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0 };
++static const char *const dirpath1[] = { "", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
  static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
  
  static void __attribute__((noreturn))
diff --git a/kbd.changes b/kbd.changes
index 3fd4cf5..b05d70c 100644
--- a/kbd.changes
+++ b/kbd.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Sep 17 22:43:16 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>
+
+- Make kbdsettings working in both bash and dash (boo#1175040).
+
+-------------------------------------------------------------------
+Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>
+
+- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps
+  (boo#1176302).
+
 -------------------------------------------------------------------
 Thu Aug 20 11:34:32 UTC 2020 - Jiri Slaby <jslaby@suse.com>
 
diff --git a/kbdsettings b/kbdsettings
index 5b944af..33736ac 100644
--- a/kbdsettings
+++ b/kbdsettings
@@ -7,11 +7,12 @@
 
 for i in NUM SCR CAPS; do
 	conf=$(eval echo KBD_${i}LOCK)
-	[ -z ${!conf} ] && continue
-	param=$(echo ${i,,} | sed 's/scr/scroll/')
+	eval confval=\"\$$conf\"
+	[ -z "$confval" ] && continue
+	param=$(echo $i | tr A-Z a-z | sed 's/scr/scroll/')
 
 	for tty in ${KBD_TTY:-tty1 tty2 tty3 tty4 tty5 tty6}; do
-		case "${!conf}" in
+		case "$confval" in
 		yes)
 			if [ $param = "num" ]; then
 				touch /run/numlock-on
@@ -35,11 +36,11 @@ for i in NUM SCR CAPS; do
 					/usr/bin/setleds -D -$param < /dev/$tty
 				fi
 			else
-				echo "Value ${!conf} invalid for $conf"
+				echo "Value $confval invalid for $conf"
 			fi
 			;;
 		*)
-			echo "error: unknown value ${!conf} in $conf"
+			echo "error: unknown value $confval in $conf"
 			;;
 		esac
 	done