diff --git a/configure.in b/configure.in
index 1212805..3864902 100644
--- a/configure.in
+++ b/configure.in
@@ -85,7 +85,21 @@ AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH)
 #
 # Check Enlightenment
 #
-AC_PATH_GENERIC([enlightenment], [0.16.999.037], [], [AC_MSG_ERROR(Enlightenment is not installed)],)
+AC_ARG_WITH(enlightenment-config,
+[  --with-enlightenment-config=E_CONFIG    use enlightenment-config specified ],
+[
+  E_CONFIG=$withval;
+  echo "using "$E_CONFIG" for enlightenment-config";
+],[
+  PROG="enlightenment-config";
+  AC_PATH_PROG(E_CONFIG, $PROG, "", $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)
+AC_SUBST(e_modules)
 
 AC_OUTPUT([
 Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 499fb33..bd1ada3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = -I. \
 	 -I$(top_srcdir) \
 	 -I$(includedir) \
-	 @ENLIGHTENMENT_CFLAGS@
+	 @e_cflags@
 
 pkgdir = $(datadir)/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
@@ -19,7 +19,7 @@ module_la_SOURCES = e_mod_main.h \
 		    e_mod_config.c \
 		    e_mod_configure.c
 		    
-module_la_LIBADD = @ENLIGHTENMENT_LIBS@
+module_la_LIBADD = @e_libs@
 module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h