diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index f4d15af7e0..19eaa2312e 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -33,6 +33,7 @@ $SCRIPTS/build xf86bigfontproto
 $SCRIPTS/build udev
 
 cd $PKG_BUILD
+autoreconf
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -73,7 +74,7 @@ cd $PKG_BUILD
             --disable-multibuffer \
             --enable-dbe \
             --disable-xf86bigfont \
-            --disable-dpms \
+            --enable-dpms \
             --enable-config-udev \
             --disable-config-dbus \
             --disable-config-hal \
@@ -94,6 +95,7 @@ cd $PKG_BUILD
             --with-int10=x86emu \
             --disable-ipv6 \
             --with-gnu-ld \
+            --with-sha1=libcrypto \
             --with-os-vendor="OpenELEC" \
             --with-module-dir=$XORG_PATH_MODULES \
             --with-xkb-path=$XORG_PATH_XKB \
diff --git a/packages/x11/xserver/xorg-server/conf.d/xorg b/packages/x11/xserver/xorg-server/conf.d/xorg
index a34ac4841a..895db87add 100644
--- a/packages/x11/xserver/xorg-server/conf.d/xorg
+++ b/packages/x11/xserver/xorg-server/conf.d/xorg
@@ -10,7 +10,7 @@
 #-------------------------------------------------------------------------------
 DISPLAY=':0.0'
 XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
-XORG_ARGS="-s 0 -nr -noreset -allowMouseOpenFail -nocursor -nolisten tcp"
+XORG_ARGS="-s 0 -nr -noreset -allowMouseOpenFail -nocursor -nohwaccess -nolisten tcp"
 
 export DISPLAY
 
@@ -18,34 +18,9 @@ export DISPLAY
 # do not change anything below
 #-------------------------------------------------------------------------------
 
-[ "$DEBUG" = yes ] && XORG_ARGS="$XORG_ARGS -logverbose 6 -verbose 6"
+[ "$RUNLEVEL" = debug ] && XORG_ARGS="$XORG_ARGS -logverbose 6 -verbose 6"
 
-  start_xorg() {
-
-    if lspci -n | grep 0300 | grep -q 10de; then
-
-      XORG_ARGS="$XORG_ARGS -ignoreABI"
-      [ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
-
-      progress "Found nVidia card, enabling binary driver as requested"
-        mkdir -p /var/lib
-          ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
-          ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
-
-    else
-
-      progress "Not found nVidia card, enabling OSS driver as requested"
-        mkdir -p /var/lib
-          ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
-          ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
-    fi
-
-    mkdir -p /var/cache/xkb
-      /usr/bin/Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 &
-  }
-
-  wait_for_xorg () {
-    while [ ! -f /tmp/.X0-lock ]; do
-      sleep 1
-    done
-  }
+if lspci -n | grep 0300 | grep -q 10de; then
+  XORG_ARGS="$XORG_ARGS -ignoreABI"
+  [ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
+fi
diff --git a/packages/x11/xserver/xorg-server/config/10-quirks.conf b/packages/x11/xserver/xorg-server/config/10-quirks.conf
index 7afad22dc6..dbca1f674b 100644
--- a/packages/x11/xserver/xorg-server/config/10-quirks.conf
+++ b/packages/x11/xserver/xorg-server/config/10-quirks.conf
@@ -1,8 +1,8 @@
 # Collection of quirks and blacklist/whitelists for specific devices.
 
-
 # Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
 # http://bugs.freedesktop.org/show_bug.cgi?id=22442 
+
 Section "InputClass"
         Identifier "ThinkPad HDAPS accelerometer blacklist"
         MatchProduct "ThinkPad HDAPS accelerometer data"
diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url
index 8363f80dfc..edfec8d867 100644
--- a/packages/x11/xserver/xorg-server/url
+++ b/packages/x11/xserver/xorg-server/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/xorg-server-20100218.tar.bz2
+http://sources.openelec.tv/svn/xorg-server-20100228.tar.bz2