diff --git a/packages/x11/app/setxkbmap/scripts/xkb-setup b/packages/x11/app/setxkbmap/init.d/72_keyboard
old mode 100755
new mode 100644
similarity index 67%
rename from packages/x11/app/setxkbmap/scripts/xkb-setup
rename to packages/x11/app/setxkbmap/init.d/72_keyboard
index a2498b336a..32478732e2
--- a/packages/x11/app/setxkbmap/scripts/xkb-setup
+++ b/packages/x11/app/setxkbmap/init.d/72_keyboard
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -20,21 +18,28 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. /etc/profile
-. /var/config/settings.conf
+# setup keyboard layout
+#
+# runlevels: openelec
 
-if [ -z $X11_KEYMAP ]; then
-  X11_KEYMAP="us"
-fi
+(
+  if [ -f /var/config/settings.conf ]; then
+    . /var/config/settings.conf
 
-if [ ! "$X11_KEYMAP2" == "-none-" ]; then
-  XKBLAYOUT="$X11_KEYMAP,$X11_KEYMAP2"
-  XKBOPTIONS="grp:alt_shift_toggle"
-else
-  XKBLAYOUT="$X11_KEYMAP"
-fi
+    progress "setup keyboard layout"
 
-echo "XKBMODEL=\"pc105\""
-echo "XKBVARIANT=\"\""
-echo "XKBLAYOUT=\"$XKBLAYOUT\""
-echo "XKBOPTIONS=\"$XKBOPTIONS\""
+    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
+)&
diff --git a/packages/x11/app/setxkbmap/install b/packages/x11/app/setxkbmap/install
index 16941ff820..6a5aaf3171 100755
--- a/packages/x11/app/setxkbmap/install
+++ b/packages/x11/app/setxkbmap/install
@@ -25,5 +25,3 @@
 mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/$1 $INSTALL/usr/bin
 
-mkdir -p $INSTALL/lib/udev
-  cp $PKG_DIR/scripts/xkb-setup $INSTALL/lib/udev
diff --git a/packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules b/packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules
deleted file mode 100644
index a99b7f3c1e..0000000000
--- a/packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-ACTION!="add|change", GOTO="xorg_xkb_end"
-SUBSYSTEM!="input", GOTO="xorg_xkb_end"
-KERNEL!="event*", GOTO="xorg_xkb_end"
-
-ENV{ID_INPUT_KEY}=="?*", IMPORT{program}="xkb-setup"
-
-LABEL="xorg_xkb_end"
-