diff --git a/Makefile.am b/Makefile.am
index 34e3982de4..d13963f71a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1809,64 +1809,64 @@ CLEANFILES += \
 
 udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
-	src/udev/keymap/keymaps/acer \
-	src/udev/keymap/keymaps/acer-aspire_5720 \
-	src/udev/keymap/keymaps/acer-aspire_8930 \
-	src/udev/keymap/keymaps/acer-aspire_5920g \
-	src/udev/keymap/keymaps/acer-aspire_6920 \
-	src/udev/keymap/keymaps/acer-travelmate_c300 \
-	src/udev/keymap/keymaps/asus \
-	src/udev/keymap/keymaps/compaq-e_evo \
-	src/udev/keymap/keymaps/dell \
-	src/udev/keymap/keymaps/dell-latitude-xt2 \
-	src/udev/keymap/keymaps/everex-xt5000 \
-	src/udev/keymap/keymaps/fujitsu-amilo_li_2732 \
-	src/udev/keymap/keymaps/fujitsu-amilo_pa_2548 \
-	src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
-	src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205 \
-	src/udev/keymap/keymaps/fujitsu-amilo_si_1520 \
-	src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
-	src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
-	src/udev/keymap/keymaps/genius-slimstar-320 \
-	src/udev/keymap/keymaps/hewlett-packard \
-	src/udev/keymap/keymaps/hewlett-packard-2510p_2530p \
-	src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook \
-	src/udev/keymap/keymaps/hewlett-packard-pavilion \
-	src/udev/keymap/keymaps/hewlett-packard-presario-2100 \
-	src/udev/keymap/keymaps/hewlett-packard-tablet \
-	src/udev/keymap/keymaps/hewlett-packard-tx2 \
-	src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
-	src/udev/keymap/keymaps/inventec-symphony_6.0_7.0 \
-	src/udev/keymap/keymaps/lenovo-3000 \
-	src/udev/keymap/keymaps/lenovo-ideapad \
-	src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
-	src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet \
-	src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet \
-	src/udev/keymap/keymaps/lg-x110 \
-	src/udev/keymap/keymaps/logitech-wave \
-	src/udev/keymap/keymaps/logitech-wave-cordless \
-	src/udev/keymap/keymaps/logitech-wave-pro-cordless \
-	src/udev/keymap/keymaps/maxdata-pro_7000 \
-	src/udev/keymap/keymaps/medion-fid2060 \
-	src/udev/keymap/keymaps/medionnb-a555 \
-	src/udev/keymap/keymaps/micro-star \
-	src/udev/keymap/keymaps/module-asus-w3j \
-	src/udev/keymap/keymaps/module-ibm \
-	src/udev/keymap/keymaps/module-lenovo \
-	src/udev/keymap/keymaps/module-sony \
-	src/udev/keymap/keymaps/module-sony-old \
-	src/udev/keymap/keymaps/module-sony-vgn \
-	src/udev/keymap/keymaps/olpc-xo \
-	src/udev/keymap/keymaps/onkyo \
-	src/udev/keymap/keymaps/oqo-model2 \
-	src/udev/keymap/keymaps/samsung-other \
-	src/udev/keymap/keymaps/samsung-90x3a \
-	src/udev/keymap/keymaps/samsung-sq1us \
-	src/udev/keymap/keymaps/samsung-sx20s \
-	src/udev/keymap/keymaps/toshiba-satellite_a100 \
-	src/udev/keymap/keymaps/toshiba-satellite_a110 \
-	src/udev/keymap/keymaps/toshiba-satellite_m30x \
-	src/udev/keymap/keymaps/zepto-znote
+	keymaps/acer \
+	keymaps/acer-aspire_5720 \
+	keymaps/acer-aspire_8930 \
+	keymaps/acer-aspire_5920g \
+	keymaps/acer-aspire_6920 \
+	keymaps/acer-travelmate_c300 \
+	keymaps/asus \
+	keymaps/compaq-e_evo \
+	keymaps/dell \
+	keymaps/dell-latitude-xt2 \
+	keymaps/everex-xt5000 \
+	keymaps/fujitsu-amilo_li_2732 \
+	keymaps/fujitsu-amilo_pa_2548 \
+	keymaps/fujitsu-amilo_pro_edition_v3505 \
+	keymaps/fujitsu-amilo_pro_v3205 \
+	keymaps/fujitsu-amilo_si_1520 \
+	keymaps/fujitsu-esprimo_mobile_v5 \
+	keymaps/fujitsu-esprimo_mobile_v6 \
+	keymaps/genius-slimstar-320 \
+	keymaps/hewlett-packard \
+	keymaps/hewlett-packard-2510p_2530p \
+	keymaps/hewlett-packard-compaq_elitebook \
+	keymaps/hewlett-packard-pavilion \
+	keymaps/hewlett-packard-presario-2100 \
+	keymaps/hewlett-packard-tablet \
+	keymaps/hewlett-packard-tx2 \
+	keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+	keymaps/inventec-symphony_6.0_7.0 \
+	keymaps/lenovo-3000 \
+	keymaps/lenovo-ideapad \
+	keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+	keymaps/lenovo-thinkpad_x6_tablet \
+	keymaps/lenovo-thinkpad_x200_tablet \
+	keymaps/lg-x110 \
+	keymaps/logitech-wave \
+	keymaps/logitech-wave-cordless \
+	keymaps/logitech-wave-pro-cordless \
+	keymaps/maxdata-pro_7000 \
+	keymaps/medion-fid2060 \
+	keymaps/medionnb-a555 \
+	keymaps/micro-star \
+	keymaps/module-asus-w3j \
+	keymaps/module-ibm \
+	keymaps/module-lenovo \
+	keymaps/module-sony \
+	keymaps/module-sony-old \
+	keymaps/module-sony-vgn \
+	keymaps/olpc-xo \
+	keymaps/onkyo \
+	keymaps/oqo-model2 \
+	keymaps/samsung-other \
+	keymaps/samsung-90x3a \
+	keymaps/samsung-sq1us \
+	keymaps/samsung-sx20s \
+	keymaps/toshiba-satellite_a100 \
+	keymaps/toshiba-satellite_a110 \
+	keymaps/toshiba-satellite_m30x \
+	keymaps/zepto-znote
 
 udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
