diff --git a/packages/mediacenter/xbmc-audioencoder-wav/package.mk b/packages/mediacenter/kodi-audioencoder-wav/package.mk
similarity index 85%
rename from packages/mediacenter/xbmc-audioencoder-wav/package.mk
rename to packages/mediacenter/kodi-audioencoder-wav/package.mk
index 1df9114134..75b32d9607 100644
--- a/packages/mediacenter/xbmc-audioencoder-wav/package.mk
+++ b/packages/mediacenter/kodi-audioencoder-wav/package.mk
@@ -16,18 +16,18 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="xbmc-audioencoder-wav"
+PKG_NAME="kodi-audioencoder-wav"
 PKG_VERSION="91a2b72"
 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"
+PKG_DEPENDS_TARGET="toolchain kodi"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
-PKG_SHORTDESC="xbmc-audioencoder-wav: A audioencoder addon for XBMC"
-PKG_LONGDESC="xbmc-audioencoder-wav is a audioencoder addon for XBMC"
+PKG_SHORTDESC="kodi-audioencoder-wav: A audioencoder addon for Kodi"
+PKG_LONGDESC="kodi-audioencoder-wav is a audioencoder addon for Kodi"
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
diff --git a/packages/mediacenter/xbmc-audioencoder-wav/patches/xbmc-audioencoder-wav-xbmc-rebrand.patch b/packages/mediacenter/kodi-audioencoder-wav/patches/kodi-audioencoder-wav-xbmc-rebrand.patch
similarity index 100%
rename from packages/mediacenter/xbmc-audioencoder-wav/patches/xbmc-audioencoder-wav-xbmc-rebrand.patch
rename to packages/mediacenter/kodi-audioencoder-wav/patches/kodi-audioencoder-wav-xbmc-rebrand.patch
diff --git a/tools/mkpkg/mkpkg_xbmc-audioencoder-wav b/tools/mkpkg/mkpkg_kodi-audioencoder-wav
similarity index 78%
rename from tools/mkpkg/mkpkg_xbmc-audioencoder-wav
rename to tools/mkpkg/mkpkg_kodi-audioencoder-wav
index c2180b9bd5..dd740205f5 100755
--- a/tools/mkpkg/mkpkg_xbmc-audioencoder-wav
+++ b/tools/mkpkg/mkpkg_kodi-audioencoder-wav
@@ -20,24 +20,24 @@
 ################################################################################
 
 echo "getting sources..."
-  if [ ! -d xbmc-audioencoder-wav.git ]; then
-    git clone https://github.com/xbmc/audioencoder.wav.git -b master xbmc-audioencoder-wav.git
+  if [ ! -d kodi-audioencoder-wav.git ]; then
+    git clone https://github.com/xbmc/audioencoder.wav.git -b master kodi-audioencoder-wav.git
   fi
 
-  cd xbmc-audioencoder-wav.git
+  cd kodi-audioencoder-wav.git
     git pull
     GIT_REV=`git log -n1 --format=%h`
   cd ..
 
 echo "copying sources..."
-  rm -rf xbmc-audioencoder-wav-$GIT_REV
-  cp -R xbmc-audioencoder-wav.git xbmc-audioencoder-wav-$GIT_REV
+  rm -rf kodi-audioencoder-wav-$GIT_REV
+  cp -R kodi-audioencoder-wav.git kodi-audioencoder-wav-$GIT_REV
 
 echo "cleaning sources..."
-  rm -rf xbmc-audioencoder-wav-$GIT_REV/.git
+  rm -rf kodi-audioencoder-wav-$GIT_REV/.git
 
 echo "packing sources..."
-  tar cvJf xbmc-audioencoder-wav-$GIT_REV.tar.xz xbmc-audioencoder-wav-$GIT_REV
+  tar cvJf kodi-audioencoder-wav-$GIT_REV.tar.xz kodi-audioencoder-wav-$GIT_REV
 
 echo "remove temporary sourcedir..."
-  rm -rf xbmc-audioencoder-wav-$GIT_REV
+  rm -rf kodi-audioencoder-wav-$GIT_REV