diff --git a/packages/network/samba/build b/packages/network/samba/build
index c4b5f0ec52..3b770c1960 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -37,7 +37,6 @@ else
 fi
 
 export samba_cv_CC_NEGATIVE_ENUM_VALUES=no
-export ac_cv_lib_avahi_client_avahi_client_new=yes
 
 cd $PKG_BUILD/source3
 
@@ -107,6 +106,7 @@ sh autogen.sh
             --with-included-popt \
             --with-included-iniparser \
             $CONFIG_SAMBA \
+            --with-libiconv="$SYSROOT_PREFIX/usr" \
             --with-sqlite3 \
             --with-pthreads \
             --without-setproctitle \