diff --git a/legacy/eina/ChangeLog b/legacy/eina/ChangeLog
index a664a013b3..db14e5326d 100644
--- a/legacy/eina/ChangeLog
+++ b/legacy/eina/ChangeLog
@@ -101,3 +101,8 @@
 2011-05-31  Cedric Bail
 
 	* Fix eina_hash_set to handle data == NULL like eina_hash_del.
+
+2011-06-3  Vincent Torri
+
+        * Fix static linking with eina (iconv could potentially not be
+	passed to the linker)
diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac
index a917ba52b5..ba433207b0 100644
--- a/legacy/eina/configure.ac
+++ b/legacy/eina/configure.ac
@@ -482,6 +482,7 @@ AC_ARG_WITH([iconv-link],
    [
     LIBS="$withval $LIBS"
     have_iconv="yes"
+    iconv_libs=$withval
    ])
 
 AC_MSG_CHECKING(for explicit iconv link options)
@@ -529,7 +530,10 @@ iconv_t ic;
 size_t count;
 count = iconv(ic, NULL, NULL, NULL, NULL);
              ]])],
-         [have_iconv="yes"],
+         [
+          have_iconv="yes"
+          iconv_libs="-liconv"
+         ],
          [
           have_iconv="no"
           LIBS=${LIBS_save}
@@ -553,7 +557,10 @@ count = iconv(ic, NULL, NULL, NULL, NULL);
 iconv_t ic;
 size_t count = iconv(ic, NULL, NULL, NULL, NULL);
              ]])],
-         [have_iconv="yes"],
+         [
+          have_iconv="yes"
+          iconv_libs="-liconv_plug"
+         ],
          [
           have_iconv="no"
           LIBS=${LIBS_save}
@@ -563,6 +570,8 @@ size_t count = iconv(ic, NULL, NULL, NULL, NULL);
    fi
 fi
 
+AC_SUBST([iconv_libs])
+
 if test "x${have_iconv}" = "xyes" ; then
    AC_DEFINE([HAVE_ICONV], [1], [Set to 1 if iconv library is installed])
 fi
diff --git a/legacy/eina/eina.pc.in b/legacy/eina/eina.pc.in
index 1a5a745253..3995be0a9f 100644
--- a/legacy/eina/eina.pc.in
+++ b/legacy/eina/eina.pc.in
@@ -8,5 +8,5 @@ Description: A Library that implements fast data types and miscellaneous tools
 @pkgconfig_requires_private@: @requirement_eina@
 Version: @VERSION@
 Libs: -L${libdir} -leina
-Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ -ldl
+Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ @iconv_libs@ -ldl
 Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina