diff --git a/packages/audio/dcadec/package.mk b/packages/audio/dcadec/package.mk
index 40318963a2..59a5a6d2a2 100644
--- a/packages/audio/dcadec/package.mk
+++ b/packages/audio/dcadec/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="dcadec"
-PKG_VERSION="37d8e68"
+PKG_VERSION="0e07438"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/devel/arm-mem/package.mk b/packages/devel/arm-mem/package.mk
index 4f84f26fcb..7dc796fe2a 100644
--- a/packages/devel/arm-mem/package.mk
+++ b/packages/devel/arm-mem/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="arm-mem"
-PKG_VERSION="4418bb4"
+PKG_VERSION="3aee5f4"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
@@ -33,16 +33,11 @@ PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from s
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-if [  "$TARGET_CPU" = "arm1176jzf-s" ]; then
-  ARMMEM_SO=libarmmem.so
-elif [  "$TARGET_CPU" = "cortex-a7" ]; then
-  ARMMEM_SO=libarmmem-a7.so
-fi
-
-PKG_MAKE_OPTS_TARGET="$ARMMEM_SO"
+PKG_MAKE_OPTS_TARGET="libarmmem.so"
 
 pre_make_target() {
   export CROSS_COMPILE=$TARGET_PREFIX
+  export CFLAGS="$CFLAGS -fPIC"
 }
 
 make_init() {
@@ -51,17 +46,17 @@ make_init() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/lib
-    cp -P $ARMMEM_SO $INSTALL/lib
+    cp -P libarmmem.so $INSTALL/lib
 
   mkdir -p $INSTALL/etc
-    echo "/lib/$ARMMEM_SO" >> $INSTALL/etc/ld.so.preload
+    echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
 }
 
 makeinstall_init() {
   mkdir -p $INSTALL/lib
-    cp -P $ARMMEM_SO $INSTALL/lib
+    cp -P libarmmem.so $INSTALL/lib
 
   mkdir -p $INSTALL/etc
-    echo "/lib/$ARMMEM_SO" >> $INSTALL/etc/ld.so.preload
+    echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
 }
 
diff --git a/packages/devel/json-c/package.mk b/packages/devel/json-c/package.mk
index e61da59d65..0285bb0f19 100644
--- a/packages/devel/json-c/package.mk
+++ b/packages/devel/json-c/package.mk
@@ -18,7 +18,7 @@
 ################################################################################
 
 PKG_NAME="json-c"
-PKG_VERSION="0645020"
+PKG_VERSION="537f8bc"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/devel/libcap/package.mk b/packages/devel/libcap/package.mk
index 54a6ce3bfd..8b049e925f 100644
--- a/packages/devel/libcap/package.mk
+++ b/packages/devel/libcap/package.mk
@@ -18,14 +18,14 @@
 ################################################################################
 
 PKG_NAME="libcap"
-PKG_VERSION="2.24"
+PKG_VERSION="2.25"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE=""
 PKG_URL="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_DEPENDS_TARGET="toolchain attr"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="libcap: A library for getting and setting POSIX.1e capabilities"
@@ -50,7 +50,7 @@ make_host() {
        CFLAGS="$HOST_CFLAGS" \
        BUILD_CC=$HOST_CC \
        BUILD_CFLAGS="$HOST_CFLAGS -I$ROOT/$PKG_BUILD/libcap/include" \
-       PAM_CAP=no LIBATTR=no \
+       PAM_CAP=no \
        lib=/lib \
        -C libcap libcap.pc libcap.a
 }
diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index 475ca34bb9..d55b3dac16 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="mesa"
-PKG_VERSION="11.2.0-rc2"
+PKG_VERSION="11.2.0-rc3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
diff --git a/packages/linux-drivers/RTL8192DU/package.mk b/packages/linux-drivers/RTL8192DU/package.mk
index 06a21276d3..5cbfcb9f12 100644
--- a/packages/linux-drivers/RTL8192DU/package.mk
+++ b/packages/linux-drivers/RTL8192DU/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="RTL8192DU"
-PKG_VERSION="7498302"
+PKG_VERSION="9e7eb15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/linux-drivers/RTL8192DU/patches/RTL8192DU-fix-build-kernel-4.2.patch b/packages/linux-drivers/RTL8192DU/patches/RTL8192DU-fix-build-kernel-4.2.patch
deleted file mode 100644
index ab9010dfd2..0000000000
--- a/packages/linux-drivers/RTL8192DU/patches/RTL8192DU-fix-build-kernel-4.2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9e7eb15c74779150e7cc7229a06335a579366f2a Mon Sep 17 00:00:00 2001
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Mon, 28 Sep 2015 19:55:49 -0500
-Subject: [PATCH] rtl8192du: Fix build on kernel 4.2
-
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
----
- os_dep/ioctl_cfg80211.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c
-index a2bc7ed..7054e3a 100644
---- a/os_dep/ioctl_cfg80211.c
-+++ b/os_dep/ioctl_cfg80211.c
-@@ -491,8 +491,13 @@ void rtw_cfg80211_indicate_disconnect(struct rtw_adapter *padapter)
- 						WLAN_STATUS_UNSPECIFIED_FAILURE,
- 						GFP_ATOMIC/*GFP_KERNEL*/);
- 		} else {
--			cfg80211_disconnected(padapter->pnetdev, 0, NULL,
--					      0, GFP_ATOMIC);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
-+			cfg80211_disconnected(padapter->pnetdev, 0,
-+					      NULL, 0, true, GFP_ATOMIC);
-+#else
-+			cfg80211_disconnected(padapter->pnetdev, 0, NULL, 0,
-+					      GFP_ATOMIC);
-+#endif
- 		}
- 	}
- }
diff --git a/packages/linux-drivers/RTL8192EU/package.mk b/packages/linux-drivers/RTL8192EU/package.mk
index 56745eb2e2..bc3c59fdb2 100644
--- a/packages/linux-drivers/RTL8192EU/package.mk
+++ b/packages/linux-drivers/RTL8192EU/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="RTL8192EU"
-PKG_VERSION="6793bae"
+PKG_VERSION="a322c84"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/linux-firmware/cpu-firmware/package.mk b/packages/linux-firmware/cpu-firmware/package.mk
new file mode 100644
index 0000000000..5fde7988bb
--- /dev/null
+++ b/packages/linux-firmware/cpu-firmware/package.mk
@@ -0,0 +1,55 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2016 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="cpu-firmware"
+PKG_VERSION="5e23731"
+PKG_REV="1"
+PKG_ARCH="i386 x86_64"
+PKG_LICENSE="other"
+PKG_SITE="https://git.fedorahosted.org/cgit/microcode_ctl.git"
+PKG_URL="https://git.fedorahosted.org/cgit/microcode_ctl.git/snapshot/$PKG_VERSION.tar.xz"
+PKG_SOURCE_DIR="$PKG_VERSION"
+PKG_DEPENDS_INIT="toolchain"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="linux-firmware"
+PKG_SHORTDESC="cpu-microcode: Intel and AMD CPU microcodes"
+PKG_LONGDESC="cpu-microcode: Intel and AMD CPU microcodes"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+make_init() {
+  PREFIX=/
+  MICDIR=/lib/firmware
+  make
+}
+
+makeinstall_init() {
+  DESTDIR=$INSTALL make install
+}
+
+make_target() {
+  PREFIX=/
+  MICDIR=/lib/firmware
+  make
+}
+
+makeinstall_target() {
+  DESTDIR=$INSTALL make install
+}
diff --git a/packages/linux-firmware/cpu-firmware/patches/cpu-firmware-0001-fix-makefile.patch b/packages/linux-firmware/cpu-firmware/patches/cpu-firmware-0001-fix-makefile.patch
new file mode 100644
index 0000000000..0e797e0c64
--- /dev/null
+++ b/packages/linux-firmware/cpu-firmware/patches/cpu-firmware-0001-fix-makefile.patch
@@ -0,0 +1,66 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2016-01-12 07:14:57.000000000 -0800
++++ b/Makefile	2016-03-19 13:59:39.937499052 -0700
+@@ -14,34 +14,25 @@
+ MICROCODE_AMD   = amd-ucode-2012-09-10.tar
+ 
+ INS             = install
+-CC              = gcc
+-KERNELHEADER    = /usr/src/linux/include
++CC              ?= gcc
++KERNELHEADER    ?= /usr/src/linux/include
+ CFLAGS          = -g -Wall -O2 -I $(KERNELHEADER)
+ 
+-DESTDIR         =
+-PREFIX          = /usr/local
++DESTDIR         ?=
++PREFIX          ?= /usr/local
+ 
+ INSDIR          = $(PREFIX)/sbin
+ MANDIR          = $(PREFIX)/share/man/man8
+ DOCDIR          = $(PREFIX)/share/doc/microcode_ctl
+-MICDIR          = /lib/firmware
++MICDIR          ?= /lib/firmware
+ MICDIRAMD       = $(MICDIR)/amd-ucode
+ 
+-RCFILE          = microcode_ctl.start
+-RCFILEFINAL     = microcode_ctl
+-# this is a bit nasty...
+-RCDIR           = $(shell if [ -d /etc/init.d ]; then echo "/etc"; else echo "/etc/rc.d"; fi)
+-RCHOMEDIR       = init.d
+-RCFILETO        = $(RCDIR)/$(RCHOMEDIR)
+-
+ all: microcode_ctl
+ 
+-microcode_ctl: microcode_ctl.c
+-	$(CC) $(CFLAGS) -o $(PROGRAM) microcode_ctl.c
+-	mkdir intel-ucode amd-ucode
++microcode_ctl:
++	mkdir -p intel-ucode amd-ucode
+ 	tar xfz $(MICROCODE_INTEL) -C intel-ucode
+ 	tar --strip-components 1 -xf $(MICROCODE_AMD) -C amd-ucode
+-	echo "$(RCDIR)/$(RCHOMEDIR)/microcode_ctl" > microcode-filelist
+ 
+ clean:
+ 	rm -rf $(PROGRAM) intel-ucode amd-ucode
+@@ -50,20 +41,9 @@
+ 	$(INS) -d $(DESTDIR)$(INSDIR) $(DESTDIR)$(MICDIRAMD) \
+ 			$(DESTDIR)$(MANDIR) $(DESTDIR)$(RCFILETO) \
+ 			$(DESTDIR)$(RCLINKTO) $(DESTDIR)$(DOCDIR)
+-	$(INS) -m 755 $(PROGRAM) $(DESTDIR)$(INSDIR)
+-	$(INS) -m 644 $(MANPAGE) $(DESTDIR)$(MANDIR)
+-	gzip -9f $(DESTDIR)$(MANDIR)/$(MANPAGE)
+-	$(INS) -m 755 $(RCFILE) $(DESTDIR)$(RCFILETO)/$(RCFILEFINAL)
+ 	$(INS) -m 644 intel-ucode/microcode.dat $(DESTDIR)$(MICDIR)
+ 	$(INS) -m 644 amd-ucode/microcode_amd.bin $(DESTDIR)$(MICDIR)/amd-ucode/
+ 	$(INS) -m 644 amd-ucode/microcode_amd_fam15h.bin $(DESTDIR)$(MICDIR)/amd-ucode/
+-	$(INS) -m 644 amd-ucode/microcode_amd.bin.README \
+-		$(DESTDIR)$(DOCDIR)/README.microcode_amd.bin
+-	$(INS) -m 644 amd-ucode/microcode_amd_fam15h.bin.README \
+-		$(DESTDIR)$(DOCDIR)/README.microcode_amd_fam15h.bin
+-	$(INS) -m 644 amd-ucode/LICENSE $(DESTDIR)$(DOCDIR)/LICENSE.microcode_amd
+-	$(INS) -m 644 amd-ucode/README $(DESTDIR)$(DOCDIR)/README.microcode_amd
+-	$(INS) -m 644 amd-ucode/INSTALL $(DESTDIR)$(DOCDIR)/INSTALL.microcode_amd
+ 
+ ifndef DESTDIR
+ 		chkconfig --add $(RCFILEFINAL)
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 7f0f4c6f39..dfebdc6412 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -23,7 +23,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host pciutils xz:host wireless-regdb keyutils"
-PKG_DEPENDS_INIT="toolchain"
+PKG_DEPENDS_INIT="toolchain cpu-firmware:init"
 PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="linux"
