diff --git a/packages/x11/app/setxkbmap/init.d/72_keyboard b/packages/x11/app/setxkbmap/init.d/72_keyboard
new file mode 100644
index 0000000000..32478732e2
--- /dev/null
+++ b/packages/x11/app/setxkbmap/init.d/72_keyboard
@@ -0,0 +1,45 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+# setup keyboard layout
+#
+# runlevels: openelec
+
+(
+  if [ -f /var/config/settings.conf ]; then
+    . /var/config/settings.conf
+
+    progress "setup keyboard layout"
+
+    if [ -z $X11_KEYMAP ]; then
+      X11_KEYMAP="us"
+    fi
+
+    # waiting for Xorg to start
+      wait_for_xorg
+
+    # setup keymap
+      if [ -z $X11_KEYMAP2 ]; then
+        setxkbmap -display $DISPLAY $X11_KEYMAP;
+      else
+        setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
+      fi
+  fi
+)&