diff -uNr mkinitcpio-0.6.13.orig/install/consolefont mkinitcpio-0.6.13/install/consolefont
--- mkinitcpio-0.6.13.orig/install/consolefont	2010-05-08 13:55:54.000000000 +0100
+++ mkinitcpio-0.6.13/install/consolefont	2011-06-11 13:29:50.185583138 +0100
@@ -6,7 +6,11 @@
     BINARIES=""
     FILES=""
     SCRIPT="consolefont"
-    eval "$(grep -e "^CONSOLEFONT=" /etc/rc.conf)"
+    [ -e /etc/rc.conf ] && eval "$(grep -e "^CONSOLEFONT=" /etc/rc.conf)"
+    if [ -e /etc/vconsole.conf ]; then
+        eval "$(grep -e "^FONT=" /etc/vconsole.conf)"
+        CONSOLEFONT=${FONT}
+    fi
     if [ -n "$CONSOLEFONT" ]; then
         if [ -e /usr/share/kbd/consolefonts/$CONSOLEFONT.psfu.gz ]; then
             CONSOLEFONT_FILE_GZ="/usr/share/kbd/consolefonts/$CONSOLEFONT.psfu.gz"
@@ -27,6 +31,10 @@
 help ()
 {
 cat<<HELPEOF
-  This hook loads consolefont specified in rc.conf during early userspace.
+  This hook loads consolefont specified in rc.conf during early
+  userspace.
+
+  For systemd users, this hook will load console font specified
+  in vconsole.conf in preference to rc.conf.
 HELPEOF
 }
diff -uNr mkinitcpio-0.6.13.orig/install/keymap mkinitcpio-0.6.13/install/keymap
--- mkinitcpio-0.6.13.orig/install/keymap	2010-05-08 13:55:54.000000000 +0100
+++ mkinitcpio-0.6.13/install/keymap	2011-06-11 13:29:50.865583140 +0100
@@ -6,7 +6,12 @@
     BINARIES=""
     FILES=""
     SCRIPT="keymap"
-    eval "$(grep -e "^LOCALE=" -e "^KEYMAP=" /etc/rc.conf)"
+    [ -e /etc/rc.conf ] && eval "$(grep -e "^LOCALE=" -e "^KEYMAP=" /etc/rc.conf)"
+    [ -e /etc/vconsole.conf ] && eval "$(grep -e "^KEYMAP=" /etc/vconsole.conf)"
+    if [ -e /etc/locale.conf ]; then
+        eval "$(grep -e "^LANG=" /etc/locale.conf)"
+        LOCALE=${LANG}
+    fi
     if [ -n "$KEYMAP" ]; then
         KEYMAP_FILE="$(mktemp ${TMPDIR}/keymap.XXXXXX)"
         UTF8_FILE="$(mktemp ${TMPDIR}/keymap.XXXXXX)"
@@ -25,7 +30,11 @@
 help ()
 {
 cat<<HELPEOF
-  This hook loads keymap(s) specified in rc.conf
+  This hook loads locale and keymap(s) specified in rc.conf
   during early userspace.
+
+  For systemd users, this hook will load locale and keymap(s)
+  specified in locale.conf and vconsole.conf respectively in
+  preference to rc.conf.
 HELPEOF
 }