diff --git a/configure.ac b/configure.ac
index bea0922e46..1c915f223f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1077,6 +1077,7 @@ AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
 ### Checks for linker characteristics
 
 ### Checks for library functions
+EFL_CHECK_FUNCS([EO], [dladdr])
 
 ### Check availability
 
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index d861e5ffdb..9860844e9b 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -109,7 +109,7 @@ lib_ecore_libecore_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_DATA_DIR=\"$(datadir)/ecore\" \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
 @ECORE_CFLAGS@
-lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@
+lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@ @EVIL_LIBS@
 lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@
 lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 06ea5201ab..9a5c2e88ab 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -34,6 +34,6 @@ endif
 endif
 
 lib_ecore_con_libecore_con_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_CON_CFLAGS@
-lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@
+lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@ @EVIL_LIBS@
 lib_ecore_con_libecore_con_la_DEPENDENCIES = @ECORE_CON_INTERNAL_LIBS@
 lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
index 1d41e054c8..4740b76253 100644
--- a/src/Makefile_Ecore_Ipc.am
+++ b/src/Makefile_Ecore_Ipc.am
@@ -12,6 +12,6 @@ lib/ecore_ipc/ecore_ipc.c \
 lib/ecore_ipc/ecore_ipc_private.h
 
 lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_IPC_CFLAGS@
-lib_ecore_ipc_libecore_ipc_la_LIBADD = @ECORE_IPC_LIBS@
+lib_ecore_ipc_libecore_ipc_la_LIBADD = @ECORE_IPC_LIBS@ @EVIL_LIBS@
 lib_ecore_ipc_libecore_ipc_la_DEPENDENCIES = @ECORE_IPC_INTERNAL_LIBS@
 lib_ecore_ipc_libecore_ipc_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index a6055f15fd..c5da42179e 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -31,7 +31,7 @@ lib_eet_libeet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
 @EET_CFLAGS@
-lib_eet_libeet_la_LIBADD = @EET_LIBS@
+lib_eet_libeet_la_LIBADD = @EET_LIBS@ @EVIL_LIBS@
 lib_eet_libeet_la_DEPENDENCIES = @EET_INTERNAL_LIBS@
 lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index 3225316156..6bd62f3de3 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -46,21 +46,21 @@ lib/efreet/efreet_xml.h \
 lib/efreet/efreet_cache_private.h
 
 lib_efreet_libefreet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@
+lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@ @EVIL_LIBS@
 lib_efreet_libefreet_la_DEPENDENCIES = @EFREET_INTERNAL_LIBS@
 lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
 # libefreet_mime.la
 lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c
 lib_efreet_libefreet_mime_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@
+lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@ @EVIL_LIBS@
 lib_efreet_libefreet_mime_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
 # libefreet_trash.la
 lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c
 lib_efreet_libefreet_trash_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@
+lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@ @EVIL_LIBS@
 lib_efreet_libefreet_trash_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@