e000e8
diff -up kbd-2.0.4/src/loadkeys.c.orig kbd-2.0.4/src/loadkeys.c
e000e8
--- kbd-2.0.4/src/loadkeys.c.orig	2017-01-11 11:14:48.308093019 +0100
e000e8
+++ kbd-2.0.4/src/loadkeys.c	2017-01-11 11:15:18.018106020 +0100
e000e8
@@ -27,7 +27,7 @@
e000e8
 #include "keymap.h"
e000e8
 
e000e8
 static const char *progname         = NULL;
e000e8
-static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
e000e8
+static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0 };
e000e8
 static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
e000e8
 
e000e8
 static void __attribute__((noreturn))
e000e8
diff -up kbd-2.0.4/src/paths.h.orig kbd-2.0.4/src/paths.h
e000e8
--- kbd-2.0.4/src/paths.h.orig	2017-01-11 11:15:40.404115812 +0100
e000e8
+++ kbd-2.0.4/src/paths.h	2017-01-11 11:15:59.730124274 +0100
e000e8
@@ -5,6 +5,8 @@
e000e8
  * The following five subdirectories are defined:
e000e8
  */
e000e8
 #define KEYMAPDIR "keymaps"
e000e8
+#define XKBKEYMAPDIR "keymaps/xkb"
e000e8
+#define LEGACYKEYMAPDIR "keymaps/legacy"
e000e8
 #define UNIMAPDIR "unimaps"
e000e8
 #define TRANSDIR "consoletrans"
e000e8
 #define VIDEOMODEDIR "videomodes"