diff --git a/packages/multimedia/libva-intel-driver/package.mk b/packages/multimedia/libva-intel-driver/package.mk
index 3dcd68ec19..dac7575200 100644
--- a/packages/multimedia/libva-intel-driver/package.mk
+++ b/packages/multimedia/libva-intel-driver/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libva-intel-driver"
-PKG_VERSION="1.6.2"
+PKG_VERSION="1.7.0"
 PKG_REV="1"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
diff --git a/packages/multimedia/libva/package.mk b/packages/multimedia/libva/package.mk
index 3fa4049773..14653d11cd 100644
--- a/packages/multimedia/libva/package.mk
+++ b/packages/multimedia/libva/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libva"
-PKG_VERSION="1.6.2"
+PKG_VERSION="1.7.0"
 PKG_REV="1"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
diff --git a/packages/network/libshairplay/package.mk b/packages/network/libshairplay/package.mk
index 204df1a85f..73dbf344d9 100644
--- a/packages/network/libshairplay/package.mk
+++ b/packages/network/libshairplay/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libshairplay"
-PKG_VERSION="498bc5b"
+PKG_VERSION="ce80e00"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk
index 854b613fd5..b99387493b 100644
--- a/packages/network/samba/package.mk
+++ b/packages/network/samba/package.mk
@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.samba.org"
 PKG_URL="http://samba.org/samba/ftp/stable/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain zlib attr connman"
