diff --git a/config/graphic b/config/graphic
index f57527acf1..2fd92a7216 100644
--- a/config/graphic
+++ b/config/graphic
@@ -1,4 +1,4 @@
-if [ "$DISPLAYSERVER" = "xorg-server" ]; then
+if [ "$DISPLAYSERVER" = "x11" ]; then
   SDL_SUPPORT="yes"
 else
   SDL_SUPPORT="no"
@@ -38,16 +38,16 @@ get_graphicdrivers() {
 
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
-#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-#      LLVM_SUPPORT="yes"
+      LIBVA="$LIBVA libva-driver-intel"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
+      LIBVA="$LIBVA libva-driver-intel"
     fi
 
     if [ "$drv" = "nouveau" ]; then
diff --git a/packages/x11/package.mk b/packages/x11/package.mk
new file mode 100644
index 0000000000..18e3322681
--- /dev/null
+++ b/packages/x11/package.mk
@@ -0,0 +1,54 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="x11"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.X.org"
+PKG_URL=""
+PKG_DEPENDS_TARGET="toolchain xorg-server"
+PKG_PRIORITY="optional"
+PKG_SECTION="virtual"
+PKG_SHORTDESC="x11: the Windowing system"
+PKG_LONGDESC="X11 is the Windowing system"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+# Additional packages we need for using xorg-server:
+# Fonts
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc"
+
+# Server
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xkeyboard-config xkbcomp"
+
+# Tools
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xrandr setxkbmap"
+
+if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $WINDOWMANAGER"
+fi
+
+get_graphicdrivers
+# Drivers
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-input-evdev"
+  for drv in $XORG_DRIVERS; do
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-video-$drv"
+  done
diff --git a/projects/ATV/options b/projects/ATV/options
index a76cca3785..d09909ca94 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -246,8 +246,8 @@
 # include uvesafb support (yes / no)
   UVESAFB_SUPPORT="no"
 
-# Displayserver to use (xorg-server / no)
-  DISPLAYSERVER="xorg-server"
+# Displayserver to use (x11 / no)
+  DISPLAYSERVER="x11"
 
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau,vmware)
 # Space separated list is supported,
diff --git a/projects/Cuboxi/options b/projects/Cuboxi/options
index 752bbd2d29..3e9594a9b7 100644
--- a/projects/Cuboxi/options
+++ b/projects/Cuboxi/options
@@ -248,7 +248,7 @@
 # include uvesafb support (yes / no)
   UVESAFB_SUPPORT="no"
 
-# Displayserver to use (xorg-server / no)
+# Displayserver to use (x11 / no)
   DISPLAYSERVER="no"
 
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau,vmware)
diff --git a/projects/Generic/options b/projects/Generic/options
index 93f85a46f3..7d4263968e 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -246,8 +246,8 @@
 # include uvesafb support (yes / no)
   UVESAFB_SUPPORT="yes"
 
-# Displayserver to use (xorg-server / no)
-  DISPLAYSERVER="xorg-server"
+# Displayserver to use (x11 / no)
+  DISPLAYSERVER="x11"
 
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau,vmware)
 # Space separated list is supported,
diff --git a/projects/RPi/options b/projects/RPi/options
index 9359374144..2b53194be1 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -247,7 +247,7 @@
 # include uvesafb support (yes / no)
   UVESAFB_SUPPORT="no"
 
-# Displayserver to use (xorg-server / no)
+# Displayserver to use (x11 / no)
   DISPLAYSERVER="no"
 
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau,vmware)
diff --git a/projects/Virtual/options b/projects/Virtual/options
index e3354e5bc3..6f27c36f89 100644
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -241,8 +241,8 @@
 # include uvesafb support (yes / no)
   UVESAFB_SUPPORT="yes"
 
-# Displayserver to use (xorg-server / no)
-  DISPLAYSERVER="xorg-server"
+# Displayserver to use (x11 / no)
+  DISPLAYSERVER="x11"
 
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau,vmware,virtualbox)
 # Space separated list is supported,