diff --git a/.cvsignore b/.cvsignore
index 1f3d90c..25c9a73 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,6 @@
+.git
+.gitignore
+compile
 config.log
 config.sub
 config.cache
diff --git a/api/Makefile.am b/api/Makefile.am
index a52a351..127713b 100644
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -8,11 +8,8 @@ lib_LTLIBRARIES = libepplet.la
 
 include_HEADERS = epplet.h
 libepplet_la_SOURCES = epplet.c $(SRCS_SNPRINTF)
-libepplet_la_DEPENDENCIES = $(top_builddir)/config.h epplet.h
+libepplet_la_CPPFLAGS = -I$(top_srcdir) $(IMLIB2_CFLAGS) $(X_CFLAGS) -D ENLIGHTENMENT_ROOT=\"$(datadir)/e16\"
+libepplet_la_LIBADD = $(IMLIB2_LIBS) $(GLX_LIBS) $(X_LIBS) -lXext -lX11
 libepplet_la_LDFLAGS = -version-info 2:0:0
 
-INCLUDES = -I$(top_srcdir) $(X_CFLAGS) -DEROOT=\"@EROOT@\"
-
-LDADD = -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
-
 EXTRA_DIST = epplet.h.in snprintf.c
diff --git a/api/epplet.c b/api/epplet.c
index fdb387b..4d30b3f 100644
--- a/api/epplet.c
+++ b/api/epplet.c
@@ -5653,7 +5653,7 @@ Epplet_find_instance(char *name)
    pid_t               pid;
 
    /* Set epplet data dir */
-   Esnprintf(s, sizeof(s), EROOT "/epplet_data/%s", name);
+   Esnprintf(s, sizeof(s), ENLIGHTENMENT_ROOT "/epplet_data/%s", name);
    data_dir = Estrdup(s);
 
    /* Find E dir */
diff --git a/configure.in b/configure.in
index 5f30f20..913ec8a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,22 +1,14 @@
-AC_INIT(configure.in)
+m4_define([pkg_version],  [0.11])
+m4_define([pkg_revision], [0.00])
+m4_define([pkg_ver_rev],  m4_ifdef([pkg_revision], [pkg_version-pkg_revision], [pkg_version]))
+m4_define([rpm_revision], m4_ifdef([pkg_revision], [pkg_revision], [1]))
 
-E_PKG_VERSION=0.10
-#E_PKG_REVISION=0.01
-if test "x$E_PKG_REVISION" != "x"; then
-  E_PKG_VER_REV=$E_PKG_VERSION-$E_PKG_REVISION
-  E_RPM_REVISION=$E_PKG_REVISION
-else
-  E_PKG_VER_REV=$E_PKG_VERSION
-  E_RPM_REVISION=1
-fi
+AC_INIT(epplets, [pkg_ver_rev], [enlightenment-devel@lists.sourceforge.net])
+AM_INIT_AUTOMAKE([foreign])
 
-AM_INIT_AUTOMAKE(epplets, $E_PKG_VER_REV)
-
-AC_DEFINE_UNQUOTED(E_PKG_VERSION, "$E_PKG_VERSION", [Version])
-AC_SUBST(E_PKG_VERSION)
-AC_DEFINE_UNQUOTED(E_PKG_REVISION, "$E_PKG_REVISION", [Revision])
-AC_SUBST(E_PKG_REVISION)
-AC_SUBST(E_RPM_REVISION)
+AC_DEFINE(E_PKG_VERSION, ["pkg_version"], [Version])
+AC_SUBST(E_PKG_VERSION,  [pkg_version])
+AC_SUBST(E_RPM_REVISION, [rpm_revision])
 
 # reasonable guesses for where stuff is installed
 if test "x$prefix" = "xNONE"; then
@@ -38,7 +30,11 @@ AC_MINIX
 dnl# At least make the attempt to support CygWin32
 AC_CYGWIN
 
-AM_PROG_LIBTOOL
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl
+AC_ENABLE_SHARED
+AC_PROG_LIBTOOL
 
 AC_GCC_TRADITIONAL
 
@@ -65,14 +61,8 @@ AC_LN_S
 
 AC_C_CONST
 AC_C_INLINE
-AC_PATH_XTRA
 
-if test "$ac_cv_lib_socket_connect" = "yes" ; then
-  SUBLIBS="-lsocket"
-fi
-if test "$ac_cv_lib_nsl_gethostbyname" = "yes" ; then
-  SUBLIBS="$SUBLIBS -lnsl"
-fi
+AC_PATH_XTRA
 
 dnl# Checks for header files.
 AC_HEADER_SYS_WAIT
@@ -90,40 +80,6 @@ AC_CHECK_FUNCS(snprintf, x=1, x=0)
 AC_SUBST(HAVE_SNPRINTF, $x)
 AM_CONDITIONAL(BUILD_SNPRINTF, test "x$x" = "x0")
 
