diff --git a/packages/audio/asplib/package.mk b/packages/audio/asplib/package.mk
index 3059d68ca1..dcc3665212 100644
--- a/packages/audio/asplib/package.mk
+++ b/packages/audio/asplib/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/AchimTuran/asplib"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/AchimTuran/asplib/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
diff --git a/packages/audio/dcadec/package.mk b/packages/audio/dcadec/package.mk
index 633ffb62f8..40318963a2 100644
--- a/packages/audio/dcadec/package.mk
+++ b/packages/audio/dcadec/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/foo86/dcadec"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/foo86/dcadec/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
diff --git a/packages/devel/arm-mem/package.mk b/packages/devel/arm-mem/package.mk
index 59360647f0..4f84f26fcb 100644
--- a/packages/devel/arm-mem/package.mk
+++ b/packages/devel/arm-mem/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/bavison/arm-mem"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/bavison/arm-mem/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_INIT="toolchain"
 PKG_PRIORITY="optional"
diff --git a/packages/devel/crossguid/package.mk b/packages/devel/crossguid/package.mk
index 5d80b256db..415b8e1920 100644
--- a/packages/devel/crossguid/package.mk
+++ b/packages/devel/crossguid/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/graeme-hill/crossguid"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/graeme-hill/crossguid/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
diff --git a/packages/devel/json-c/package.mk b/packages/devel/json-c/package.mk
index 9de67ce682..e61da59d65 100644
--- a/packages/devel/json-c/package.mk
+++ b/packages/devel/json-c/package.mk
@@ -23,7 +23,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/json-c/json-c/wiki"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/json-c/json-c/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="accessibility"
diff --git a/packages/linux-drivers/RTL8192EU/package.mk b/packages/linux-drivers/RTL8192EU/package.mk
index bb9bb61443..1cf0827800 100644
--- a/packages/linux-drivers/RTL8192EU/package.mk
+++ b/packages/linux-drivers/RTL8192EU/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/Mange/rtl8192eu-linux-driver"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/Mange/rtl8192eu-linux-driver/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain linux"
 PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
diff --git a/packages/multimedia/libamcodec/package.mk b/packages/multimedia/libamcodec/package.mk
index e5b84b8a78..634a2af1e3 100644
--- a/packages/multimedia/libamcodec/package.mk
+++ b/packages/multimedia/libamcodec/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="other"
 PKG_SITE="http://openlinux.amlogic.com"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/codesnake/libamcodec/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
diff --git a/packages/multimedia/vdr-plugin-dvbapi/package.mk b/packages/multimedia/vdr-plugin-dvbapi/package.mk
index 7540a00997..061e79618d 100644
--- a/packages/multimedia/vdr-plugin-dvbapi/package.mk
+++ b/packages/multimedia/vdr-plugin-dvbapi/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/manio/vdr-plugin-dvbapi/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr libdvbcsa"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
diff --git a/packages/multimedia/vdr-plugin-vnsiserver/package.mk b/packages/multimedia/vdr-plugin-vnsiserver/package.mk
index b3ca42248f..9b799fe94b 100644
--- a/packages/multimedia/vdr-plugin-vnsiserver/package.mk
+++ b/packages/multimedia/vdr-plugin-vnsiserver/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/FernetMenta/vdr-plugin-vnsiserver"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/FernetMenta/vdr-plugin-vnsiserver/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
diff --git a/packages/network/libshairplay/package.mk b/packages/network/libshairplay/package.mk
index de5f00ea8a..b39ca9acb4 100644
--- a/packages/network/libshairplay/package.mk
+++ b/packages/network/libshairplay/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/juhovh/shairplay"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/juhovh/shairplay/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
diff --git a/packages/sysutils/amremote/package.mk b/packages/sysutils/amremote/package.mk
index 7b43b3b733..855e751656 100644
--- a/packages/sysutils/amremote/package.mk
+++ b/packages/sysutils/amremote/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="other"
 PKG_SITE="http://www.amlogic.com"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/codesnake/amremote/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain usbutils"
 PKG_PRIORITY="optional"
 PKG_SECTION="sysutils/remote"