+PKG_DEPENDS_TARGET="toolchain zlib connman"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="samba: The free SMB / CIFS fileserver and client"
diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk
index 9e41f75e95..9c13d9779a 100644
--- a/packages/sysutils/busybox/package.mk
+++ b/packages/sysutils/busybox/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="busybox"
-PKG_VERSION="1.24.1"
+PKG_VERSION="1.24.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index 0f8bfc5651..7283acdee5 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -57,6 +57,11 @@
 
   LIVE="no"
 
+  # load cpu firmware if possible
+  if [ -e /sys/devices/system/cpu/microcode/reload ]; then
+    echo 1 > /sys/devices/system/cpu/microcode/reload
+  fi
+
   # hide kernel log messages on console
   echo '1 4 1 7' > /proc/sys/kernel/printk
 
diff --git a/projects/imx6/options b/projects/imx6/options
index c6716d9617..1161fc5e83 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -122,7 +122,7 @@
   # for a list of additinoal drivers see packages/linux-drivers
   # Space separated list is supported,
   # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-    ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU RTL8812AU dvbhdhomerun"
+    ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU dvbhdhomerun"
 
   # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
   # Space separated list is supported,
diff --git a/tools/mkpkg/mkpkg_binary-addons b/tools/mkpkg/update_binary-addons
similarity index 70%
rename from tools/mkpkg/mkpkg_binary-addons
rename to tools/mkpkg/update_binary-addons
index fabb8c2d32..526275d4dc 100755
--- a/tools/mkpkg/mkpkg_binary-addons
+++ b/tools/mkpkg/update_binary-addons
@@ -47,30 +47,6 @@ git_clone() {
   fi
 }
 