-# ok enlightenment d00ds want to ignore civilization and install
-# everything in one place. The rest of use prefer sanity.
-#
-AC_ARG_ENABLE(fsstd,
-  [  --enable-fsstd          install files following FSSTD @<:@default=yes@:>@],,
-  enable_fsstd=yes)
-if test "x$enable_fsstd" = "xyes"; then
-  ENLIGHTENMENT_ROOT=${datadir}/e16
-  ENLIGHTENMENT_BIN=${bindir}
-  USE_FSSTD=yes
-else
-  ENLIGHTENMENT_ROOT=${prefix}/e16
-  ENLIGHTENMENT_BIN=${prefix}/e16/bin
-  USE_FSSTD=no
-fi
-EROOT=`eval echo $ENLIGHTENMENT_ROOT`
-AC_SUBST(EROOT)
-
-dnl#
-dnl# X LIBRARIES
-dnl#
-AC_CHECK_LIB(X11, XOpenDisplay, X_LIBS="$X_LIBS -lX11", [
-echo "ERROR:  You need libX11 to build Epplets.  Verify that you have libX11.a or";
-echo "        libX11.so installed and that it is located in the X libraries";
-echo "        directory shown above.  If it is in a different directory, try using";
-echo "        the --x-libraries parameter to configure.";
-             AC_MSG_ERROR([Fatal:  libX11 not found.])], $X_LIBS $SUBLIBS)
-AC_CHECK_LIB(Xext, XextAddDisplay, X_LIBS="-lXext $X_LIBS", [
-echo "ERROR:  You need libXext to build Epplets.  Verify that you have libXext.a or";
-echo "        libXext.so installed and that it is located in the X libraries";
-echo "        directory shown above.  If it is in a different directory, try using";
-echo "        the --x-libraries parameter to configure.";
-             AC_MSG_ERROR([Fatal:  libXext not found.])], $X_LIBS $SUBLIBS)
-
 AC_ARG_ENABLE(glx,
   [  --enable-glx            build with GLX support @<:@default=yes@:>@],,
   enable_glx=yes)
diff --git a/epplets/Makefile.am b/epplets/Makefile.am
index 9e6433e..89a1c98 100644
--- a/epplets/Makefile.am
+++ b/epplets/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-edatadir = $(EROOT)
+edatadir = $(datadir)/e16
 
 bin_PROGRAMS = E-Load.epplet E-Clock.epplet E-Time.epplet E-Net.epplet \
 E-Cpu.epplet E-Biff.epplet E-Power.epplet \
@@ -16,160 +16,161 @@ EXTRA_PROGRAMS = EppletTest.epplet EppletConfigTest.epplet E-Mixer.epplet \
                  Emix.epplet E-PlayCD.epplet E-OpenGL-Demo.epplet \
 		 E-SD.epplet
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/api $(IMLIB2_CFLAGS) $(X_CFLAGS) @SGI_DEFINES@
-LDADD = $(top_builddir)/api/libepplet.la $(IMLIB2_LIBS) $(GLX_LIBS) $(X_LIBS) $(KSTAT_LIBS)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/api $(IMLIB2_CFLAGS) $(X_CFLAGS)
+LDADD = $(top_builddir)/api/libepplet.la $(X_LIBS) $(KSTAT_LIBS)
 
 ################ Conditional Builds ################
 E_Mixer_epplet_SOURCES = E-Mixer.c
+E_Mixer_epplet_CPPFLAGS = $(INCLUDES) @SGI_DEFINES@
 E_Mixer_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Mixer_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Mixer_epplet_LDFLAGS = -rpath $(libdir)
 E_Mixer_epplet_LDADD = $(LDADD) @SGI_LIBS@
 
 Emix_epplet_SOURCES = Emix.c
 Emix_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-Emix_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+Emix_epplet_LDFLAGS = -rpath $(libdir)
 
 E_PlayCD_epplet_SOURCES = E-PlayCD.c
 E_PlayCD_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_PlayCD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_PlayCD_epplet_LDFLAGS = -rpath $(libdir)
 E_PlayCD_epplet_LDADD = $(LDADD) -lcdaudio
 
 EppletTest_epplet_SOURCES = TestEpplet.c
 EppletTest_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-EppletTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+EppletTest_epplet_LDFLAGS = -rpath $(libdir)
 
 EppletConfigTest_epplet_SOURCES = ConfigTestEpplet.c
 EppletConfigTest_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-EppletConfigTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+EppletConfigTest_epplet_LDFLAGS = -rpath $(libdir)
 
 E_OpenGL_Demo_epplet_SOURCES = E-OpenGL-Demo.c
 E_OpenGL_Demo_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_OpenGL_Demo_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_OpenGL_Demo_epplet_LDFLAGS = -rpath $(libdir)
 ####################################################
 
 E_Exec_epplet_SOURCES = E-Exec.c
 E_Exec_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Exec_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Exec_epplet_LDFLAGS = -rpath $(libdir)
 
 E_SD_epplet_SOURCES = E-SD.c esdcloak.c utils.c utils.h esdcloak.h
 E_SD_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_SD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lesd
