diff --git a/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk b/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk
new file mode 100644
index 0000000000..526651b8fe
--- /dev/null
+++ b/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/package.mk
@@ -0,0 +1,62 @@
+################################################################################
+#      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="screensavers.rsxs"
+PKG_VERSION="195e0ec"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="screensavers.rsxs"
+PKG_LONGDESC="screensavers.rsxs"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.ui.screensaver"
+
+if [ "$OPENGL" = "no" ] ; then
+  exit 0
+fi
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        ..
+}
+
+addon() {
+  for _ADDON in $PKG_BUILD/.install_pkg/usr/share/kodi/addons/* ; do
+    _ADDON_ID=$(basename $_ADDON)
+
+    mkdir -p $ADDON_BUILD/$_ADDON_ID/
+    cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$_ADDON_ID/* $ADDON_BUILD/$_ADDON_ID/
+    cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$_ADDON_ID/*.so $ADDON_BUILD/$_ADDON_ID/
+
+    MULTI_ADDONS="$MULTI_ADDONS $_ADDON_ID"
+  done
+
+  # export MULTI_ADDONS so create_addon knows multiple addons
+  # were installed in $ADDON_BUILD/
+  export MULTI_ADDONS="$MULTI_ADDONS"
+}
diff --git a/tools/mkpkg/mkpkg_screensavers.rsxs b/tools/mkpkg/mkpkg_screensavers.rsxs
new file mode 100755
index 0000000000..7413ba198b
--- /dev/null
+++ b/tools/mkpkg/mkpkg_screensavers.rsxs
@@ -0,0 +1,43 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+echo "getting sources..."
+  if [ ! -d screensavers.rsxs.git ]; then
+    git clone https://github.com/notspiff/screensavers.rsxs.git screensavers.rsxs.git
+  fi
+
+  cd screensavers.rsxs.git
+    git pull
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
+
+echo "copying sources..."
+  rm -rf screensavers.rsxs-$GIT_REV
+  cp -R screensavers.rsxs.git screensavers.rsxs-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf screensavers.rsxs-$GIT_REV/.git
+
+echo "packing sources..."
+  tar cvJf screensavers.rsxs-$GIT_REV.tar.xz screensavers.rsxs-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf screensavers.rsxs-$GIT_REV