diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 5d83211c4f..04d58bc8da 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -22,6 +22,12 @@
 
 . config/options $1
 
+if [ "$XBMC_SCR_RSXS" = yes ]; then
+  XBMC_RSXS="--enable-rsxs"
+else
+  XBMC_RSXS="--disable-rsxs"
+fi
+
 if [ "$XBMC_VIS_PROJECTM" = yes ]; then
   XBMC_PROJECTM="--enable-xbmcprojectm"
 else
@@ -157,7 +163,7 @@ cd $PKG_BUILD
             --enable-joystick \
             --enable-xrandr \
             --disable-goom \
-            --disable-rsxs \
+            $XBMC_RSXS \
             $XBMC_PROJECTM \
             --enable-x11 \
             --disable-ccache \
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index c77eae6b37..ae97090434 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 libplist dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba alsa bc xbmc-addon-settings"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba alsa bc xbmc-addon-settings"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="xbmc: XBMC Mediacenter"
@@ -35,6 +35,23 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
+# for libX11 support
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
+  PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"
+
+# for libXrandr support
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXrandr"
+  PKG_DEPENDS="$PKG_DEPENDS libXrandr"
+
+# for dbus support
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS dbus"
+  PKG_DEPENDS="$PKG_DEPENDS dbus"
+
+if [ "$XBMC_SCR_RSXS" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXt libXmu"
+  PKG_DEPENDS="$PKG_DEPENDS libXt libXmu"
+fi
+
 if [ "$FAAC_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS faac"
   PKG_DEPENDS="$PKG_DEPENDS faac"
diff --git a/projects/ATV/options b/projects/ATV/options
index bd6b5bff92..751879b4f5 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -120,6 +120,9 @@
 # e.g. XBMC_PLUGINS="SABnzbd"
   XBMC_PLUGINS=""
 
+# build and install 'RSXS' Screensaver (yes / no)
+  XBMC_SCR_RSXS="no"
+
 # build and install 'ProjectM' Visualization (yes / no)
   XBMC_VIS_PROJECTM="yes"
 
diff --git a/projects/Fusion/options b/projects/Fusion/options
index 96cebe781c..dedcfac56f 100644
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -120,6 +120,9 @@
 # e.g. XBMC_PLUGINS="SABnzbd"
   XBMC_PLUGINS=""
 
+# build and install 'RSXS' Screensaver (yes / no)
+  XBMC_SCR_RSXS="no"
+
 # build and install 'ProjectM' Visualization (yes / no)
   XBMC_VIS_PROJECTM="yes"
 
diff --git a/projects/Generic/options b/projects/Generic/options
index 13a3ca5632..f300ff0c59 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -120,6 +120,9 @@
 # e.g. XBMC_PLUGINS="SABnzbd"
   XBMC_PLUGINS=""
 
+# build and install 'RSXS' Screensaver (yes / no)
+  XBMC_SCR_RSXS="no"
+
 # build and install 'ProjectM' Visualization (yes / no)
   XBMC_VIS_PROJECTM="yes"
 
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 00d141fd9a..3dbbff7971 100644
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -120,6 +120,9 @@
 # e.g. XBMC_PLUGINS="SABnzbd"
   XBMC_PLUGINS=""
 
+# build and install 'RSXS' Screensaver (yes / no)
+  XBMC_SCR_RSXS="no"
+
 # build and install 'ProjectM' Visualization (yes / no)
   XBMC_VIS_PROJECTM="yes"
 
diff --git a/projects/ION/options b/projects/ION/options
index ed692d57d6..ccbc64e69d 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -120,6 +120,9 @@
 # e.g. XBMC_PLUGINS="SABnzbd"
   XBMC_PLUGINS=""
 
+# build and install 'RSXS' Screensaver (yes / no)
+  XBMC_SCR_RSXS="no"
+
 # build and install 'ProjectM' Visualization (yes / no)
   XBMC_VIS_PROJECTM="yes"
 
diff --git a/projects/Intel/options b/projects/Intel/options
index 3df765e296..4e60575623 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -123,6 +123,9 @@
 # build and install 'ProjectM' Visualization (yes / no)
   XBMC_VIS_PROJECTM="yes"
 
+# build and install 'RSXS' Screensaver (yes / no)
+  XBMC_SCR_RSXS="no"
+
 # build and install with non-free support
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
diff --git a/projects/Ultra/options b/projects/Ultra/options
index cd377a520e..4021c071e8 100644
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -120,6 +120,9 @@
 # e.g. XBMC_PLUGINS="SABnzbd"
   XBMC_PLUGINS=""
 
+# build and install 'RSXS' Screensaver (yes / no)
+  XBMC_SCR_RSXS="no"
+
 # build and install 'ProjectM' Visualization (yes / no)
   XBMC_VIS_PROJECTM="yes"