--- mkinitcpio/install/keymap	2012-03-05 00:31:06.000000000 +0100
+++ mkinitcpio/install/keymap	2012-03-20 22:24:12.478644280 +0100
@@ -4,9 +4,15 @@ build() {
 
     # subshell to avoid namespace pollution
     (
-        . "$BASEDIR/etc/rc.conf"
+        if [ -s "$BASEDIR/etc/locale.conf" ] && [ -s "$BASEDIR/etc/vconsole.conf" ]; then
+            . "$BASEDIR/etc/locale.conf"
+            . "$BASEDIR/etc/vconsole.conf"
+            LOCALE="${LANG}"
+        else
+            . "$BASEDIR/etc/rc.conf"
+        fi
         if [[ $KEYMAP ]]; then
-            if [[ $LOCALE = *[Uu][Tt][Ff]-8 ]]; then
+            if [[ $LOCALE = *[Uu][Tt][Ff]*8 ]]; then
                 touch "$BUILDROOT/keymap.utf8"
                 uc=-u
             fi