--- a/configure
+++ b/configure
@@ -945,6 +945,7 @@ enable_libtool_lock
 enable_largefile
 enable_ld_version_script
 enable_build_gcov
+enable_libiconv_tiny
 enable_nls
 enable_rpath
 with_libiconv_prefix
@@ -1604,6 +1605,7 @@ Optional Features:
                           enable/disable use of linker version script.
                           (default is system dependent)
   --enable-build-gcov     build POPT instrumented for gcov
+  --enable-libiconv-tiny  build with libiconv-tiny from OpenWrt
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
 
@@ -13334,6 +13336,15 @@ if test "${enable_build_gcov+set}" = set
 fi
 
 
+# Check whether --enable-libiconv-tiny was given.
+if test "${enable_libiconv_tiny+set}" = set; then
+  enableval=$enable_libiconv_tiny;
+  if test ".$enableval" = .yes; then
+    LIBS="$LIBS -liconv"
+  fi
+fi
+
+
 { $as_echo "$as_me:$LINENO: checking for setreuid" >&5
 $as_echo_n "checking for setreuid... " >&6; }
 if test "${ac_cv_func_setreuid+set}" = set; then