+E_SD_epplet_LDFLAGS = -rpath $(libdir) -lesd
 
 E_Load_epplet_SOURCES = E-Load.c
 E_Load_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Load_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Load_epplet_LDFLAGS = -rpath $(libdir)
 E_Load_epplet_LDADD = $(LDADD) $(GTLIBS)
 
 E_LoadMeter_epplet_SOURCES = E-LoadMeter.c load.c
 E_LoadMeter_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_LoadMeter_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_LoadMeter_epplet_LDFLAGS = -rpath $(libdir)
 E_LoadMeter_epplet_LDADD = $(LDADD) $(GTLIBS)
 
 E_Clock_epplet_SOURCES = E-Clock.c
 E_Clock_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Clock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Clock_epplet_LDFLAGS = -rpath $(libdir)
 
 E_MoonClock_epplet_SOURCES = E-MoonClock.c CalcEphem.c CalcEphem.h Moon.c
 E_MoonClock_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_MoonClock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_MoonClock_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Time_epplet_SOURCES = E-Time.c
 E_Time_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Time_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Time_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Magic_epplet_SOURCES = E-Magic.c
 E_Magic_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Magic_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Magic_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Toolbox_epplet_SOURCES = E-Toolbox.c
 E_Toolbox_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Toolbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Toolbox_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Areas_epplet_SOURCES = E-Areas.c 
 E_Areas_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Areas_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Areas_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Bandwidth_epplet_SOURCES = E-Bandwidth.c net.c net.h
 E_Bandwidth_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Bandwidth_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Bandwidth_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Net_epplet_SOURCES = E-Net.c net.c net.h
 E_Net_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Net_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Net_epplet_LDFLAGS = -rpath $(libdir)
 
 E_NetFlame_epplet_SOURCES = E-NetFlame.c net.c net.h
 E_NetFlame_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_NetFlame_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_NetFlame_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Wireless_epplet_SOURCES = E-Wireless.c
 E_Wireless_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Wireless_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Wireless_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Cpu_epplet_SOURCES = E-Cpu.c proc.h
 E_Cpu_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Cpu_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Cpu_epplet_LDFLAGS = -rpath $(libdir)
 E_Cpu_epplet_LDADD = $(LDADD) $(GTLIBS)
 
 E_Power_epplet_SOURCES = E-Power.c
 E_Power_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Power_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Power_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Biff_epplet_SOURCES = E-Biff.c mbox.c
 E_Biff_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Biff_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Biff_epplet_LDFLAGS = -rpath $(libdir)
 
 E_MemWatch_epplet_SOURCES = E-MemWatch.c
 E_MemWatch_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_MemWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_MemWatch_epplet_LDFLAGS = -rpath $(libdir)
 E_MemWatch_epplet_LDADD = $(LDADD) $(GTLIBS)
 
 E_Disk_epplet_SOURCES = E-Disk.c
 E_Disk_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Disk_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Disk_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Sys_epplet_SOURCES = E-Sys.c
 E_Sys_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Sys_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Sys_epplet_LDFLAGS = -rpath $(libdir)
 E_Sys_epplet_LDADD = $(LDADD) $(GTLIBS)
 
 E_Slides_epplet_SOURCES = E-Slides.c
 E_Slides_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Slides_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Slides_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Xss_epplet_SOURCES = E-Xss.c
 E_Xss_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Xss_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Xss_epplet_LDFLAGS = -rpath $(libdir)
 
 E_ScreenShoot_epplet_SOURCES = \
 E-ScreenShoot.c cloak.c utils.c utils.h cloak.h \
 E-ScreenShoot_ftp.c E-ScreenShoot_ftp.h
 E_ScreenShoot_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_ScreenShoot_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_ScreenShoot_epplet_LDFLAGS = -rpath $(libdir)
 
 E_NetGraph_epplet_SOURCES = E-NetGraph.c net.c net.h
 E_NetGraph_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_NetGraph_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_NetGraph_epplet_LDFLAGS = -rpath $(libdir)
 
 E_ScreenSave_epplet_SOURCES = \
 E-ScreenSave.c cloak.c utils.c utils.h cloak.h
 E_ScreenSave_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_ScreenSave_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_ScreenSave_epplet_LDFLAGS = -rpath $(libdir)
 
 E_UrlWatch_epplet_SOURCES = E-UrlWatch.c E-UrlWatch.h utils.c utils.h
 E_UrlWatch_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_UrlWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_UrlWatch_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Mountbox_epplet_SOURCES = E-Mountbox.c
 E_Mountbox_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Mountbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Mountbox_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Pinger_epplet_SOURCES = E-Pinger.c
 E_Pinger_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Pinger_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Pinger_epplet_LDFLAGS = -rpath $(libdir)
 
 E_Pants_epplet_SOURCES = E-Pants.c
 E_Pants_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
-E_Pants_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+E_Pants_epplet_LDFLAGS = -rpath $(libdir)
 
 # You can use the following command to generate this line:
 # ABOUT_DOCS = `(cd epplets && ls -1d *.ABOUT/* 2>/dev/null | grep -v CVS)`