diff --git a/Makefile.am b/Makefile.am
index 076cd41..6d45fd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,4 +25,4 @@ clean-local:
 	 rm -rf e-module-diskio.edj module.desktop *~
 uninstall:
 	 rm -rf $(DESTDIR)$(datadir)
-	 
+
diff --git a/configure.in b/configure.in
index f253af7..deb8b23 100644
--- a/configure.in
+++ b/configure.in
@@ -30,16 +30,25 @@ MODULE_ARCH="$host_os-$host_cpu"
 AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
 
-AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH)
+# Find edje_cc
+PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
+AC_ARG_WITH(edje-cc,
+  AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]),
+  [
+    v=$withval;
+    EDJE_CC=$v
+  ],[
+    EDJE_CC=$(pkg-config --variable=prefix edje)/bin/edje_cc
+  ]
+)
+AC_SUBST(EDJE_CC)
+AC_MSG_CHECKING([Which edje_cc to use])
+AC_MSG_RESULT(${EDJE_CC})
 
-AC_PATH_PROG(E_CONFIG, "enlightenment-config", "", $PATH)
-e_cflags=`$E_CONFIG --cflags`
-e_libs=`$E_CONFIG --libs`
-e_modules=`$E_CONFIG --module-dir`
-AC_SUBST(e_cflags)
-AC_SUBST(e_libs)
+PKG_CHECK_MODULES(E, [enlightenment])
+
+datadir=$(pkg-config --variable=modules enlightenment)/${PACKAGE}
 
-datadir="${e_modules}/${PACKAGE}"    
 AC_ARG_ENABLE(homedir-install,
   AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
   [ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]
diff --git a/src/Makefile.am b/src/Makefile.am
index f4669fc..d47908b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,15 +3,15 @@ MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = -I. \
 	 -I$(top_srcdir) \
 	 -I$(includedir) \
-	 @e_cflags@
+	 @E_CFLAGS@
 
 pkgdir = $(datadir)/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 module_la_SOURCES = e_mod_main.h \
 		    e_mod_main.c \
                     e_mod_config.c
-		    
-module_la_LIBADD = @e_libs@
+
+module_la_LIBADD = @E_LIBS@
 module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h