diff --git a/installer/installer.kmdr b/installer/installer.kmdr
index 40ffe99..8524d25 100755
--- a/installer/installer.kmdr
+++ b/installer/installer.kmdr
@@ -1136,6 +1136,9 @@ sed -i "s|\(XKB_LAYOUT=\).*|\1$LAYOUT|" /etc/sysconfig/keyboard
 sed -i "s|\(XKB_MODEL=\).*|\1$MODEL|" /etc/sysconfig/keyboard
 sed -i "s|\(\"XkbLayout\"\).*|\1 \"$LAYOUT\"|" /etc/X11/xorg.conf
 sed -i "s|\(\"XkbModel\"\).*|\1 \"$MODEL\"|" /etc/X11/xorg.conf
+sed -i "s|\(\"XkbLayout\"\).*|\1 \"$LAYOUT\"|" /etc/X11/xorg.conf.d/10-keyboard.conf
+sed -i "s|\(\"XkbModel\"\).*|\1 \"$MODEL\"|" /etc/X11/xorg.conf.d/10-keyboard.conf
+sed -i "s|\(KEYMAP=\).*|\1$LAYOUT|" /etc/vconsole.conf
 </string>
                     </stringlist>
                 </property>
diff --git a/installer/installer.sh b/installer/installer.sh
index 79b16dc..a6e7acf 100755
--- a/installer/installer.sh
+++ b/installer/installer.sh
@@ -344,7 +344,8 @@ dcop_write_details $"\
 ${MOUNT_SPACE} Mbytes copied
 Installation time: $TIME_ELAPSED minutes"
 
-CONFIGURED_FILES="/etc/sysconfig/keyboard /etc/sysconfig/i18n /etc/X11/xorg.conf"
+CONFIGURED_FILES="/etc/sysconfig/keyboard /etc/sysconfig/i18n /etc/sysconfig/vconsole.conf \
+                  /etc/X11/xorg.conf /etc/X11/xorg.conf.d/10-keyboard.conf /etc/X11/xorg.conf.d/20-touchpad.conf"
 for f in $CONFIGURED_FILES; do
    cp $f ${MOUNTPOINT}/${f}
 done