diff --git a/configuration/Makefile.am b/configuration/Makefile.am
index bb38af1..b89ec51 100644
--- a/configuration/Makefile.am
+++ b/configuration/Makefile.am
@@ -19,6 +19,7 @@ module_eas_mail_config_la_SOURCES = \
 
 module_eas_mail_config_la_LIBADD = \
 	$(top_builddir)/libeasclient/libeasclient.la \
+	$(top_builddir)/libevoeas/libevoeas.la \
 	$(EVOLUTION_MAIL_LIBS) \
 	$(LIBEDATASERVER_LIBS) \
 	$(LIBEBACKEND_LIBS) \
diff --git a/configure.ac b/configure.ac
index 5d64562..b7d4e2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,6 +62,7 @@ PKG_CHECK_MODULES(WBXML, libwbxml2 >= 0.11)
 PKG_CHECK_MODULES(LIBICAL, libical)
 PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2)
 PKG_CHECK_MODULES(LIBEBACKEND, libebackend-1.2)
+PKG_CHECK_MODULES(GLIB, glib-2.0)
 PKG_CHECK_MODULES(GIO, gio-2.0)
 PKG_CHECK_MODULES(LIBEMAIL_ENGINE, libemail-engine)
 
@@ -70,9 +71,6 @@ CAMEL_PKG="camel-1.2"
 
 PKG_CHECK_MODULES(CAMEL, ${CAMEL_PKG})
 
-AC_SUBST(EVOLUTION_SHELL_CFLAGS)
-AC_SUBST(EVOLUTION_SHELL_LIBS)
-
 PKG_CHECK_MODULES(EVOLUTION_MAIL, evolution-mail${EVO_PKG}, [have_e_mail=yes], [have_e_mail=no])
 AC_SUBST(EVOLUTION_MAIL_CFLAGS)
 AC_SUBST(EVOLUTION_MAIL_LIBS)
@@ -92,16 +90,8 @@ PKG_CHECK_MODULES([MLITE],
 camel_providerdir=`$PKG_CONFIG --variable=camel_providerdir ${CAMEL_PKG}`
 AC_SUBST(camel_providerdir)
 
-if test "$have_e_plugin" = "yes"; then
-   plugindir="`$PKG_CONFIG --variable=plugindir evolution-plugin${EVO_PKG}`"
-   AC_SUBST(plugindir)
-
-   EVOLUTION_PLUGIN_errordir="`$PKG_CONFIG --variable=errordir evolution-plugin`"
-   AC_SUBST(EVOLUTION_PLUGIN_errordir)
-fi
-
 if test "$have_e_shell" = "yes"; then
-   EVOLUTION_imagesdir="`$PKG_CONFIG --variable=imagesdir evolution-shell`"
+   EVOLUTION_imagesdir="`$PKG_CONFIG --variable=imagesdir evolution-shell${EVO_PKG}`"
    AC_SUBST(EVOLUTION_imagesdir)
 fi
 
@@ -111,7 +101,7 @@ AC_SUBST(EVOLUTION_privlibdir)
 eds_moduledir=`$PKG_CONFIG --variable=moduledir libebackend-1.2`
 AC_SUBST(eds_moduledir)
 
-evo_moduledir=`$PKG_CONFIG --variable=moduledir evolution-shell-3.0`
+evo_moduledir=`$PKG_CONFIG --variable=moduledir evolution-shell${EVO_PKG}`
 AC_SUBST(evo_moduledir)
 
 AC_PATH_PROGS(ASKPASS, [ssh-askpass gnome-ssh-askpass], [ssh-askpass], [path = $PATH:/usr/libexec:/usr/libexec/ssh:/usr/libexec/openssh:$libexecdir:$libexecdir/ssh:$libexecdir/openssh])
diff --git a/libeasclient/Makefile.am b/libeasclient/Makefile.am
index c6745b8..8f7ad4a 100644
--- a/libeasclient/Makefile.am
+++ b/libeasclient/Makefile.am
@@ -3,12 +3,14 @@ lib_LTLIBRARIES =  libeasclient.la
 
 libeasclient_la_CPPFLAGS =		\
 		$(GLIB_CFLAGS)		\
+		$(GIO_CFLAGS)		\
 		$(LIBXML_CFLAGS)	\
 		-DG_LOG_DOMAIN=\"libeasclient\" \
 		$(NULL)
 
-libeasclient_la_LDFLAGS =		\
+libeasclient_la_LIBADD =		\
 		$(GLIB_LIBS)		\
+		$(GIO_LIBS)		\
 		$(LIBXML_LIBS)		\
 		$(NULL)
 
