diff --git a/legacy/efreet/configure.in b/legacy/efreet/configure.in
index 261804bae0..3037751c01 100644
--- a/legacy/efreet/configure.in
+++ b/legacy/efreet/configure.in
@@ -1,7 +1,12 @@
-AC_INIT(configure.in)
+rm -f config.cache
+
+AC_INIT(efreet, 0.0.3.006, enlightenment-devel@lists.sourceforge.net)
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE(efreet, 0.0.3.006)
+
+AM_INIT_AUTOMAKE(1.6 dist-bzip2)
 AM_CONFIG_HEADER(config.h)
 
 AC_ISC_POSIX
@@ -9,13 +14,21 @@ AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 AC_C_CONST
-AM_ENABLE_SHARED
-AM_PROG_LIBTOOL
-AC_FUNC_ALLOCA
 AC_C___ATTRIBUTE__
 
-dnl Set PACKAGE_DATA_DIR in config.h.
-AC_DEFINE_DIR([PACKAGE_DATA_DIR], [datadir], [Shared Data Directory.])
+AC_LIBTOOL_WIN32_DLL
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+AC_PROG_LIBTOOL
+
+VMAJ=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $1);}'`
+VMIN=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $2);}'`
+VMIC=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $3);}'`
+SNAP=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $4);}'`
+version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
+AC_SUBST(version_info)
+
+AC_FUNC_ALLOCA
 
 PCFLAGS=$CFLAGS
 
diff --git a/legacy/efreet/src/bin/Makefile.am b/legacy/efreet/src/bin/Makefile.am
index 315d15c023..a17ebf8e95 100644
--- a/legacy/efreet/src/bin/Makefile.am
+++ b/legacy/efreet/src/bin/Makefile.am
@@ -3,8 +3,13 @@ SUBDIRS = data compare
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = \
--I. -I$(top_srcdir)/src/lib @ECORE_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+@ECORE_CFLAGS@ \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\"
 
 bin_PROGRAMS = efreet_test efreet_spec_test efreet_cache_test
 
diff --git a/legacy/efreet/src/bin/compare/Makefile.am b/legacy/efreet/src/bin/compare/Makefile.am
index bdd493cdab..b04da8b1f8 100644
--- a/legacy/efreet/src/bin/compare/Makefile.am
+++ b/legacy/efreet/src/bin/compare/Makefile.am
@@ -1,7 +1,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = \
--I. -I$(top_srcdir)/src/lib @ECORE_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+@ECORE_CFLAGS@
 
 bin_PROGRAMS = efreet_alloc efreet_menu_alloc
 
diff --git a/legacy/efreet/src/bin/data/Makefile.am b/legacy/efreet/src/bin/data/Makefile.am
index 20731f982d..f861375ec1 100644
--- a/legacy/efreet/src/bin/data/Makefile.am
+++ b/legacy/efreet/src/bin/data/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = sub
+
 MAINTAINERCLEANFILES = Makefile.in
 
 testdir = $(pkgdatadir)/test
diff --git a/legacy/efreet/src/bin/data/sub/Makefile.am b/legacy/efreet/src/bin/data/sub/Makefile.am
index cebfbc350c..7aaf7fc20e 100644
--- a/legacy/efreet/src/bin/data/sub/Makefile.am
+++ b/legacy/efreet/src/bin/data/sub/Makefile.am
@@ -1,5 +1,8 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
 testdir = $(pkgdatadir)/test/sub
 test_DATA = \
-test.desktop 
+test.desktop
 
 EXTRA_DIST = $(test_DATA)
diff --git a/legacy/efreet/src/lib/Makefile.am b/legacy/efreet/src/lib/Makefile.am
index e6f7098811..a39f4786b5 100644
--- a/legacy/efreet/src/lib/Makefile.am
+++ b/legacy/efreet/src/lib/Makefile.am
@@ -1,10 +1,9 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_builddir) \
 -I$(top_srcdir) \
--g -O0 -W -Wall \
 @ECORE_CFLAGS@
 
 lib_LTLIBRARIES = libefreet.la libefreet_mime.la
@@ -48,6 +47,6 @@ installed_headersdir = $(prefix)/include/efreet
 installed_headers_DATA = $(EFREETHEADERS) $(EFREETMIMEHEADERS)
 
 libefreet_la_LIBADD = @ECORE_LIBS@
-libefreet_la_LDFLAGS = -version-info 1:0:0
+libefreet_la_LDFLAGS = -version-info @version_info@
 
 libefreet_mime_la_LIBADD = @ECORE_LIBS@ libefreet.la