diff --git a/configure.ac b/configure.ac
index de679c9bf..0c930df5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,6 +228,23 @@ PKG_CHECK_MODULES(BATTERY, [
   ecore-con
 ])
 
+PKG_CHECK_MODULES(EXCHANGE,
+ [exchange],
+ [
+        HAVE_EXCHANGE=yes
+        AC_SUBST(EXCHANGE_LIBS)
+        AC_SUBST(EXCHANGE_CFLAGS)
+ ],
+ [
+        HAVE_EXCHANGE=no
+ ])
+AM_CONDITIONAL(HAVE_EXCHANGE, test x$HAVE_EXCHANGE = xyes)
+AC_SUBST(HAVE_EXCHANGE)
+if test x$HAVE_EXCHANGE = xyes; then
+        AC_DEFINE_UNQUOTED(HAVE_EXCHANGE, 1, Package exchange found.)
+fi
+
+
 e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "$ECORE_IMF_LIBS
 e_cflags="-DUSE_E_CONFIG_H "$E_CFLAGS" "$ECORE_IMF_CFLAGS
 e_configflags="-DUSE_E_CONFIG_H"
diff --git a/src/modules/conf_theme/Makefile.am b/src/modules/conf_theme/Makefile.am
index 620dbfe63..f5db89840 100644
--- a/src/modules/conf_theme/Makefile.am
+++ b/src/modules/conf_theme/Makefile.am
@@ -15,7 +15,9 @@ INCLUDES               = -I. \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \
                          -I$(top_srcdir)/src/modules \
-                         @e_cflags@
+                         @e_cflags@ \
+			 @EXCHANGE_CFLAGS@
+
 pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
 pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
@@ -27,7 +29,7 @@ module_la_SOURCES      = e_mod_main.c \
 			 e_int_config_theme_web.c \
 			 e_int_config_theme_web.h
 
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LIBADD       = @e_libs@ @dlopen_libs@ @EXCHANGE_LIBS@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h