diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index 187e81ee0e..3b16f24ada 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -46,12 +46,6 @@
         cp -PR /usr/config/$i $HOME/.config
     done
 
-# loading NVidia driver
-  if lspci -n | grep 0300 | grep -q 10de; then
-    progress "loading NVidia driver"
-      $IONICE modprobe nvidia
-  fi
-
 # caching xbmc
   [ "$XBMC_CACHING" = "yes" ] && cache_xbmc
 
diff --git a/packages/x11/xserver/xorg-server/init.d/60_xorg b/packages/x11/xserver/xorg-server/60_xorg
similarity index 100%
rename from packages/x11/xserver/xorg-server/init.d/60_xorg
rename to packages/x11/xserver/xorg-server/60_xorg
diff --git a/packages/x11/xserver/xorg-server/init.d/12_configure-xorg b/packages/x11/xserver/xorg-server/init.d/12_configure-xorg
new file mode 100644
index 0000000000..2adc464a53
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/init.d/12_configure-xorg
@@ -0,0 +1,27 @@
+# configure X.Org video settings
+#
+# runlevels: openelec, text, debug
+
+if lspci -n | grep 0300 | grep -q 10de; then
+
+  progress "Found nVidia card, loading NVidia driver"
+    $IONICE modprobe nvidia &
+
+  progress "Found nVidia card, enabling NVIDIA GLX as requested"
+    $IONICE mkdir -p /var/lib
+    $IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
+    $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
+
+else
+
+  progress "Not found nVidia card, enabling Mesa GLX as requested"
+    $IONICE mkdir -p /var/lib
+    $IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
+    $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
+
+fi
+
+# Make some needed directorys
+  $IONICE mkdir -p /var/cache/xkb
+  $IONICE mkdir -m 1777 -p /tmp/.ICE-unix
+  $IONICE chown root:root /tmp/.ICE-unix