-copy_sources() {
-  # copy_sources source_dir package_name package_version
-  if [ -d "$1" ] ; then
-    echo "[mkpkg] Copying sources: $2-$3" ...
-    rm -rf "$2-$3"
-    cp -R "$1" "$2-$3"
-    echo "$GIT_HASH" > "$2-$3/VERSION"
-
-    echo "[mkpkg] Cleaning $2-$3 ..."
-    rm -rf "$2-$3/.git"
-  fi
-}
-
-package_sources() {
-  # package_sources source_dir
-  if [ -d "$1" ] ; then
-    echo "[mkpkg] Packing $1.tar.xz ..."
-    if [ ! -f "$1.tar.xz" ] ; then
-      tar cvJf "$1.tar.xz" "$1"
-    fi
-    rm -rf "$1"
-  fi
-}
-
 resolve_hash() {
   if [ -d "$1" ] ; then
     cd "$1"
@@ -78,20 +54,6 @@ resolve_hash() {
   fi
 }
 
-copy_and_package() {
-  REPO="$1"
-  PKG_NAME="$2"
-  GIT_HASH="$3"
-  git_clone $REPO master $PKG_NAME.git $GIT_HASH
-  RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
-  if [ ! -e $PKG_NAME-$RESOLVED_HASH.tar.xz ] ; then
-    copy_sources $PKG_NAME.git $PKG_NAME $RESOLVED_HASH
-    package_sources $PKG_NAME-$RESOLVED_HASH
-  else
-    echo "[mkpkg] $PKG_NAME-$RESOLVED_HASH.tar.xz already exists ..."
-  fi
-}
-
 if [ ! -d $KODI_DIR ] ; then
   echo "meh.. $KODI_DIR does not exist"
   exit 127
@@ -100,26 +62,32 @@ fi
 # platform
 REPO=$(cat $KODI_DIR/project/cmake/addons/depends/common/platform/platform.txt | awk '{print $2}')
 GIT_HASH=$(cat $KODI_DIR/project/cmake/addons/depends/common/platform/platform.txt | awk '{print $3}')
+PKG_NAME="platform"
 
-copy_and_package $REPO platform $GIT_HASH
-
+git_clone $REPO master $PKG_NAME.git $GIT_HASH
 if [ -f ../../packages/mediacenter/platform/package.mk ] ; then
   # update package.mk
   RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
-  sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/platform/package.mk
+  sed -e "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" \
+      -e "s|PKG_GIT_URL=.*|PKG_GIT_URL=\"$REPO\"|g" \
+      -i ../../packages/mediacenter/platform/package.mk
 fi
+rm -rf $PKG_NAME.git
 
 # kodi-platform
 REPO=$(cat $KODI_DIR/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt | awk '{print $2}')
 GIT_HASH=$(cat $KODI_DIR/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt | awk '{print $3}')
+PKG_NAME="kodi-platform"
 
-copy_and_package $REPO kodi-platform $GIT_HASH
-
+git_clone $REPO master $PKG_NAME.git $GIT_HASH
 if [ -f ../../packages/mediacenter/kodi-platform/package.mk ] ; then
   # update package.mk
   RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
-  sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/kodi-platform/package.mk
+  sed -e "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" \
+      -e "s|PKG_GIT_URL=.*|PKG_GIT_URL=\"$REPO\"|g" \
+      -i ../../packages/mediacenter/kodi-platform/package.mk
 fi
+rm -rf $PKG_NAME.git
 
 # addons
 for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.txt ; do
@@ -131,17 +99,23 @@ for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.t
     ADDON=$(basename $addon)
     REPO=$(cat $addon/$ADDON.txt | awk '{print $2}')
     GIT_HASH=$(cat $addon/$ADDON.txt | awk '{print $3}')
+    PKG_NAME="$ADDON"
 
     if ! grep -q all $addon/platforms.txt && ! grep -q linux $addon/platforms.txt && ! grep -q ! $addon/platforms.txt; then
       continue
     fi
 
     if [ -f ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ] ; then
-      copy_and_package $REPO $ADDON $GIT_HASH
+      git_clone $REPO master $PKG_NAME.git $GIT_HASH
 
       # update package.mk
       RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
-      sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk
+      sed -e "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" \
+          -e "s|PKG_GIT_URL=.*|PKG_GIT_URL=\"$REPO\"|g" \
+          -i ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk
+
+      rm -rf $PKG_NAME.git
+
     else
       echo "[mkpkg] Skipped $ADDON"
     fi