diff --git a/packages/audio/sidplay-libs/package.mk b/packages/audio/sidplay-libs/package.mk
index 7f98382ec6..06640b45d6 100644
--- a/packages/audio/sidplay-libs/package.mk
+++ b/packages/audio/sidplay-libs/package.mk
@@ -9,7 +9,7 @@ PKG_SITE="http://sidplay2.sourceforge.net/"
 PKG_URL="http://mirrors.xbmc.org/build-deps/sources/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="sidplay-libs"
-PKG_BUILD_FLAGS="+pic"
+PKG_BUILD_FLAGS="+pic -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
 
diff --git a/packages/multimedia/gmmlib/package.mk b/packages/multimedia/gmmlib/package.mk
index d94abdee8e..c6f47304bc 100644
--- a/packages/multimedia/gmmlib/package.mk
+++ b/packages/multimedia/gmmlib/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gmmlib"
-PKG_VERSION="22.5.5"
-PKG_SHA256="08db696071510b7e03aa2d9fb7375c6c35f7c327ecd6747424c664c622bb4377"
+PKG_VERSION="22.6.0"
+PKG_SHA256="2be3de25e45ed6b32d6ea173510b9e4ce141c22f9d6ed18dd5b574b33f34748c"
 PKG_ARCH="x86_64"
 PKG_LICENSE="MIT"
 PKG_SITE="https://01.org/linuxmedia"
diff --git a/packages/addons/addon-depends/libiconv/package.mk b/packages/textproc/libiconv/package.mk
similarity index 89%
rename from packages/addons/addon-depends/libiconv/package.mk
rename to packages/textproc/libiconv/package.mk
index 4bfd397dd2..a9e866c472 100644
--- a/packages/addons/addon-depends/libiconv/package.mk
+++ b/packages/textproc/libiconv/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libiconv"
-PKG_VERSION="1.17"
-PKG_SHA256="8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313"
+PKG_VERSION="1.18"
+PKG_SHA256="3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8"
 PKG_LICENSE="GPL"
 PKG_SITE="https://savannah.gnu.org/projects/libiconv/"
 PKG_URL="https://ftp.gnu.org/pub/gnu/libiconv/${PKG_NAME}-${PKG_VERSION}.tar.gz"