diff --git a/src/udev/keymap/keymaps/acer b/keymaps/acer
similarity index 100%
rename from src/udev/keymap/keymaps/acer
rename to keymaps/acer
diff --git a/src/udev/keymap/keymaps/acer-aspire_5720 b/keymaps/acer-aspire_5720
similarity index 100%
rename from src/udev/keymap/keymaps/acer-aspire_5720
rename to keymaps/acer-aspire_5720
diff --git a/src/udev/keymap/keymaps/acer-aspire_5920g b/keymaps/acer-aspire_5920g
similarity index 100%
rename from src/udev/keymap/keymaps/acer-aspire_5920g
rename to keymaps/acer-aspire_5920g
diff --git a/src/udev/keymap/keymaps/acer-aspire_6920 b/keymaps/acer-aspire_6920
similarity index 100%
rename from src/udev/keymap/keymaps/acer-aspire_6920
rename to keymaps/acer-aspire_6920
diff --git a/src/udev/keymap/keymaps/acer-aspire_8930 b/keymaps/acer-aspire_8930
similarity index 100%
rename from src/udev/keymap/keymaps/acer-aspire_8930
rename to keymaps/acer-aspire_8930
diff --git a/src/udev/keymap/keymaps/acer-travelmate_c300 b/keymaps/acer-travelmate_c300
similarity index 100%
rename from src/udev/keymap/keymaps/acer-travelmate_c300
rename to keymaps/acer-travelmate_c300
diff --git a/src/udev/keymap/keymaps/asus b/keymaps/asus
similarity index 100%
rename from src/udev/keymap/keymaps/asus
rename to keymaps/asus
diff --git a/src/udev/keymap/keymaps/compaq-e_evo b/keymaps/compaq-e_evo
similarity index 100%
rename from src/udev/keymap/keymaps/compaq-e_evo
rename to keymaps/compaq-e_evo
diff --git a/src/udev/keymap/keymaps/dell b/keymaps/dell
similarity index 100%
rename from src/udev/keymap/keymaps/dell
rename to keymaps/dell
diff --git a/src/udev/keymap/keymaps/dell-latitude-xt2 b/keymaps/dell-latitude-xt2
similarity index 100%
rename from src/udev/keymap/keymaps/dell-latitude-xt2
rename to keymaps/dell-latitude-xt2
diff --git a/src/udev/keymap/keymaps/everex-xt5000 b/keymaps/everex-xt5000
similarity index 100%
rename from src/udev/keymap/keymaps/everex-xt5000
rename to keymaps/everex-xt5000
diff --git a/src/udev/keymap/keymaps/fujitsu-amilo_li_2732 b/keymaps/fujitsu-amilo_li_2732
similarity index 100%
rename from src/udev/keymap/keymaps/fujitsu-amilo_li_2732
rename to keymaps/fujitsu-amilo_li_2732
diff --git a/src/udev/keymap/keymaps/fujitsu-amilo_pa_2548 b/keymaps/fujitsu-amilo_pa_2548
similarity index 100%
rename from src/udev/keymap/keymaps/fujitsu-amilo_pa_2548
rename to keymaps/fujitsu-amilo_pa_2548
diff --git a/src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 b/keymaps/fujitsu-amilo_pro_edition_v3505
similarity index 100%
rename from src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505
rename to keymaps/fujitsu-amilo_pro_edition_v3505
diff --git a/src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205 b/keymaps/fujitsu-amilo_pro_v3205
similarity index 100%
rename from src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205
rename to keymaps/fujitsu-amilo_pro_v3205
diff --git a/src/udev/keymap/keymaps/fujitsu-amilo_si_1520 b/keymaps/fujitsu-amilo_si_1520
similarity index 100%
rename from src/udev/keymap/keymaps/fujitsu-amilo_si_1520
rename to keymaps/fujitsu-amilo_si_1520
diff --git a/src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5 b/keymaps/fujitsu-esprimo_mobile_v5
similarity index 100%
rename from src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5
rename to keymaps/fujitsu-esprimo_mobile_v5
diff --git a/src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6 b/keymaps/fujitsu-esprimo_mobile_v6
similarity index 100%
rename from src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6
rename to keymaps/fujitsu-esprimo_mobile_v6
diff --git a/src/udev/keymap/keymaps/genius-slimstar-320 b/keymaps/genius-slimstar-320
similarity index 100%
rename from src/udev/keymap/keymaps/genius-slimstar-320
rename to keymaps/genius-slimstar-320
diff --git a/src/udev/keymap/keymaps/hewlett-packard b/keymaps/hewlett-packard
similarity index 100%
rename from src/udev/keymap/keymaps/hewlett-packard
rename to keymaps/hewlett-packard
diff --git a/src/udev/keymap/keymaps/hewlett-packard-2510p_2530p b/keymaps/hewlett-packard-2510p_2530p
similarity index 100%
rename from src/udev/keymap/keymaps/hewlett-packard-2510p_2530p
rename to keymaps/hewlett-packard-2510p_2530p
diff --git a/src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook b/keymaps/hewlett-packard-compaq_elitebook
similarity index 100%
rename from src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook
rename to keymaps/hewlett-packard-compaq_elitebook
diff --git a/src/udev/keymap/keymaps/hewlett-packard-pavilion b/keymaps/hewlett-packard-pavilion
similarity index 100%
rename from src/udev/keymap/keymaps/hewlett-packard-pavilion
rename to keymaps/hewlett-packard-pavilion
diff --git a/src/udev/keymap/keymaps/hewlett-packard-presario-2100 b/keymaps/hewlett-packard-presario-2100
similarity index 100%
rename from src/udev/keymap/keymaps/hewlett-packard-presario-2100
rename to keymaps/hewlett-packard-presario-2100
diff --git a/src/udev/keymap/keymaps/hewlett-packard-tablet b/keymaps/hewlett-packard-tablet
similarity index 100%
rename from src/udev/keymap/keymaps/hewlett-packard-tablet
rename to keymaps/hewlett-packard-tablet
diff --git a/src/udev/keymap/keymaps/hewlett-packard-tx2 b/keymaps/hewlett-packard-tx2
similarity index 100%
rename from src/udev/keymap/keymaps/hewlett-packard-tx2
rename to keymaps/hewlett-packard-tx2
diff --git a/src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint b/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
similarity index 100%
rename from src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
rename to keymaps/ibm-thinkpad-usb-keyboard-trackpoint
diff --git a/src/udev/keymap/keymaps/inventec-symphony_6.0_7.0 b/keymaps/inventec-symphony_6.0_7.0
similarity index 100%
rename from src/udev/keymap/keymaps/inventec-symphony_6.0_7.0
rename to keymaps/inventec-symphony_6.0_7.0
diff --git a/src/udev/keymap/keymaps/lenovo-3000 b/keymaps/lenovo-3000
similarity index 100%
rename from src/udev/keymap/keymaps/lenovo-3000
rename to keymaps/lenovo-3000
diff --git a/src/udev/keymap/keymaps/lenovo-ideapad b/keymaps/lenovo-ideapad
similarity index 100%
rename from src/udev/keymap/keymaps/lenovo-ideapad
rename to keymaps/lenovo-ideapad
diff --git a/src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint b/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
similarity index 100%
rename from src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
rename to keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
diff --git a/src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet b/keymaps/lenovo-thinkpad_x200_tablet
similarity index 100%
rename from src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet
rename to keymaps/lenovo-thinkpad_x200_tablet
diff --git a/src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet b/keymaps/lenovo-thinkpad_x6_tablet
similarity index 100%
rename from src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet
rename to keymaps/lenovo-thinkpad_x6_tablet
diff --git a/src/udev/keymap/keymaps/lg-x110 b/keymaps/lg-x110
similarity index 100%
rename from src/udev/keymap/keymaps/lg-x110
rename to keymaps/lg-x110
diff --git a/src/udev/keymap/keymaps/logitech-wave b/keymaps/logitech-wave
similarity index 100%
rename from src/udev/keymap/keymaps/logitech-wave
rename to keymaps/logitech-wave
diff --git a/src/udev/keymap/keymaps/logitech-wave-cordless b/keymaps/logitech-wave-cordless
similarity index 100%
rename from src/udev/keymap/keymaps/logitech-wave-cordless
rename to keymaps/logitech-wave-cordless
diff --git a/src/udev/keymap/keymaps/logitech-wave-pro-cordless b/keymaps/logitech-wave-pro-cordless
similarity index 100%
rename from src/udev/keymap/keymaps/logitech-wave-pro-cordless
rename to keymaps/logitech-wave-pro-cordless
diff --git a/src/udev/keymap/keymaps/maxdata-pro_7000 b/keymaps/maxdata-pro_7000
similarity index 100%
rename from src/udev/keymap/keymaps/maxdata-pro_7000
rename to keymaps/maxdata-pro_7000
diff --git a/src/udev/keymap/keymaps/medion-fid2060 b/keymaps/medion-fid2060
similarity index 100%
rename from src/udev/keymap/keymaps/medion-fid2060
rename to keymaps/medion-fid2060
diff --git a/src/udev/keymap/keymaps/medionnb-a555 b/keymaps/medionnb-a555
similarity index 100%
rename from src/udev/keymap/keymaps/medionnb-a555
rename to keymaps/medionnb-a555
diff --git a/src/udev/keymap/keymaps/micro-star b/keymaps/micro-star
similarity index 100%
rename from src/udev/keymap/keymaps/micro-star
rename to keymaps/micro-star
diff --git a/src/udev/keymap/keymaps/module-asus-w3j b/keymaps/module-asus-w3j
similarity index 100%
rename from src/udev/keymap/keymaps/module-asus-w3j
rename to keymaps/module-asus-w3j
diff --git a/src/udev/keymap/keymaps/module-ibm b/keymaps/module-ibm
similarity index 100%
rename from src/udev/keymap/keymaps/module-ibm
rename to keymaps/module-ibm
diff --git a/src/udev/keymap/keymaps/module-lenovo b/keymaps/module-lenovo
similarity index 100%
rename from src/udev/keymap/keymaps/module-lenovo
rename to keymaps/module-lenovo
diff --git a/src/udev/keymap/keymaps/module-sony b/keymaps/module-sony
similarity index 100%
rename from src/udev/keymap/keymaps/module-sony
rename to keymaps/module-sony
diff --git a/src/udev/keymap/keymaps/module-sony-old b/keymaps/module-sony-old
similarity index 100%
rename from src/udev/keymap/keymaps/module-sony-old
rename to keymaps/module-sony-old
diff --git a/src/udev/keymap/keymaps/module-sony-vgn b/keymaps/module-sony-vgn
similarity index 100%
rename from src/udev/keymap/keymaps/module-sony-vgn
rename to keymaps/module-sony-vgn
diff --git a/src/udev/keymap/keymaps/olpc-xo b/keymaps/olpc-xo
similarity index 100%
rename from src/udev/keymap/keymaps/olpc-xo
rename to keymaps/olpc-xo
diff --git a/src/udev/keymap/keymaps/onkyo b/keymaps/onkyo
similarity index 100%
rename from src/udev/keymap/keymaps/onkyo
rename to keymaps/onkyo
diff --git a/src/udev/keymap/keymaps/oqo-model2 b/keymaps/oqo-model2
similarity index 100%
rename from src/udev/keymap/keymaps/oqo-model2
rename to keymaps/oqo-model2
diff --git a/src/udev/keymap/keymaps/samsung-90x3a b/keymaps/samsung-90x3a
similarity index 100%
rename from src/udev/keymap/keymaps/samsung-90x3a
rename to keymaps/samsung-90x3a
diff --git a/src/udev/keymap/keymaps/samsung-other b/keymaps/samsung-other
similarity index 100%
rename from src/udev/keymap/keymaps/samsung-other
rename to keymaps/samsung-other
diff --git a/src/udev/keymap/keymaps/samsung-sq1us b/keymaps/samsung-sq1us
similarity index 100%
rename from src/udev/keymap/keymaps/samsung-sq1us
rename to keymaps/samsung-sq1us
diff --git a/src/udev/keymap/keymaps/samsung-sx20s b/keymaps/samsung-sx20s
similarity index 100%
rename from src/udev/keymap/keymaps/samsung-sx20s
rename to keymaps/samsung-sx20s
diff --git a/src/udev/keymap/keymaps/toshiba-satellite_a100 b/keymaps/toshiba-satellite_a100
similarity index 100%
rename from src/udev/keymap/keymaps/toshiba-satellite_a100
rename to keymaps/toshiba-satellite_a100
diff --git a/src/udev/keymap/keymaps/toshiba-satellite_a110 b/keymaps/toshiba-satellite_a110
similarity index 100%
rename from src/udev/keymap/keymaps/toshiba-satellite_a110
rename to keymaps/toshiba-satellite_a110
diff --git a/src/udev/keymap/keymaps/toshiba-satellite_m30x b/keymaps/toshiba-satellite_m30x
similarity index 100%
rename from src/udev/keymap/keymaps/toshiba-satellite_m30x
rename to keymaps/toshiba-satellite_m30x
diff --git a/src/udev/keymap/keymaps/zepto-znote b/keymaps/zepto-znote
similarity index 100%
rename from src/udev/keymap/keymaps/zepto-znote
rename to keymaps/zepto-znote
diff --git a/src/udev/keymap/check-keymaps.sh b/src/udev/keymap/check-keymaps.sh
index 765e582af4..c4572745e0 100755
--- a/src/udev/keymap/check-keymaps.sh
+++ b/src/udev/keymap/check-keymaps.sh
@@ -5,7 +5,7 @@
 # Makefile.am
 SRCDIR=${1:-.}
 KEYLIST=${2:-src/udev/keymap/keys.txt}
-KEYMAPS_DIR=$SRCDIR/src/udev/keymap/keymaps
+KEYMAPS_DIR=$SRCDIR/keymaps
 RULES=$SRCDIR/src/udev/keymap/95-keymap.rules
 
 [ -e "$KEYLIST" ] || {
@@ -16,7 +16,7 @@ RULES=$SRCDIR/src/udev/keymap/95-keymap.rules
 missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) \
                     <(grep -hv '^#' ${KEYMAPS_DIR}/*| awk '{print $2}' | sort -u))
 [ -z "$missing" ] || {
-        echo "ERROR: unknown key names in src/udev/keymap/keymaps/*:" >&2
+        echo "ERROR: unknown key names in keymaps/*:" >&2
         echo "$missing" >&2
         exit 1
 }
@@ -31,7 +31,7 @@ for m in $maps; do
                 echo "ERROR: unknown map name in $RULES: $m" >&2
                 exit 1
         }
-        grep -q "src/udev/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
+        grep -q "keymaps/$m\>" $SRCDIR/Makefile.am || {
                 echo "ERROR: map file $m is not added to Makefile.am" >&2
                 exit 1
         }