diff --git a/packages/mediacenter/xbmc/config/advancedsettings.xml b/packages/mediacenter/kodi/config/advancedsettings.xml
similarity index 100%
rename from packages/mediacenter/xbmc/config/advancedsettings.xml
rename to packages/mediacenter/kodi/config/advancedsettings.xml
diff --git a/packages/mediacenter/xbmc/config/appliance.xml b/packages/mediacenter/kodi/config/appliance.xml
similarity index 100%
rename from packages/mediacenter/xbmc/config/appliance.xml
rename to packages/mediacenter/kodi/config/appliance.xml
diff --git a/packages/mediacenter/xbmc/config/os.openelec.tv/addon.xml b/packages/mediacenter/kodi/config/os.openelec.tv/addon.xml
similarity index 100%
rename from packages/mediacenter/xbmc/config/os.openelec.tv/addon.xml
rename to packages/mediacenter/kodi/config/os.openelec.tv/addon.xml
diff --git a/packages/mediacenter/xbmc/config/repository.openelec.tv/addon.xml b/packages/mediacenter/kodi/config/repository.openelec.tv/addon.xml
similarity index 100%
rename from packages/mediacenter/xbmc/config/repository.openelec.tv/addon.xml
rename to packages/mediacenter/kodi/config/repository.openelec.tv/addon.xml
diff --git a/packages/mediacenter/xbmc/config/repository.openelec.tv/icon.png b/packages/mediacenter/kodi/config/repository.openelec.tv/icon.png
similarity index 100%
rename from packages/mediacenter/xbmc/config/repository.openelec.tv/icon.png
rename to packages/mediacenter/kodi/config/repository.openelec.tv/icon.png
diff --git a/packages/mediacenter/xbmc/debug.d/kodi.conf b/packages/mediacenter/kodi/debug.d/kodi.conf
similarity index 100%
rename from packages/mediacenter/xbmc/debug.d/kodi.conf
rename to packages/mediacenter/kodi/debug.d/kodi.conf
diff --git a/packages/mediacenter/xbmc/fonts/DejaVuSans.ttf b/packages/mediacenter/kodi/fonts/DejaVuSans.ttf
similarity index 100%
rename from packages/mediacenter/xbmc/fonts/DejaVuSans.ttf
rename to packages/mediacenter/kodi/fonts/DejaVuSans.ttf
diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/kodi/package.mk
similarity index 95%
rename from packages/mediacenter/xbmc/package.mk
rename to packages/mediacenter/kodi/package.mk
index 58c6c9fbfa..17e949015f 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -16,19 +16,19 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="xbmc"
+PKG_NAME="kodi"
 PKG_VERSION="14-71f2030"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.xbmc.org"
+PKG_SITE="http://www.kodi.tv"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain boost Python zlib bzip2 systemd pciutils lzo pcre swig:host libass enca curl rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libogg libcdio libmodplug libmpeg2 taglib libxml2 libxslt yajl sqlite libvorbis ffmpeg xbmc:host"
+PKG_DEPENDS_TARGET="toolchain boost Python zlib bzip2 systemd pciutils lzo pcre swig:host libass enca curl rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libogg libcdio libmodplug libmpeg2 taglib libxml2 libxslt yajl sqlite libvorbis ffmpeg kodi:host"
 PKG_DEPENDS_HOST="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
-PKG_SHORTDESC="xbmc: XBMC Mediacenter"
-PKG_LONGDESC="XBMC Media Center (which was formerly named Xbox Media Center) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control."
+PKG_SHORTDESC="kodi: Kodi Mediacenter"
+PKG_LONGDESC="Kodi Media Center (which was formerly named Xbox Media Center or XBMC) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
@@ -352,7 +352,7 @@ PKG_CONFIGURE_OPTS_TARGET="gl_cv_func_gettimeofday_clobber=no \
                            $KODI_PLAYER"
 
 pre_configure_host() {
-# xbmc fails to build in subdirs
+# kodi fails to build in subdirs
   cd $ROOT/$PKG_BUILD
     rm -rf .$HOST_NAME
 }
