diff --git a/configure.ac b/configure.ac
index 4fdc986188e..610842421c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -644,7 +644,7 @@ LIBDOVECOT_LIBLANG='$(top_builddir)/src/lib-language/libdovecot-language.la'
 LIBDOVECOT_OPENSSL='$(top_builddir)/src/lib-ssl-iostream/libssl_iostream_openssl.la'
 LIBDOVECOT_OPENSSL_DEPS="$LIBDOVECOT_OPENSSL"
 
-LIBDOVECOT_TEST_LIBS="\$(LIBPCRE_LIBS_STATIC) \$(LIBPCRE_LIBS) \$(ZLIB_LIBS_STATIC) \$(ZLIB_LIBS) \$(MODULE_LIBS) \$(DLLIB) -lm"
+LIBDOVECOT_TEST_LIBS="\$(LIBPCRE_LIBS_STATIC) \$(LIBPCRE_LIBS) \$(ZLIB_LIBS_STATIC) \$(ZLIB_LIBS) \$(MODULE_LIBS) \$(DLLIB) -lm -liconv"
 
 AC_SUBST(LIBDOVECOT)
 AC_SUBST(LIBPCRE_LIBS_STATIC)
diff --git a/src/lib-dovecot/Makefile.am b/src/lib-dovecot/Makefile.am
index b69fc8269cb..ab08bbdd961 100644
--- a/src/lib-dovecot/Makefile.am
+++ b/src/lib-dovecot/Makefile.am
@@ -12,7 +12,7 @@ libdovecot_la_LIBADD = \
 	$(RELRO_LDFLAGS)
 
 libdovecot_la_DEPENDENCIES = $(LIBDOVECOT_LA_LIBS)
-libdovecot_la_LDFLAGS = -export-dynamic
+libdovecot_la_LDFLAGS = -export-dynamic -liconv
 
 if HAVE_GSSAPI
 libdovecot_gssapi_la_CPPFLAGS = $(AM_CPPFLAGS) $(KRB5_CFLAGS)