diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 4fdf0f75a60..57775e693bd 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -8,7 +8,8 @@ PKG_SHA256="682fe2afa246bc708407914a12baff4c76839443afafee0b7b199da856fb89e2"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python3 zlib systemd lzo pcre swig:host libass commons-lang3 commons-text curl fontconfig fribidi groovy tinyxml tinyxml2 libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid libdvdnav libfmt lirc libfstrcmp flatbuffers:host flatbuffers libudfread spdlog"
+PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python3 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml tinyxml2 libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid libdvdnav libfmt lirc libfstrcmp flatbuffers:host flatbuffers libudfread spdlog"
+PKG_DEPENDS_UNPACK="commons-lang3 commons-text groovy"
 PKG_DEPENDS_HOST="toolchain"
 PKG_LONGDESC="A free and open source cross-platform media player."
 PKG_BUILD_FLAGS="+speed"
diff --git a/packages/security/libxcrypt/package.mk b/packages/security/libxcrypt/package.mk
index a440240df3a..11e2c43be66 100644
--- a/packages/security/libxcrypt/package.mk
+++ b/packages/security/libxcrypt/package.mk
@@ -10,4 +10,8 @@ PKG_URL="https://github.com/besser82/libxcrypt/releases/download/v${PKG_VERSION}
 PKG_DEPENDS_TARGET="glibc"
 PKG_LONGDESC="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
 
+if [ "${MOLD_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" mold:host"
+fi
+
 PKG_CONFIGURE_OPTS_TARGET="--disable-obsolete-api"