diff --git a/packages/sysutils/open-iscsi/package.mk b/packages/sysutils/open-iscsi/package.mk
index 127e7d3951..30137f5d47 100644
--- a/packages/sysutils/open-iscsi/package.mk
+++ b/packages/sysutils/open-iscsi/package.mk
@@ -23,7 +23,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/mikechristie/open-iscsi"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/mikechristie/open-iscsi/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_INIT="toolchain util-linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="initramfs/system"
diff --git a/packages/tools/mkbootimg/package.mk b/packages/tools/mkbootimg/package.mk
index 4291944f63..2e78a0716f 100644
--- a/packages/tools/mkbootimg/package.mk
+++ b/packages/tools/mkbootimg/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://android.googlesource.com/platform/system/core/+/master/mkbootimg/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/codesnake/mkbootimg/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_HOST=""
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
diff --git a/packages/tools/populatefs/package.mk b/packages/tools/populatefs/package.mk
index 70a6519344..d5bf2aa489 100644
--- a/packages/tools/populatefs/package.mk
+++ b/packages/tools/populatefs/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/oskarirauta/populatefs"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/oskarirauta/populatefs/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_HOST="e2fsprogs:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
diff --git a/tools/mkpkg/mkpkg_RTL8192EU b/tools/mkpkg/mkpkg_RTL8192EU
deleted file mode 100755
index db86e84542..0000000000
--- a/tools/mkpkg/mkpkg_RTL8192EU
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d RTL8192EU.git ]; then
-    git clone https://github.com/Mange/rtl8192eu-linux-driver.git --depth=1 -b master RTL8192EU.git
-  fi
-
-  cd RTL8192EU.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf RTL8192EU-$GIT_REV
-  cp -R RTL8192EU.git RTL8192EU-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf RTL8192EU-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf RTL8192EU-$GIT_REV.tar.xz RTL8192EU-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf RTL8192EU-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_adsp.basic b/tools/mkpkg/mkpkg_adsp.basic
deleted file mode 100755
index af119ab254..0000000000
--- a/tools/mkpkg/mkpkg_adsp.basic
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d adsp.basic.git ]; then
-    git clone https://github.com/kodi-adsp/adsp.basic.git adsp.basic.git
-  fi
-
-  cd adsp.basic.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf adsp.basic-$GIT_REV
-  cp -R adsp.basic.git adsp.basic-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf adsp.basic-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf adsp.basic-$GIT_REV.tar.xz adsp.basic-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf adsp.basic-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_adsp.biquad.filters b/tools/mkpkg/mkpkg_adsp.biquad.filters
deleted file mode 100755
index 33dfbd3971..0000000000
--- a/tools/mkpkg/mkpkg_adsp.biquad.filters
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d adsp.biquad.filters.git ]; then
-    git clone https://github.com/kodi-adsp/adsp.biquad.filters.git adsp.biquad.filters.git
-  fi
-
-  cd adsp.biquad.filters.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf adsp.biquad.filters-$GIT_REV
-  cp -R adsp.biquad.filters.git adsp.biquad.filters-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf adsp.biquad.filters-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf adsp.biquad.filters-$GIT_REV.tar.xz adsp.biquad.filters-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf adsp.biquad.filters-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_adsp.freesurround b/tools/mkpkg/mkpkg_adsp.freesurround
deleted file mode 100755
index 497d799f12..0000000000
--- a/tools/mkpkg/mkpkg_adsp.freesurround
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d adsp.freesurround.git ]; then
-    git clone https://github.com/kodi-adsp/adsp.freesurround.git adsp.freesurround.git
-  fi
-
-  cd adsp.freesurround.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf adsp.freesurround-$GIT_REV
-  cp -R adsp.freesurround.git adsp.freesurround-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf adsp.freesurround-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf adsp.freesurround-$GIT_REV.tar.xz adsp.freesurround-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf adsp.freesurround-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_amremote b/tools/mkpkg/mkpkg_amremote
deleted file mode 100755
index 917a1e051e..0000000000
--- a/tools/mkpkg/mkpkg_amremote
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d libamcodec.git ]; then
-    git clone https://github.com/codesnake/amremote.git amremote.git
-  fi
-
-  cd amremote.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf amremote-$GIT_REV
-  cp -R amremote.git amremote-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf amremote-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf amremote-$GIT_REV.tar.xz amremote-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf amremote-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_arm-mem b/tools/mkpkg/mkpkg_arm-mem
deleted file mode 100755
index 1863783214..0000000000
--- a/tools/mkpkg/mkpkg_arm-mem
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d arm-mem.git ]; then
-    git clone git://github.com/bavison/arm-mem.git -b master arm-mem.git
-  fi
-
-  cd arm-mem.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf arm-mem-$GIT_REV
-  cp -R arm-mem.git arm-mem-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf arm-mem-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf arm-mem-$GIT_REV.tar.xz arm-mem-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf arm-mem-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_asplib b/tools/mkpkg/mkpkg_asplib
deleted file mode 100755
index f9fae72830..0000000000
--- a/tools/mkpkg/mkpkg_asplib
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d asplib.git ]; then
-    git clone https://github.com/AchimTuran/asplib.git asplib.git
-  fi
-
-  cd asplib.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf asplib-$GIT_REV
-  cp -R asplib.git asplib-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf asplib-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf asplib-$GIT_REV.tar.xz asplib-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf asplib-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.2sf b/tools/mkpkg/mkpkg_audiodecoder.2sf
deleted file mode 100755
index b663b55853..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.2sf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.2sf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.2sf.git audiodecoder.2sf.git
-  fi
-
-  cd audiodecoder.2sf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.2sf-$GIT_REV
-  cp -R audiodecoder.2sf.git audiodecoder.2sf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.2sf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.2sf-$GIT_REV.tar.xz audiodecoder.2sf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.2sf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.asap b/tools/mkpkg/mkpkg_audiodecoder.asap
deleted file mode 100755
index 914dedfd0f..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.asap
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.asap.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.asap.git audiodecoder.asap.git
-  fi
-
-  cd audiodecoder.asap.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.asap-$GIT_REV
-  cp -R audiodecoder.asap.git audiodecoder.asap-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.asap-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.asap-$GIT_REV.tar.xz audiodecoder.asap-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.asap-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.dumb b/tools/mkpkg/mkpkg_audiodecoder.dumb
deleted file mode 100755
index a452df7d25..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.dumb
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.dumb.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.dumb.git audiodecoder.dumb.git
-  fi
-
-  cd audiodecoder.dumb.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.dumb-$GIT_REV
-  cp -R audiodecoder.dumb.git audiodecoder.dumb-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.dumb-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.dumb-$GIT_REV.tar.xz audiodecoder.dumb-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.dumb-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.fluidsynth b/tools/mkpkg/mkpkg_audiodecoder.fluidsynth
deleted file mode 100755
index 65b39aae6d..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.fluidsynth
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.fluidsynth.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.fluidsynth.git audiodecoder.fluidsynth.git
-  fi
-
-  cd audiodecoder.fluidsynth.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.fluidsynth-$GIT_REV
-  cp -R audiodecoder.fluidsynth.git audiodecoder.fluidsynth-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.fluidsynth-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.fluidsynth-$GIT_REV.tar.xz audiodecoder.fluidsynth-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.fluidsynth-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.gme b/tools/mkpkg/mkpkg_audiodecoder.gme
deleted file mode 100755
index fc20a75d62..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.gme
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.gme.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.gme.git audiodecoder.gme.git
-  fi
-
-  cd audiodecoder.gme.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.gme-$GIT_REV
-  cp -R audiodecoder.gme.git audiodecoder.gme-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.gme-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.gme-$GIT_REV.tar.xz audiodecoder.gme-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.gme-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.gsf b/tools/mkpkg/mkpkg_audiodecoder.gsf
deleted file mode 100755
index be36c95c7a..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.gsf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.gsf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.gsf.git audiodecoder.gsf.git
-  fi
-
-  cd audiodecoder.gsf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.gsf-$GIT_REV
-  cp -R audiodecoder.gsf.git audiodecoder.gsf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.gsf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.gsf-$GIT_REV.tar.xz audiodecoder.gsf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.gsf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.ncsf b/tools/mkpkg/mkpkg_audiodecoder.ncsf
deleted file mode 100755
index 4a9561f713..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.ncsf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.ncsf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.ncsf.git audiodecoder.ncsf.git
-  fi
-
-  cd audiodecoder.ncsf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.ncsf-$GIT_REV
-  cp -R audiodecoder.ncsf.git audiodecoder.ncsf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.ncsf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.ncsf-$GIT_REV.tar.xz audiodecoder.ncsf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.ncsf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.openmpt b/tools/mkpkg/mkpkg_audiodecoder.openmpt
deleted file mode 100755
index a643071a22..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.openmpt
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.openmpt.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.openmpt.git audiodecoder.openmpt.git
-  fi
-
-  cd audiodecoder.openmpt.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.openmpt-$GIT_REV
-  cp -R audiodecoder.openmpt.git audiodecoder.openmpt-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.openmpt-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.openmpt-$GIT_REV.tar.xz audiodecoder.openmpt-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.openmpt-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.organya b/tools/mkpkg/mkpkg_audiodecoder.organya
deleted file mode 100755
index 401dcf4847..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.organya
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.organya.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.organya.git audiodecoder.organya.git
-  fi
-
-  cd audiodecoder.organya.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.organya-$GIT_REV
-  cp -R audiodecoder.organya.git audiodecoder.organya-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.organya-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.organya-$GIT_REV.tar.xz audiodecoder.organya-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.organya-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.qsf b/tools/mkpkg/mkpkg_audiodecoder.qsf
deleted file mode 100755
index 4acd53a6e3..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.qsf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.qsf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.qsf.git audiodecoder.qsf.git
-  fi
-
-  cd audiodecoder.qsf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.qsf-$GIT_REV
-  cp -R audiodecoder.qsf.git audiodecoder.qsf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.qsf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.qsf-$GIT_REV.tar.xz audiodecoder.qsf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.qsf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.ssf b/tools/mkpkg/mkpkg_audiodecoder.ssf
deleted file mode 100755
index ab26e73cae..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.ssf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.ssf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.ssf.git audiodecoder.ssf.git
-  fi
-
-  cd audiodecoder.ssf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.ssf-$GIT_REV
-  cp -R audiodecoder.ssf.git audiodecoder.ssf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.ssf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.ssf-$GIT_REV.tar.xz audiodecoder.ssf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.ssf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.upse b/tools/mkpkg/mkpkg_audiodecoder.upse
deleted file mode 100755
index 984556f049..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.upse
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.upse.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.upse.git audiodecoder.upse.git
-  fi
-
-  cd audiodecoder.upse.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.upse-$GIT_REV
-  cp -R audiodecoder.upse.git audiodecoder.upse-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.upse-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.upse-$GIT_REV.tar.xz audiodecoder.upse-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.upse-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.usf b/tools/mkpkg/mkpkg_audiodecoder.usf
deleted file mode 100755
index eece0f4344..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.usf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.usf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.usf.git audiodecoder.usf.git
-  fi
-
-  cd audiodecoder.usf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.usf-$GIT_REV
-  cp -R audiodecoder.usf.git audiodecoder.usf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.usf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.usf-$GIT_REV.tar.xz audiodecoder.usf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.usf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.wsr b/tools/mkpkg/mkpkg_audiodecoder.wsr
deleted file mode 100755
index ac38646779..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.wsr
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.wsr.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.wsr.git audiodecoder.wsr.git
-  fi
-
-  cd audiodecoder.wsr.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.wsr-$GIT_REV
-  cp -R audiodecoder.wsr.git audiodecoder.wsr-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.wsr-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.wsr-$GIT_REV.tar.xz audiodecoder.wsr-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.wsr-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_crossguid b/tools/mkpkg/mkpkg_crossguid
deleted file mode 100755
index bba30184fe..0000000000
--- a/tools/mkpkg/mkpkg_crossguid
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d crossguid.git ]; then
-    git clone https://github.com/graeme-hill/crossguid.git -b master crossguid.git
-  fi
-
-  cd crossguid.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf crossguid-$GIT_REV
-  cp -R crossguid.git crossguid-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf crossguid-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf crossguid-$GIT_REV.tar.xz crossguid-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf crossguid-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_dcadec b/tools/mkpkg/mkpkg_dcadec
deleted file mode 100755
index 053ade6235..0000000000
--- a/tools/mkpkg/mkpkg_dcadec
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d dcadec.git ]; then
-    git clone git@github.com:foo86/dcadec.git -b master dcadec.git
-  fi
-
-  cd dcadec.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf dcadec-$GIT_REV
-  cp -R dcadec.git dcadec-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf dcadec-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf dcadec-$GIT_REV.tar.xz dcadec-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf dcadec-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_json-c b/tools/mkpkg/mkpkg_json-c
deleted file mode 100755
index 8b525f2a8a..0000000000
--- a/tools/mkpkg/mkpkg_json-c
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d json-c.git ]; then
-    git clone https://github.com/json-c/json-c.git json-c.git
-  fi
-
-  cd json-c.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf json-c-$GIT_REV
-  cp -R json-c.git json-c-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf json-c-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf json-c-$GIT_REV.tar.xz json-c-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf json-c-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_libamcodec b/tools/mkpkg/mkpkg_libamcodec
deleted file mode 100755
index dba7b1e687..0000000000
--- a/tools/mkpkg/mkpkg_libamcodec
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d libamcodec.git ]; then
-    git clone https://github.com/codesnake/libamcodec.git libamcodec.git
-  fi
-
-  cd libamcodec.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf libamcodec-$GIT_REV
-  cp -R libamcodec.git libamcodec-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf libamcodec-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf libamcodec-$GIT_REV.tar.xz libamcodec-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf libamcodec-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_libshairplay b/tools/mkpkg/mkpkg_libshairplay
deleted file mode 100755
index 77d42699e7..0000000000
--- a/tools/mkpkg/mkpkg_libshairplay
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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="libshairplay"
-PKG_VERSION=""
-GIT_REPO="https://github.com/juhovh/shairplay.git"
-DEST_DIR="$PKG_NAME"
-
-echo "getting sources..."
-  if [ ! -d $DEST_DIR.git ]; then
-    git clone $GIT_REPO $DEST_DIR.git
-  fi
-
-  cd $DEST_DIR.git
-    git pull
-
-    echo "getting version..."
-    PKG_VERSION=`git log -n1 --format=%h`
-    echo $GIT_REV
-  cd ..
-
-echo "copying sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION
-  cp -R $DEST_DIR.git $PKG_NAME-$PKG_VERSION
-
-echo "cleaning sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION/.git
-
-echo "packing sources..."
-  tar cvJf $PKG_NAME-$PKG_VERSION.tar.xz $PKG_NAME-$PKG_VERSION
-
-echo "remove temporary sourcedir..."
-  rm -rf $PKG_NAME-$PKG_VERSION
diff --git a/tools/mkpkg/mkpkg_mkbootimg b/tools/mkpkg/mkpkg_mkbootimg
deleted file mode 100755
index d47206233b..0000000000
--- a/tools/mkpkg/mkpkg_mkbootimg
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d mkbootimg.git ]; then
-    git clone https://github.com/codesnake/mkbootimg.git mkbootimg.git
-  fi
-
-  cd mkbootimg.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf mkbootimg-$GIT_REV
-  cp -R mkbootimg.git mkbootimg-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf mkbootimg-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf mkbootimg-$GIT_REV.tar.xz mkbootimg-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf mkbootimg-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_open-iscsi b/tools/mkpkg/mkpkg_open-iscsi
deleted file mode 100755
index a6ed351671..0000000000
--- a/tools/mkpkg/mkpkg_open-iscsi
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d open-iscsi.git ]; then
-    git clone https://github.com/mikechristie/open-iscsi -b release open-iscsi.git
-  fi
-
-  cd open-iscsi.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf open-iscsi-$GIT_REV
-  cp -R open-iscsi.git open-iscsi-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf open-iscsi-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf open-iscsi-$GIT_REV.tar.xz open-iscsi-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf open-iscsi-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_populatefs b/tools/mkpkg/mkpkg_populatefs
deleted file mode 100644
index 4dd9243799..0000000000
--- a/tools/mkpkg/mkpkg_populatefs
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d populatefs.git ]; then
-    git clone https://github.com/oskarirauta/populatefs.git populatefs.git
-  fi
-
-  cd populatefs.git
-    git pull
-    GIT_REV=$(git log -n1 --format=%h)
-  cd ..
-
-echo "copying sources..."
-  rm -rf populatefs-$GIT_REV
-  cp -R populatefs.git populatefs-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf populatefs-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf populatefs-$GIT_REV.tar.xz populatefs-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf populatefs-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.asteroids b/tools/mkpkg/mkpkg_screensaver.asteroids
deleted file mode 100755
index 45fa4f254f..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.asteroids
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.asteroids.git ]; then
-    git clone https://github.com/notspiff/screensaver.asteroids.git screensaver.asteroids.git
-  fi
-
-  cd screensaver.asteroids.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.asteroids-$GIT_REV
-  cp -R screensaver.asteroids.git screensaver.asteroids-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.asteroids-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.asteroids-$GIT_REV.tar.xz screensaver.asteroids-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.asteroids-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.biogenesis b/tools/mkpkg/mkpkg_screensaver.biogenesis
deleted file mode 100755
index b22230560b..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.biogenesis
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.biogenesis.git ]; then
-    git clone https://github.com/notspiff/screensaver.biogenesis.git screensaver.biogenesis.git
-  fi
-
-  cd screensaver.biogenesis.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.biogenesis-$GIT_REV
-  cp -R screensaver.biogenesis.git screensaver.biogenesis-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.biogenesis-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.biogenesis-$GIT_REV.tar.xz screensaver.biogenesis-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.biogenesis-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.greynetic b/tools/mkpkg/mkpkg_screensaver.greynetic
deleted file mode 100755
index 15052aac38..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.greynetic
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.greynetic.git ]; then
-    git clone https://github.com/notspiff/screensaver.greynetic.git screensaver.greynetic.git
-  fi
-
-  cd screensaver.greynetic.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.greynetic-$GIT_REV
-  cp -R screensaver.greynetic.git screensaver.greynetic-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.greynetic-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.greynetic-$GIT_REV.tar.xz screensaver.greynetic-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.greynetic-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.matrixtrails b/tools/mkpkg/mkpkg_screensaver.matrixtrails
deleted file mode 100755
index b48a1e4ee6..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.matrixtrails
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.matrixtrails.git ]; then
-    git clone https://github.com/notspiff/screensaver.matrixtrails.git screensaver.matrixtrails.git
-  fi
-
-  cd screensaver.matrixtrails.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.matrixtrails-$GIT_REV
-  cp -R screensaver.matrixtrails.git screensaver.matrixtrails-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.matrixtrails-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.matrixtrails-$GIT_REV.tar.xz screensaver.matrixtrails-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.matrixtrails-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.pingpong b/tools/mkpkg/mkpkg_screensaver.pingpong
deleted file mode 100755
index c3846d336f..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.pingpong
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.pingpong.git ]; then
-    git clone https://github.com/notspiff/screensaver.pingpong.git screensaver.pingpong.git
-  fi
-
-  cd screensaver.pingpong.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.pingpong-$GIT_REV
-  cp -R screensaver.pingpong.git screensaver.pingpong-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.pingpong-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.pingpong-$GIT_REV.tar.xz screensaver.pingpong-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.pingpong-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.pyro b/tools/mkpkg/mkpkg_screensaver.pyro
deleted file mode 100755
index 8f83212075..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.pyro
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.pyro.git ]; then
-    git clone https://github.com/notspiff/screensaver.pyro.git screensaver.pyro.git
-  fi
-
-  cd screensaver.pyro.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.pyro-$GIT_REV
-  cp -R screensaver.pyro.git screensaver.pyro-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.pyro-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.pyro-$GIT_REV.tar.xz screensaver.pyro-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.pyro-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.stars b/tools/mkpkg/mkpkg_screensaver.stars
deleted file mode 100755
index d517341278..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.stars
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.stars.git ]; then
-    git clone https://github.com/notspiff/screensaver.stars.git screensaver.stars.git
-  fi
-
-  cd screensaver.stars.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.stars-$GIT_REV
-  cp -R screensaver.stars.git screensaver.stars-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.stars-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.stars-$GIT_REV.tar.xz screensaver.stars-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.stars-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_vdr-plugin-dvbapi b/tools/mkpkg/mkpkg_vdr-plugin-dvbapi
deleted file mode 100755
index ea5b0edfc4..0000000000
--- a/tools/mkpkg/mkpkg_vdr-plugin-dvbapi
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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="vdr-plugin-dvbapi"
-PKG_REPO="git://github.com/manio/vdr-plugin-dvbapi.git"
-
-echo "getting sources..."
-  if [ ! -d $PKG_NAME.git ]; then
-    git clone $PKG_REPO $PKG_NAME.git
-  fi
-
-  cd $PKG_NAME.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf $PKG_NAME-$GIT_REV
-  cp -R $PKG_NAME.git $PKG_NAME-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf $PKG_NAME-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf $PKG_NAME-$GIT_REV.tar.xz $PKG_NAME-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf $PKG_NAME-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_vdr-plugin-vnsiserver b/tools/mkpkg/mkpkg_vdr-plugin-vnsiserver
deleted file mode 100755
index 93d8da0558..0000000000
--- a/tools/mkpkg/mkpkg_vdr-plugin-vnsiserver
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d vdr-plugin-vnsiserver.git ]; then
-    git clone git://github.com/FernetMenta/vdr-plugin-vnsiserver vdr-plugin-vnsiserver.git
-  fi
-
-  cd vdr-plugin-vnsiserver.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf vdr-plugin-vnsiserver-$GIT_REV
-  cp -R vdr-plugin-vnsiserver.git vdr-plugin-vnsiserver-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf vdr-plugin-vnsiserver-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf vdr-plugin-vnsiserver-$GIT_REV.tar.xz vdr-plugin-vnsiserver-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf vdr-plugin-vnsiserver-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_xf86-video-amdgpu b/tools/mkpkg/mkpkg_xf86-video-amdgpu
deleted file mode 100755
index 0bd65c54cc..0000000000
--- a/tools/mkpkg/mkpkg_xf86-video-amdgpu
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d xf86-video-amdgpu.git ]; then
-    git clone git://anongit.freedesktop.org/xorg/driver/xf86-video-amdgpu xf86-video-amdgpu.git
-  fi
-
-  cd xf86-video-amdgpu.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf xf86-video-amdgpu-$GIT_REV
-  cp -R xf86-video-amdgpu.git xf86-video-amdgpu-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf xf86-video-amdgpu-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf xf86-video-amdgpu-$GIT_REV.tar.xz xf86-video-amdgpu-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf xf86-video-amdgpu-$GIT_REV