diff --git a/recipes/tools/cosmic-files/recipe.toml b/recipes/tools/cosmic-files/recipe.toml
index 45fe3182..907227aa 100644
--- a/recipes/tools/cosmic-files/recipe.toml
+++ b/recipes/tools/cosmic-files/recipe.toml
@@ -12,6 +12,11 @@ dependencies = [
 script = """
 DYNAMIC_INIT
 export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr"
+if [ "${COOKBOOK_DYNAMIC}" != "1" ]
+then
+    # Statically linked i586 and riscv64gc need libiconv manually linked
+    export RUSTFLAGS="${RUSTFLAGS} -liconv"
+fi
 cookbook_cargo --no-default-features
 
 mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps/"
diff --git a/recipes/tools/cosmic-term/recipe.toml b/recipes/tools/cosmic-term/recipe.toml
index bb06c54d..52aa69f6 100644
--- a/recipes/tools/cosmic-term/recipe.toml
+++ b/recipes/tools/cosmic-term/recipe.toml
@@ -12,6 +12,11 @@ dependencies = [
 script = """
 DYNAMIC_INIT
 export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr"
+if [ "${COOKBOOK_DYNAMIC}" != "1" ]
+then
+    # Statically linked i586 and riscv64gc need libiconv manually linked
+    export RUSTFLAGS="${RUSTFLAGS} -liconv"
+fi
 cookbook_cargo --no-default-features
 
 mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps"