diff --git a/packages/addons/addon-depends/enet/package.mk b/packages/addons/addon-depends/enet/package.mk
index f056918478..83d69e0723 100644
--- a/packages/addons/addon-depends/enet/package.mk
+++ b/packages/addons/addon-depends/enet/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="enet"
-PKG_VERSION="e33ca1d"
+PKG_VERSION="e33ca1dc47635882bfcadd192dbc54ea8584cbc5"
 PKG_SHA256="0ba5547de2c4c7fc79d367179a9bc92a7ac27e9258dd50fb277cd8761afaf9b0"
 PKG_LICENSE=""
 PKG_SITE="https://github.com/cgutman/enet/"
diff --git a/packages/addons/addon-depends/game-tools/ecm-tools/package.mk b/packages/addons/addon-depends/game-tools/ecm-tools/package.mk
index 8146b67b8d..0b1b74dd54 100644
--- a/packages/addons/addon-depends/game-tools/ecm-tools/package.mk
+++ b/packages/addons/addon-depends/game-tools/ecm-tools/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ecm-tools"
-PKG_VERSION="55365b0"
+PKG_VERSION="55365b02f237f079334f207133dd85b45270ecd9"
 PKG_SHA256="39c2d0e36b1cba33fa9fee1c0a2a63f851b561fceb59dc99550a1e8e580d3b5a"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/alucryd/ecm-tools"
diff --git a/packages/addons/addon-depends/libdvbcsa/package.mk b/packages/addons/addon-depends/libdvbcsa/package.mk
index 6759face87..1122e20f82 100644
--- a/packages/addons/addon-depends/libdvbcsa/package.mk
+++ b/packages/addons/addon-depends/libdvbcsa/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="libdvbcsa"
-PKG_VERSION="aae3d0c"
+PKG_VERSION="aae3d0c13fdda03597087ad9e3963e8f4ca8a974"
 PKG_SHA256="2c0b69a5ca70c5032f9375a57bcec449ecdf93b5459f60f087f5fa06c605c7c1"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk
index 0b368c690d..01e1463775 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tstools"
-PKG_VERSION="db1f79f"
+PKG_VERSION="db1f79f409818fa0476ecf8593079a7ca3dbafd2"
 PKG_SHA256="f204229016c9deafcc75fe602c390339878312126134edbfcebf239e093dc4ff"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/kynesim/tstools"
diff --git a/packages/addons/addon-depends/rpi_ws281x/package.mk b/packages/addons/addon-depends/rpi_ws281x/package.mk
index 4ad7c0c764..0adb1aa1de 100644
--- a/packages/addons/addon-depends/rpi_ws281x/package.mk
+++ b/packages/addons/addon-depends/rpi_ws281x/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rpi_ws281x"
-PKG_VERSION="6c5ade9"
+PKG_VERSION="6c5ade93d1af78cd19e60ee5ecc34adfd111b186"
 PKG_SHA256="e8fb94429edc21cfd894548755a417eb5b2e121329f4b54270cfb3f727696e21"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="https://github.com/hyperion-project/rpi_ws281x"
diff --git a/packages/addons/addon-depends/snapcast-depends/asio/package.mk b/packages/addons/addon-depends/snapcast-depends/asio/package.mk
index 63b2015e6c..598e4f6332 100644
--- a/packages/addons/addon-depends/snapcast-depends/asio/package.mk
+++ b/packages/addons/addon-depends/snapcast-depends/asio/package.mk
@@ -2,12 +2,12 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="asio"
-PKG_VERSION="1-12-0"
+PKG_VERSION="1.12.0"
 PKG_SHA256="3b3f2e38ac18f9a20a405c0852c90e8b637b7733c520829ddc80937d2ee7a5ec"
 PKG_LICENSE="BSL"
 PKG_SITE="http://think-async.com/Asio"
-PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-$PKG_VERSION.zip"
-PKG_SOURCE_DIR="asio-asio-$PKG_VERSION"
+PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-${PKG_VERSION//./-}.zip"
+PKG_SOURCE_DIR="asio-asio-${PKG_VERSION//./-}"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Asio C++ Library."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk b/packages/addons/addon-depends/system-tools-depends/dstat/package.mk
index f9581b8b00..ca73c78788 100644
--- a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/dstat/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dstat"
-PKG_VERSION="77e9347"
+PKG_VERSION="77e9347cf16a2cb08c7b79b40255b4700be81609"
 PKG_SHA256="2b2f4ef3a0d1dc6d0a4bc2f54a57ba6f1e278333881a07df7e55aec502a48c7c"
 PKG_LICENSE="GPL"
 PKG_SITE="http://dag.wiee.rs/home-made/dstat"
diff --git a/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk b/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk
index 638337d957..0ad9dfbf38 100644
--- a/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="hddtemp"
-PKG_VERSION="e16aed6"
+PKG_VERSION="e16aed6d0145d7ad8b3308dd0b9199fc701c0417"
 PKG_SHA256="5d5af74ba7449b6e56a8f872a0e10d654a512ed65d62beaef1575b0c1826d9f3"
 PKG_LICENSE="GPL"
 PKG_SITE="https://savannah.nongnu.org/projects/hddtemp"
diff --git a/packages/addons/addon-depends/system-tools-depends/lshw/package.mk b/packages/addons/addon-depends/system-tools-depends/lshw/package.mk
index 3e90293a26..7af4bd9371 100644
--- a/packages/addons/addon-depends/system-tools-depends/lshw/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/lshw/package.mk
@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="lshw"
-PKG_VERSION="B.02.19.2"
+PKG_VERSION="02.19.2"
 PKG_SHA256="9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80"
 PKG_LICENSE="GPL"
 PKG_SITE="http://ezix.org/project/wiki/HardwareLiSter"
-PKG_URL="http://ezix.org/software/files/lshw-${PKG_VERSION}.tar.gz"
+PKG_URL="http://ezix.org/software/files/lshw-B.${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A small tool to provide detailed information on the hardware configuration of the machine."
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/compress/zip/package.mk b/packages/compress/zip/package.mk
index ce3b160422..3e16fbfcc3 100644
--- a/packages/compress/zip/package.mk
+++ b/packages/compress/zip/package.mk
@@ -2,11 +2,11 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="zip"
-PKG_VERSION="30"
+PKG_VERSION="3.0"
 PKG_SHA256="f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369"
 PKG_LICENSE="Info-ZIP"
 PKG_SITE="http://www.info-zip.org/pub/infozip/"
-PKG_URL="$SOURCEFORGE_SRC/infozip/Zip%203.x%20%28latest%29/3.0/${PKG_NAME}${PKG_VERSION}.tar.gz"
+PKG_URL="$SOURCEFORGE_SRC/infozip/Zip%203.x%20%28latest%29/3.0/${PKG_NAME}${PKG_VERSION/./}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain bzip2"
 PKG_LONGDESC="A compression and file packaging utility."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk
index 8a5c08580b..e1402f45e3 100644
--- a/packages/databases/sqlite/package.mk
+++ b/packages/databases/sqlite/package.mk
@@ -3,11 +3,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3340000"
+PKG_VERSION="3.3.4"
 PKG_SHA256="bf6db7fae37d51754737747aaaf413b4d6b3b5fbacd52bdb2d0d6e5b2edd9aee"
 PKG_LICENSE="PublicDomain"
 PKG_SITE="https://www.sqlite.org/"
-PKG_URL="https://www.sqlite.org/2020/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="https://www.sqlite.org/2020/${PKG_NAME}-autoconf-${PKG_VERSION//./}0000.tar.gz"
 PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="An Embeddable SQL Database Engine."
diff --git a/packages/devel/crossguid/package.mk b/packages/devel/crossguid/package.mk
index 4ffb88d1be..aeab7a5faf 100644
--- a/packages/devel/crossguid/package.mk
+++ b/packages/devel/crossguid/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="crossguid"
-PKG_VERSION="8f399e8"
+PKG_VERSION="8f399e8bd4252be9952f3dfa8199924cc8487ca4"
 PKG_SHA256="022c9f02cc36e865cd8fd0111a597ff2bd91988deeb348dbe2aba64aed1abd99"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/graeme-hill/crossguid"
diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk
index 1fd7698db9..9702b1fa8b 100644
--- a/packages/devel/libcec/package.mk
+++ b/packages/devel/libcec/package.mk
@@ -3,11 +3,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libcec"
-PKG_VERSION="libcec-4.0.7"
+PKG_VERSION="4.0.7"
 PKG_SHA256="bcd92c376993a5721d346edcc09eb17289451f9156b1d1d113c9663c2046315a"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libcec.pulse-eight.com/"
-PKG_URL="https://github.com/Pulse-Eight/libcec/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/Pulse-Eight/libcec/archive/libcec-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain systemd p8-platform swig:host"
 PKG_LONGDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor."
 
diff --git a/packages/emulation/cyclone68000/package.mk b/packages/emulation/cyclone68000/package.mk
index 74462c4ebf..2f96132f9e 100644
--- a/packages/emulation/cyclone68000/package.mk
+++ b/packages/emulation/cyclone68000/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="cyclone68000"
-PKG_VERSION="66dda84"
+PKG_VERSION="66dda842eae01f47f5389b931ec9567fb0bbb6a1"
 PKG_SHA256="c59900531e35e7303e1172d9bd5d161491b4554983930ad855614252156ea0e0"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/notaz/cyclone68000"
diff --git a/packages/emulation/libretro-vram-test/package.mk b/packages/emulation/libretro-vram-test/package.mk
index c6b54f8e99..b65f518f7b 100644
--- a/packages/emulation/libretro-vram-test/package.mk
+++ b/packages/emulation/libretro-vram-test/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-vram-test"
-PKG_VERSION="6b90ce9"
+PKG_VERSION="6b90ce965b08cc1d6a94b4f3916b5114167db498"
 PKG_SHA256="2bd1b3af783a028355eb4b4c416f09802313a9a69759e716377b55012f7bb4ae"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/libretro/libretro-samples"
diff --git a/packages/graphics/libprojectM/package.mk b/packages/graphics/libprojectM/package.mk
index fcc073611b..b205e27aa9 100644
--- a/packages/graphics/libprojectM/package.mk
+++ b/packages/graphics/libprojectM/package.mk
@@ -3,11 +3,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libprojectM"
-PKG_VERSION="v3.1.2"
+PKG_VERSION="3.1.2"
 PKG_SHA256="d59f61806f4e0e89bb42c494514ee295b3a7c4893432a1d38607777040a90823"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/projectM-visualizer/projectm"
-PKG_URL="https://github.com/projectM-visualizer/projectm/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/projectM-visualizer/projectm/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain freetype glm $OPENGL"
 PKG_LONGDESC="A MilkDrop compatible opensource music visualizer."
 PKG_TOOLCHAIN="configure"
diff --git a/packages/linux-firmware/misc-firmware/package.mk b/packages/linux-firmware/misc-firmware/package.mk
index e186cb18b5..e0f526b7e4 100644
--- a/packages/linux-firmware/misc-firmware/package.mk
+++ b/packages/linux-firmware/misc-firmware/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="misc-firmware"
-PKG_VERSION="9dd2a25"
+PKG_VERSION="9dd2a255e23dda9146e02d25bd98a8afa0d1ece0"
 PKG_SHA256="8788d153cbee0bfd9998aed4cf2e015b373529d4b9c2c35325a08ef390855ec6"
 PKG_LICENSE="Free-to-use"
 PKG_SITE="https://github.com/LibreELEC/misc-firmware"
diff --git a/packages/linux-firmware/rtl8723bs_bt/package.mk b/packages/linux-firmware/rtl8723bs_bt/package.mk
index f3510e8314..80f43bfefa 100644
--- a/packages/linux-firmware/rtl8723bs_bt/package.mk
+++ b/packages/linux-firmware/rtl8723bs_bt/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rtl8723bs_bt"
-PKG_VERSION="09eb91f"
+PKG_VERSION="09eb91f52a639ec5e4c5c4c98dc2afede046cf20"
 PKG_SHA256="4bb8483c4a14a9e0dfc4a6ddca18486caab5f361be2441b91e9e2a399ca9f33e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lwfinger/rtl8723bs_bt"
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.vram-test/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.vram-test/package.mk
index 57c99a5328..7f442e7535 100644
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.vram-test/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/game.libretro.vram-test/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="game.libretro.vram-test"
-PKG_VERSION="92e1146"
+PKG_VERSION="92e114661d10b508aaa578a54afb5fb6c4f03ec0"
 PKG_SHA256="ab866d1cc455c4fdba6f67b44dff850cd6e713c964ef0afd366d3ee526504288"
 PKG_REV="101"
 PKG_ARCH="any"
diff --git a/packages/multimedia/libdvdnav/package.mk b/packages/multimedia/libdvdnav/package.mk
index e6c05cacf3..4748b57592 100644
--- a/packages/multimedia/libdvdnav/package.mk
+++ b/packages/multimedia/libdvdnav/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libdvdnav"
-PKG_VERSION="9277007"
+PKG_VERSION="9277007ce2263b908e9ce3091cc31b3dd87c351c"
 PKG_SHA256="e50db40a823ddc795d1fe5f18db2517fb3e05fe0c4a88abf1578d95d7a1cce63"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/xbmc/libdvdnav"
diff --git a/packages/multimedia/libdvdread/package.mk b/packages/multimedia/libdvdread/package.mk
index 7231ae7630..ff20343762 100644
--- a/packages/multimedia/libdvdread/package.mk
+++ b/packages/multimedia/libdvdread/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libdvdread"
-PKG_VERSION="bd6b329"
+PKG_VERSION="bd6b329f0137ab6a9f779a28dd96f04713735e17"
 PKG_SHA256="2d9d6d185dd25a983d6dfc2a00207cafdc396a969c227d5edd84b6215b2fba89"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/xbmc/libdvdread"
diff --git a/packages/multimedia/rtmpdump/package.mk b/packages/multimedia/rtmpdump/package.mk
index bcdaa9b6f7..9419877d26 100644
--- a/packages/multimedia/rtmpdump/package.mk
+++ b/packages/multimedia/rtmpdump/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="rtmpdump"
-PKG_VERSION="fa8646d"
+PKG_VERSION="fa8646daeb19dfd12c181f7d19de708d623704c0"
 PKG_SHA256="dba4d4d2e1c7de6884b01d98194b83cab6784669089fa3c919152087a3a38fd2"
 PKG_LICENSE="GPL"
 PKG_SITE="http://rtmpdump.mplayerhq.hu/"
diff --git a/packages/network/libdnet/package.mk b/packages/network/libdnet/package.mk
index dbdd908599..3148e957c9 100644
--- a/packages/network/libdnet/package.mk
+++ b/packages/network/libdnet/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libdnet"
-PKG_VERSION="8029bf9"
+PKG_VERSION="8029bf9788d306b8aad95f11ecaea511cb6b3146"
 PKG_SHA256="1e41cbe5e4884108b08fa92964305354f1662b7e889f62736b3749845d7a8c56"
 PKG_LICENSE="BSD"
 PKG_SITE="https://github.com/sgeto/libdnet"
diff --git a/packages/network/wireguard-tools/package.mk b/packages/network/wireguard-tools/package.mk
index 410766bc81..33af9026fe 100644
--- a/packages/network/wireguard-tools/package.mk
+++ b/packages/network/wireguard-tools/package.mk
@@ -2,11 +2,11 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="wireguard-tools"
-PKG_VERSION="v1.0.20200827"
+PKG_VERSION="1.0.20200827"
 PKG_SHA256="ec08772216da73a2f6a925927ce794fe9686ba169bb774e451d34199db19795c"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://www.wireguard.com"
-PKG_URL="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-$PKG_VERSION.tar.xz"
+PKG_URL="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-v$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain linux"
 PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_LONGDESC="WireGuard VPN userspace tools"
diff --git a/packages/sysutils/eventlircd/package.mk b/packages/sysutils/eventlircd/package.mk
index 188d11b189..4399a61f1b 100644
--- a/packages/sysutils/eventlircd/package.mk
+++ b/packages/sysutils/eventlircd/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="eventlircd"
-PKG_VERSION="3b753e9"
+PKG_VERSION="3b753e91ae8c28dc34dd017a354d72b3c0715309"
 PKG_SHA256="4eca52d0570fa568b3296a2c9bc2af252423e25c1a67654bd79680fc5a93092a"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/LibreELEC/eventlircd"
diff --git a/packages/sysutils/irqbalanced/package.mk b/packages/sysutils/irqbalanced/package.mk
deleted file mode 100644
index 86f1e42ab9..0000000000
--- a/packages/sysutils/irqbalanced/package.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="irqbalanced"
-PKG_VERSION="7f31046"
-PKG_SHA256="e9f533bc2186fcef8456b78fb404ac981836d19f4b6ff10fede830b1df421717"
-PKG_ARCH="arm"
-PKG_LICENSE="other"
-PKG_SITE="http://www.freescale.com"
-PKG_URL="https://github.com/dv1/irqbalanced/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain systemd glib"
-PKG_LONGDESC="irqbalanced: distribute hardware interrupts across processors on a multiprocessor system."
-PKG_TOOLCHAIN="configure"
-
-pre_configure_target() {
-  sh -c ./autogen.sh
-}
-
-post_install() {
-  enable_service irqbalance.service
-}
diff --git a/packages/sysutils/irqbalanced/system.d/irqbalance.service b/packages/sysutils/irqbalanced/system.d/irqbalance.service
deleted file mode 100644
index a9d97d14bf..0000000000
--- a/packages/sysutils/irqbalanced/system.d/irqbalance.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=irqbalance
-After=proc.mount
-
-[Service]
-ExecStart=/usr/sbin/irqbalance
-Type=forking
-
-[Install]
-WantedBy=sysinit.target
diff --git a/packages/sysutils/open-iscsi/package.mk b/packages/sysutils/open-iscsi/package.mk
index 161d9cde87..fc3d05bba5 100644
--- a/packages/sysutils/open-iscsi/package.mk
+++ b/packages/sysutils/open-iscsi/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="open-iscsi"
-PKG_VERSION="bf39941"
+PKG_VERSION="bf399411ed8a2f4047f928653ac8dd02ffd0f662"
 PKG_SHA256="92b9f0a27a9a373b14eab7b12f1bfff5d4857695a688dc4434df8e7623354588"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/mikechristie/open-iscsi"
diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk
index 3c96ef01ae..de4feabe09 100644
--- a/packages/sysutils/open-vm-tools/package.mk
+++ b/packages/sysutils/open-vm-tools/package.mk
@@ -4,12 +4,12 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="open-vm-tools"
-PKG_VERSION="stable-11.1.0"
+PKG_VERSION="11.1.0"
 PKG_SHA256="5930448c65cf298e3dded2a3670750f4affaf3a631500a1774eeb4cfe0a32b80"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/vmware/open-vm-tools"
-PKG_URL="https://github.com/vmware/open-vm-tools/archive/${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/vmware/open-vm-tools/archive/stable-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse glib:host glib libdnet libtirpc"
 PKG_LONGDESC="open-vm-tools: open source implementation of VMware Tools"
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/textproc/tinyxml/package.mk b/packages/textproc/tinyxml/package.mk
index afb9c5b447..a66da2c7ef 100644
--- a/packages/textproc/tinyxml/package.mk
+++ b/packages/textproc/tinyxml/package.mk
@@ -2,11 +2,11 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="tinyxml"
-PKG_VERSION="2.6.2_2"
-PKG_SHA256="8164c9ad48b9028667768a584d62f7760cfbfb90d0dd6214ad174403058da10c"
+PKG_VERSION="2.6.2"
+PKG_SHA256="15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.grinninglizard.com/tinyxml/"
-PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://downloads.sourceforge.net/tinyxml/tinyxml_${PKG_VERSION//./_}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="TinyXML is a simple, small, C++ XML parser."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/tools/atf/package.mk b/packages/tools/atf/package.mk
index 3bfa30cd5b..d412e3ec3d 100644
--- a/packages/tools/atf/package.mk
+++ b/packages/tools/atf/package.mk
@@ -2,12 +2,12 @@
 # Copyright (C) 2018-present Team LibreELEC
 
 PKG_NAME="atf"
-PKG_VERSION="v2.2"
+PKG_VERSION="2.2"
 PKG_SHA256="07e3c058ae2d95c7d516a46fc93565b797e912c3271ddbf29df523b1ab1ee911"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="https://github.com/ARM-software/arm-trusted-firmware"
-PKG_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="ARM Trusted Firmware is a reference implementation of secure world software, including a Secure Monitor executing at Exception Level 3 and various Arm interface standards."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/tools/mkbootimg/package.mk b/packages/tools/mkbootimg/package.mk
index 3d56252c51..a3b0ca02c0 100644
--- a/packages/tools/mkbootimg/package.mk
+++ b/packages/tools/mkbootimg/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mkbootimg"
-PKG_VERSION="6668fc2"
+PKG_VERSION="6668fc24a3130ab003aae9fda95bcd4110617de9"
 PKG_SHA256="d84870e055414d638a3e7eb4b7a3ebf415899841218f24cb3647d06ecf6ddb17"
 PKG_LICENSE="GPL"
 PKG_SITE="https://android.googlesource.com/platform/system/core/+/master/mkbootimg/"