@@ -375,14 +375,14 @@ pre_build_target() {
 }
 
 pre_configure_target() {
-# xbmc fails to build in subdirs
+# kodi fails to build in subdirs
   cd $ROOT/$PKG_BUILD
     rm -rf .$TARGET_NAME
 
-# xbmc fails to build with LTO optimization if build without GOLD support
+# kodi fails to build with LTO optimization if build without GOLD support
   [ ! "$GOLD_SUPPORT" = "yes" ] && strip_lto
 
-# Todo: XBMC segfaults on exit when building with LTO support
+# Todo: kodi segfaults on exit when building with LTO support
   strip_lto
 
   export CFLAGS="$CFLAGS $KODI_CFLAGS"
diff --git a/packages/mediacenter/xbmc/patches/xbmc-001.01-xbmc-rebrand.patch b/packages/mediacenter/kodi/patches/kodi-001.01-xbmc-rebrand.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-001.01-xbmc-rebrand.patch
rename to packages/mediacenter/kodi/patches/kodi-001.01-xbmc-rebrand.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-051-add_ouya_controller_keymap.patch b/packages/mediacenter/kodi/patches/kodi-051-add_ouya_controller_keymap.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-051-add_ouya_controller_keymap.patch
rename to packages/mediacenter/kodi/patches/kodi-051-add_ouya_controller_keymap.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-052-ps4_controller_support.patch b/packages/mediacenter/kodi/patches/kodi-052-ps4_controller_support.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-052-ps4_controller_support.patch
rename to packages/mediacenter/kodi/patches/kodi-052-ps4_controller_support.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-101-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/kodi/patches/kodi-101-fix_libdvd_xFLAGS-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-101-fix_libdvd_xFLAGS-0.1.patch
rename to packages/mediacenter/kodi/patches/kodi-101-fix_libdvd_xFLAGS-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-103-disable-online-check.patch b/packages/mediacenter/kodi/patches/kodi-103-disable-online-check.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-103-disable-online-check.patch
rename to packages/mediacenter/kodi/patches/kodi-103-disable-online-check.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-104-use-udevil-to-umount.patch b/packages/mediacenter/kodi/patches/kodi-104-use-udevil-to-umount.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-104-use-udevil-to-umount.patch
rename to packages/mediacenter/kodi/patches/kodi-104-use-udevil-to-umount.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-200-make-binary-addons-executable.patch b/packages/mediacenter/kodi/patches/kodi-200-make-binary-addons-executable.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-200-make-binary-addons-executable.patch
rename to packages/mediacenter/kodi/patches/kodi-200-make-binary-addons-executable.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-501-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/kodi/patches/kodi-501-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-501-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
rename to packages/mediacenter/kodi/patches/kodi-501-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-502-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/kodi/patches/kodi-502-add_openelec.tv_RSS_news-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-502-add_openelec.tv_RSS_news-0.1.patch
rename to packages/mediacenter/kodi/patches/kodi-502-add_openelec.tv_RSS_news-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch b/packages/mediacenter/kodi/patches/kodi-990.15-depends-mark_our_wrapped_functions_as_used.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch
rename to packages/mediacenter/kodi/patches/kodi-990.15-depends-mark_our_wrapped_functions_as_used.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta.patch b/packages/mediacenter/kodi/patches/kodi-995.01-fernetmenta.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta.patch
rename to packages/mediacenter/kodi/patches/kodi-995.01-fernetmenta.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.02-dont-set-_NET_WM_STATE_FULLSCREEN.patch b/packages/mediacenter/kodi/patches/kodi-995.02-dont-set-_NET_WM_STATE_FULLSCREEN.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-995.02-dont-set-_NET_WM_STATE_FULLSCREEN.patch
rename to packages/mediacenter/kodi/patches/kodi-995.02-dont-set-_NET_WM_STATE_FULLSCREEN.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.10-disable-minimize.patch b/packages/mediacenter/kodi/patches/kodi-995.10-disable-minimize.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-995.10-disable-minimize.patch
rename to packages/mediacenter/kodi/patches/kodi-995.10-disable-minimize.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.12-openelec-setup-timezone.patch b/packages/mediacenter/kodi/patches/kodi-995.12-openelec-setup-timezone.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-995.12-openelec-setup-timezone.patch
rename to packages/mediacenter/kodi/patches/kodi-995.12-openelec-setup-timezone.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.00-service-addons-use-a-wrapper-to-setup-systemd.patch b/packages/mediacenter/kodi/patches/kodi-999.00-service-addons-use-a-wrapper-to-setup-systemd.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-999.00-service-addons-use-a-wrapper-to-setup-systemd.patch
rename to packages/mediacenter/kodi/patches/kodi-999.00-service-addons-use-a-wrapper-to-setup-systemd.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.03-0001-handle-SIGTERM.patch b/packages/mediacenter/kodi/patches/kodi-999.03-0001-handle-SIGTERM.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-999.03-0001-handle-SIGTERM.patch
rename to packages/mediacenter/kodi/patches/kodi-999.03-0001-handle-SIGTERM.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.90-show_rss-setting_in_standard_group.patch b/packages/mediacenter/kodi/patches/kodi-999.90-show_rss-setting_in_standard_group.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-999.90-show_rss-setting_in_standard_group.patch
rename to packages/mediacenter/kodi/patches/kodi-999.90-show_rss-setting_in_standard_group.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.91-PR5306.patch b/packages/mediacenter/kodi/patches/kodi-999.91-PR5306.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-999.91-PR5306.patch
rename to packages/mediacenter/kodi/patches/kodi-999.91-PR5306.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.93-fullscreen.patch b/packages/mediacenter/kodi/patches/kodi-999.93-fullscreen.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-999.93-fullscreen.patch
rename to packages/mediacenter/kodi/patches/kodi-999.93-fullscreen.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.94-add_devinput_KEY_TV.patch b/packages/mediacenter/kodi/patches/kodi-999.94-add_devinput_KEY_TV.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-999.94-add_devinput_KEY_TV.patch
rename to packages/mediacenter/kodi/patches/kodi-999.94-add_devinput_KEY_TV.patch
diff --git a/packages/mediacenter/xbmc/profile.d/02-kodi.conf b/packages/mediacenter/kodi/profile.d/02-kodi.conf
similarity index 100%
rename from packages/mediacenter/xbmc/profile.d/02-kodi.conf
rename to packages/mediacenter/kodi/profile.d/02-kodi.conf
diff --git a/packages/mediacenter/xbmc/profile.d/03-addons.conf b/packages/mediacenter/kodi/profile.d/03-addons.conf
similarity index 100%
rename from packages/mediacenter/xbmc/profile.d/03-addons.conf
rename to packages/mediacenter/kodi/profile.d/03-addons.conf
diff --git a/packages/mediacenter/xbmc/scripts/cputemp b/packages/mediacenter/kodi/scripts/cputemp
similarity index 100%
rename from packages/mediacenter/xbmc/scripts/cputemp
rename to packages/mediacenter/kodi/scripts/cputemp
diff --git a/packages/mediacenter/xbmc/scripts/kodi-config b/packages/mediacenter/kodi/scripts/kodi-config
similarity index 100%
rename from packages/mediacenter/xbmc/scripts/kodi-config
rename to packages/mediacenter/kodi/scripts/kodi-config
diff --git a/packages/mediacenter/xbmc/scripts/kodi-hacks b/packages/mediacenter/kodi/scripts/kodi-hacks
similarity index 100%
rename from packages/mediacenter/xbmc/scripts/kodi-hacks
rename to packages/mediacenter/kodi/scripts/kodi-hacks
diff --git a/packages/mediacenter/xbmc/scripts/kodi-rebrand b/packages/mediacenter/kodi/scripts/kodi-rebrand
similarity index 100%
rename from packages/mediacenter/xbmc/scripts/kodi-rebrand
rename to packages/mediacenter/kodi/scripts/kodi-rebrand
diff --git a/packages/mediacenter/xbmc/scripts/kodi-sources b/packages/mediacenter/kodi/scripts/kodi-sources
similarity index 100%
rename from packages/mediacenter/xbmc/scripts/kodi-sources
rename to packages/mediacenter/kodi/scripts/kodi-sources
diff --git a/packages/mediacenter/xbmc/scripts/setwakeup.sh b/packages/mediacenter/kodi/scripts/setwakeup.sh
similarity index 100%
rename from packages/mediacenter/xbmc/scripts/setwakeup.sh
rename to packages/mediacenter/kodi/scripts/setwakeup.sh
diff --git a/packages/mediacenter/xbmc/scripts/systemd-addon-wrapper b/packages/mediacenter/kodi/scripts/systemd-addon-wrapper
similarity index 100%
rename from packages/mediacenter/xbmc/scripts/systemd-addon-wrapper
rename to packages/mediacenter/kodi/scripts/systemd-addon-wrapper
diff --git a/packages/mediacenter/xbmc/sleep.d.serial/10-addon-sleep.sh b/packages/mediacenter/kodi/sleep.d.serial/10-addon-sleep.sh
similarity index 100%
rename from packages/mediacenter/xbmc/sleep.d.serial/10-addon-sleep.sh
rename to packages/mediacenter/kodi/sleep.d.serial/10-addon-sleep.sh
diff --git a/packages/mediacenter/xbmc/sleep.d.serial/20-custon-sleep.sh b/packages/mediacenter/kodi/sleep.d.serial/20-custon-sleep.sh
similarity index 100%
rename from packages/mediacenter/xbmc/sleep.d.serial/20-custon-sleep.sh
rename to packages/mediacenter/kodi/sleep.d.serial/20-custon-sleep.sh
diff --git a/packages/mediacenter/xbmc/sleep.d/openelec-sleep.sh b/packages/mediacenter/kodi/sleep.d/openelec-sleep.sh
similarity index 100%
rename from packages/mediacenter/xbmc/sleep.d/openelec-sleep.sh
rename to packages/mediacenter/kodi/sleep.d/openelec-sleep.sh
diff --git a/packages/mediacenter/xbmc/splash/splash.png b/packages/mediacenter/kodi/splash/splash.png
similarity index 100%
rename from packages/mediacenter/xbmc/splash/splash.png
rename to packages/mediacenter/kodi/splash/splash.png
diff --git a/packages/mediacenter/xbmc/splash/splash1.png b/packages/mediacenter/kodi/splash/splash1.png
similarity index 100%
rename from packages/mediacenter/xbmc/splash/splash1.png
rename to packages/mediacenter/kodi/splash/splash1.png
diff --git a/packages/mediacenter/xbmc/system.d/kodi-autostart.service b/packages/mediacenter/kodi/system.d/kodi-autostart.service
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi-autostart.service
rename to packages/mediacenter/kodi/system.d/kodi-autostart.service
diff --git a/packages/mediacenter/xbmc/system.d/kodi-cleanlogs.service b/packages/mediacenter/kodi/system.d/kodi-cleanlogs.service
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi-cleanlogs.service
rename to packages/mediacenter/kodi/system.d/kodi-cleanlogs.service
diff --git a/packages/mediacenter/xbmc/system.d/kodi-hacks.service b/packages/mediacenter/kodi/system.d/kodi-hacks.service
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi-hacks.service
rename to packages/mediacenter/kodi/system.d/kodi-hacks.service
diff --git a/packages/mediacenter/xbmc/system.d/kodi-halt.service b/packages/mediacenter/kodi/system.d/kodi-halt.service
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi-halt.service
rename to packages/mediacenter/kodi/system.d/kodi-halt.service
diff --git a/packages/mediacenter/xbmc/system.d/kodi-lirc-suspend.service b/packages/mediacenter/kodi/system.d/kodi-lirc-suspend.service
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi-lirc-suspend.service
rename to packages/mediacenter/kodi/system.d/kodi-lirc-suspend.service
diff --git a/packages/mediacenter/xbmc/system.d/kodi-poweroff.service b/packages/mediacenter/kodi/system.d/kodi-poweroff.service
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi-poweroff.service
rename to packages/mediacenter/kodi/system.d/kodi-poweroff.service
diff --git a/packages/mediacenter/xbmc/system.d/kodi-reboot.service b/packages/mediacenter/kodi/system.d/kodi-reboot.service
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi-reboot.service
rename to packages/mediacenter/kodi/system.d/kodi-reboot.service
diff --git a/packages/mediacenter/xbmc/system.d/kodi-rebrand.service b/packages/mediacenter/kodi/system.d/kodi-rebrand.service
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi-rebrand.service
rename to packages/mediacenter/kodi/system.d/kodi-rebrand.service
diff --git a/packages/mediacenter/xbmc/system.d/kodi-sources.service b/packages/mediacenter/kodi/system.d/kodi-sources.service
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi-sources.service
rename to packages/mediacenter/kodi/system.d/kodi-sources.service
diff --git a/packages/mediacenter/xbmc/system.d/kodi-waitonnetwork.service b/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi-waitonnetwork.service
rename to packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service
diff --git a/packages/mediacenter/xbmc/system.d/kodi.service b/packages/mediacenter/kodi/system.d/kodi.service
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi.service
rename to packages/mediacenter/kodi/system.d/kodi.service
diff --git a/packages/mediacenter/xbmc/system.d/kodi.target b/packages/mediacenter/kodi/system.d/kodi.target
similarity index 100%
rename from packages/mediacenter/xbmc/system.d/kodi.target
rename to packages/mediacenter/kodi/system.d/kodi.target
diff --git a/packages/mediacenter/xbmc/tmpfiles.d/kodi-userdirs.conf b/packages/mediacenter/kodi/tmpfiles.d/kodi-userdirs.conf
similarity index 100%
rename from packages/mediacenter/xbmc/tmpfiles.d/kodi-userdirs.conf
rename to packages/mediacenter/kodi/tmpfiles.d/kodi-userdirs.conf
diff --git a/packages/mediacenter/xbmc/tmpfiles.d/kodi.conf b/packages/mediacenter/kodi/tmpfiles.d/kodi.conf
similarity index 100%
rename from packages/mediacenter/xbmc/tmpfiles.d/kodi.conf
rename to packages/mediacenter/kodi/tmpfiles.d/kodi.conf
diff --git a/projects/Cuboxi/patches/xbmc/xbmc-999.99-AESinkALSA_Set_correct_value_for_AES3_when_using_HBR_mode.patch b/projects/Cuboxi/patches/kodi/kodi-999.99-AESinkALSA_Set_correct_value_for_AES3_when_using_HBR_mode.patch
similarity index 100%
rename from projects/Cuboxi/patches/xbmc/xbmc-999.99-AESinkALSA_Set_correct_value_for_AES3_when_using_HBR_mode.patch
rename to projects/Cuboxi/patches/kodi/kodi-999.99-AESinkALSA_Set_correct_value_for_AES3_when_using_HBR_mode.patch
diff --git a/projects/Cuboxi/patches/xbmc/xbmc-999.99-relax_sink_buffersize_check.patch b/projects/Cuboxi/patches/kodi/kodi-999.99-relax_sink_buffersize_check.patch
similarity index 100%
rename from projects/Cuboxi/patches/xbmc/xbmc-999.99-relax_sink_buffersize_check.patch
rename to projects/Cuboxi/patches/kodi/kodi-999.99-relax_sink_buffersize_check.patch
diff --git a/projects/RPi/patches/xbmc/xbmc-001-newclock4.patch b/projects/RPi/patches/kodi/kodi-001-newclock4.patch
similarity index 100%
rename from projects/RPi/patches/xbmc/xbmc-001-newclock4.patch
rename to projects/RPi/patches/kodi/kodi-001-newclock4.patch
diff --git a/tools/mkpkg/mkpkg_xbmc b/tools/mkpkg/mkpkg_kodi
similarity index 76%
rename from tools/mkpkg/mkpkg_xbmc
rename to tools/mkpkg/mkpkg_kodi
index 2ca16369b4..a7e1d5dc19 100755
--- a/tools/mkpkg/mkpkg_xbmc
+++ b/tools/mkpkg/mkpkg_kodi
@@ -19,7 +19,7 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="xbmc"
+PKG_NAME="kodi"
 PKG_VERSION=""
 GIT_REPO="-b master git://github.com/xbmc/xbmc.git"
 DEST_DIR="$PKG_NAME"
@@ -53,24 +53,6 @@ echo "seperating theme..."
   rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
   mv $PKG_NAME-$PKG_VERSION/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION
 
-echo "cleaning sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION/visualisations
-  rm -rf $PKG_NAME-$PKG_VERSION/lib/libSDL-*
-  rm -rf $PKG_NAME-$PKG_VERSION/lib/libcurl-*
-
-  for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
-           "PackageMaker" "Translator" "XBMCLive" "XprPack" \
-           "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
-    rm -rf $PKG_NAME-$PKG_VERSION/tools/$i
-  done
-
-  for i in dll a lib so bat; do
-    find $PKG_NAME-$PKG_VERSION -name *.$i -exec rm -rf {} ";"
-  done
-
-  # bundled win32 binaries
-  rm -r $PKG_NAME-$PKG_VERSION/xbmc/visualizations/XBMCProjectM/win32
-
 echo "packing sources..."
   tar cvJf $PKG_NAME-$PKG_VERSION.tar.xz $PKG_NAME-$PKG_VERSION
   tar cvJf $PKG_NAME-theme-Confluence-$PKG_VERSION.tar.xz $PKG_NAME-theme-Confluence-$PKG_VERSION