diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index e92a38918f..86dd21b60c 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -22,6 +22,24 @@
 
 . config/options $1
 
+if [ "$XORG_SUPPORT" = yes ]; then
+  XBMC_XORG="--enable-x11 --enable-xrandr"
+else
+  XBMC_XORG="--enable-x11 --enable-xrandr"
+fi
+
+if [ "$OPENGL_SUPPORT" = yes ]; then
+  XBMC_OPENGL="--enable-gl"
+else
+  XBMC_OPENGL="--disable-gl"
+fi
+
+if [ "$OPENGLES_SUPPORT" = yes ]; then
+  XBMC_OPENGLES="--enable-gles"
+else
+  XBMC_OPENGLES="--disable-gles"
+fi
+
 if [ "$XBMC_SCR_RSXS" = yes ]; then
   XBMC_RSXS="--enable-rsxs"
   # fix build of RSXS Screensaver support if not using libiconv
@@ -195,8 +213,8 @@ cd $PKG_BUILD
             GIT_REV=`cat git.version` \
             --disable-debug \
             --disable-optimizations \
-            --enable-gl \
-            --disable-gles \
+            $XBMC_OPENGL \
+            $XBMC_OPENGLES \
             $XBMC_VDPAU \
             $XBMC_VAAPI \
             $XBMC_CRYSTALHD \
@@ -211,8 +229,7 @@ cd $PKG_BUILD
             $XBMC_GOOM \
             $XBMC_RSXS \
             $XBMC_PROJECTM \
-            --enable-x11 \
-            --enable-xrandr \
+            $XBMC_XORG \
             --disable-ccache \
             $XBMC_PULSEAUDIO \
             --enable-rtmp \
@@ -241,4 +258,7 @@ cd $PKG_BUILD
 
 make externals
 make xbmc.bin
-make xbmc-xrandr
+
+if [ "$XORG_SUPPORT" = yes ]; then
+  make xbmc-xrandr
+fi
\ No newline at end of file
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 1238d95ca8..731dc18ce2 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -31,7 +31,9 @@ mkdir -p $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/lib/xbmc
   cp $PKG_BUILD/xbmc.bin $INSTALL/usr/lib/xbmc
-  cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc
+  if [ "$XORG_SUPPORT" = yes ]; then
+    cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc
+  fi
 
 cd $PKG_BUILD
   find system addons \
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 99f0d2a97f..5761662c93 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="xbmc: XBMC Mediacenter"
@@ -35,13 +35,27 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-# for libX11 support
+if [ "$XORG_SUPPORT" = yes ]; then
+  # for libX11 support
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
   PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"
 
-# for libXrandr support
+  # for libXrandr support
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXrandr"
   PKG_DEPENDS="$PKG_DEPENDS libXrandr"
+fi
+
+if [ "$OPENGL_SUPPORT" = yes ]; then
+  # for OpenGL (GLX) support
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $OPENGL glew"
+  PKG_DEPENDS="$PKG_DEPENDS $OPENGL glew"
+fi
+
+if [ "$OPENGLES_SUPPORT" = yes ]; then
+  # for OpenGL-ES support
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS OpenGLES"
+  PKG_DEPENDS="$PKG_DEPENDS OpenGLES"
+fi
 
 # for dbus support
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS dbus"