diff --git a/Epplets.spec.in b/Epplets.spec.in
deleted file mode 100644
index 9d3a5bf..0000000
--- a/Epplets.spec.in
+++ /dev/null
@@ -1,111 +0,0 @@
-%define	name	epplets
-%define	dname	@PACKAGE@
-%define	fname	@PACKAGE@
-%define	version	@VERSION@
-%define	release	1
-%define	serial	2
-%define	prefix	/usr
-
-%define	deroot	%{prefix}/share/enlightenment
-%define	debin	%{prefix}/bin
-
-Summary:	Applets for enlightenment.
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
-Serial:		%{serial}
-Prefix:		%{prefix}
-Copyright:	GPL
-Group:		User Interface/Desktops
-URL:		http://www.enlightenment.org
-Vendor:		http://www.enlightenment.org
-Source:		ftp://ftp.enlightenment.org/enlightenment/epplets/%{fname}-%{version}.tar.gz
-BuildRoot:	/var/tmp/%{name}-%{version}
-
-Conflicts:	Epplets
-Requires:	enlightenment >= 0.16.0, epplets-base = %{version}
-
-Distribution:	Freshmeat RPMs
-Packager:	Ryan Weaver <ryanw@infohwy.com>
-
-%description
-An epplet is an applet designed specificly for use with enlightenment
-This packages contains several epplets; two cpu load meters, two clocks,
-a network load monitor, aswell as a E-Biff
-
-%package	base
-Summary:	Core API libs for epplets.
-Group:		System Environment/Libraries
-Conflicts:	epplet-base
-
-%description	base
-An epplet is an applet designed specificly for use with enlightenment
-This packages contains the core API libs and headers for building epplets.
-
-%prep
-%setup -q -n %{dname}-%{version}
-
-%build
-if [ -z $EROOT ]; then EROOT=%{deroot}; export EROOT; fi
-if [ -z $EBIN ]; then EBIN=%{debin}; export EBIN; fi
-
-if [ -z $GNOME_FRIENDLY ]; then
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
-else
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --disable-autorespawn
-fi
-
-make
-
-%install
-if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
-mkdir -p $RPM_BUILD_ROOT
-
-if [ -z $EROOT ]; then EROOT=%{deroot}; export EROOT; fi
-if [ -z $EBIN ]; then EBIN=%{debin}; export EBIN; fi
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-# Make all the aircut3.ttf and bg.png files symlinks to 1 of each.
-(
-	for i in `find $RPM_BUILD_ROOT$EROOT/epplet_data -name aircut3.ttf`; do
-		ln -fs ../../aircut3.ttf $i;
-	done
-	install -m 644 epplets/E-Cpu.ABOUT/aircut3.ttf $RPM_BUILD_ROOT$EROOT/epplet_data
-	for i in `find $RPM_BUILD_ROOT$EROOT/epplet_data -name bg.png`; do
-		ln -fs ../../bg.png $i;
-	done
-	install -m 644 epplets/E-Cpu.ABOUT/bg.png $RPM_BUILD_ROOT$EROOT/epplet_data
-)
-
-## Build File List
-if [ -e epplets-files ]; then rm epplets-files; fi
-if [ -e epplets-files.base ]; then rm epplets-files.base; fi
-
-echo '%defattr(-,root,root)'	     > epplets-files
-echo '%doc ChangeLog'		    >> epplets-files
-echo "$EBIN/*.epplet"		    >> epplets-files
-echo "%dir $EROOT/epplet_data"	    >> epplets-files
-echo "$EROOT/epplet_data/*"	    >> epplets-files
-echo "%dir $EROOT/epplet_icons"	    >> epplets-files
-echo "$EROOT/epplet_icons/*"	    >> epplets-files
-
-echo '%defattr(-,root,root)'	     > epplets-files.base
-echo "%{prefix}/lib/libepplet.so.*" >> epplets-files.base
-echo "%{prefix}/include/epplet.h"   >> epplets-files.base
-echo "%{prefix}/lib/libepplet.a"    >> epplets-files.base
-echo "%{prefix}/lib/libepplet.so"   >> epplets-files.base
-
-%post	base -p /sbin/ldconfig
-%postun	base -p /sbin/ldconfig
-
-%clean
-if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
-if [ -e epplets-files ]; then rm epplets-files; fi
-if [ -e epplets-files.base ]; then rm epplets-files.base; fi
-
-%files		-f epplets-files
-%files	base	-f epplets-files.base
-
-%changelog
-
diff --git a/configure.in b/configure.in
index 4b34106..6b874da 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl# $Id$
 
 AC_INIT(api/epplet.c)
-AM_INIT_AUTOMAKE(Epplets, 0.6)
+AM_INIT_AUTOMAKE(epplets, 0.6)
 
 dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
 if test ! -z "${CFLAGS}" -o ! -z "${CCOPTS}"; then
@@ -47,6 +47,9 @@ if test -z "$CFLAGS_GIVEN"; then
 else
   CFLAGS="$CFLAGS_GIVEN"
 fi
+for i in /usr/local/include /usr/X11R6/include /usr/dt/include /usr/openwin/include ; do
+  test -d $i && CPPFLAGS="$CPPFLAGS -I$i"
+done
 
 AC_PROG_INSTALL
 
@@ -279,6 +282,8 @@ else
 fi
 AC_DEFINE_UNQUOTED(EROOT, "$EROOT")
 AC_DEFINE_UNQUOTED(EBIN, "$EBIN")
+AC_SUBST(EROOT)
+AC_SUBST(EBIN)
 
 # Should we install E-Mixer?
 # Probably not ;-) But we may as well check!
@@ -341,7 +346,7 @@ basedir=.
 
 AM_CONFIG_HEADER(config.h)
 
-AC_OUTPUT(Epplets.spec Makefile api/Makefile epplets/Makefile)
+AC_OUTPUT(epplets.spec Makefile api/Makefile epplets/Makefile)
 
 echo "creating api/epplet.h"
 sed -e "s%@EROOT@%$EROOT%g" -e "s%@EBIN@%$EBIN%g" -e "s%\${exec_prefix}%${exec_prefix}%g" -e "s%\${prefix}%${prefix}%g" ${srcdir}/api/epplet.h.in > api/epplet.h.new
diff --git a/epplets.spec.in b/epplets.spec.in
new file mode 100644
index 0000000..5849946
--- /dev/null
+++ b/epplets.spec.in
@@ -0,0 +1,61 @@
+%define	name	@PACKAGE@
+%define	ver	@VERSION@
+%define	rel	1
+%define	prefix	@prefix@
+%define	eroot	@EROOT@
+%define	ebin	@EBIN@
+
+Summary: Enlightenment Epplets
+Name: %{name}
+Version: %{ver}
+Release: %{rel}
+Copyright: BSD
+Group: User Interface/X
+URL: http://www.enlightenment.org
+Packager: Michael Jennings <mej@eterm.org>
+Vendor: The Enlightenment Development Team <e-develop@enlightenment.org>
+Source: ftp://ftp.enlightenment.org/enlightenment/epplets/%{name}-%{ver}.tar.gz
+BuildRoot: /var/tmp/%{name}-%{ver}
+Requires: enlightenment >= 0.16.0
+
+%description
+Epplets are small, handy Enlightenment applets, similar to "dockapps"
+or "applets" for other packages.  The epplets package contains the
+base epplet API library and header files, as well as the core set of
+epplets, including CPU monitors, clocks, a mail checker, mixers, a
+slideshow, a URL grabber, and more.
+
+%prep
+%setup -q
+
+%build
+if [ -z $GNOME_FRIENDLY ]; then
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
+else
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --disable-autorespawn
+fi
+
+make
+
+%install
+make DESTDIR=$RPM_BUILD_ROOT install
+
+find $RPM_BUILD_ROOT -print
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%doc ChangeLog
+%{prefix}/include/*
+%{prefix}/lib/*
+%{ebin}/*
+%{eroot}/epplet_icons/*
+%{eroot}/epplet_data/*
diff --git a/epplets/Makefile.am b/epplets/Makefile.am
index e0566e0..a6f6ad1 100644
--- a/epplets/Makefile.am
+++ b/epplets/Makefile.am
@@ -14,133 +14,133 @@ EXTRA_PROGRAMS = EppletTest.epplet EppletConfigTest.epplet E-Mixer.epplet \
 
 ################ Conditional Builds ################
 E_Mixer_epplet_SOURCES = E-Mixer.c
-E_Mixer_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Mixer_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Mixer_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 E_Mixer_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) @SGI_LIBS@
 
 Emix_epplet_SOURCES = Emix.c
-Emix_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+Emix_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 Emix_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_PlayCD_epplet_SOURCES = E-PlayCD.c
-E_PlayCD_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_PlayCD_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_PlayCD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 E_PlayCD_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) -lcdaudio
 
 EppletTest_epplet_SOURCES = TestEpplet.c
-EppletTest_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+EppletTest_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 EppletTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 EppletConfigTest_epplet_SOURCES = ConfigTestEpplet.c
-EppletConfigTest_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+EppletConfigTest_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 EppletConfigTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_OpenGL_Demo_epplet_SOURCES = E-OpenGL-Demo.c
-E_OpenGL_Demo_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_OpenGL_Demo_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_OpenGL_Demo_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 ####################################################
 
 E_Exec_epplet_SOURCES = E-Exec.c
-E_Exec_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Exec_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Exec_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_SD_epplet_SOURCES = E-SD.c E-SD.h esdcloak.c utils.c utils.h esdcloak.h
-E_SD_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_SD_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_SD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lesd
 
 E_Load_epplet_SOURCES = E-Load.c
-E_Load_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Load_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Load_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 E_Load_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
 
 E_Clock_epplet_SOURCES = E-Clock.c
-E_Clock_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Clock_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Clock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_MoonClock_epplet_SOURCES = E-MoonClock.c CalcEphem.c CalcEphem.h Moon.c
-E_MoonClock_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_MoonClock_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_MoonClock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_Time_epplet_SOURCES = E-Time.c
-E_Time_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Time_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Time_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_Magic_epplet_SOURCES = E-Magic.c
-E_Magic_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Magic_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Magic_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_Areas_epplet_SOURCES = E-Areas.c 
-E_Areas_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Areas_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Areas_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_Net_epplet_SOURCES = E-Net.c net.c net.h
-E_Net_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Net_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Net_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_NetFlame_epplet_SOURCES = E-NetFlame.c net.c net.h
-E_NetFlame_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_NetFlame_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_NetFlame_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_Cpu_epplet_SOURCES = E-Cpu.c proc.h
-E_Cpu_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Cpu_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Cpu_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 E_Cpu_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
 
 E_Power_epplet_SOURCES = E-Power.c
-E_Power_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Power_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Power_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_Biff_epplet_SOURCES = E-Biff.c mbox.c
-E_Biff_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Biff_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Biff_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_MemWatch_epplet_SOURCES = E-MemWatch.c
-E_MemWatch_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_MemWatch_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_MemWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 E_MemWatch_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
 
 E_Disk_epplet_SOURCES = E-Disk.c
-E_Disk_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Disk_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Disk_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_Sys_epplet_SOURCES = E-Sys.c
-E_Sys_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Sys_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Sys_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 E_Sys_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
 
 E_Slides_epplet_SOURCES = E-Slides.c
-E_Slides_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Slides_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Slides_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_Xss_epplet_SOURCES = E-Xss.c
-E_Xss_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Xss_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Xss_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_ScreenShoot_epplet_SOURCES = \
 E-ScreenShoot.c E-ScreenShoot.h cloak.c utils.c utils.h cloak.h
-E_ScreenShoot_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_ScreenShoot_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_ScreenShoot_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_NetGraph_epplet_SOURCES = E-NetGraph.c net.c net.h
-E_NetGraph_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_NetGraph_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_NetGraph_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_ScreenSave_epplet_SOURCES = \
 E-ScreenSave.c E-ScreenSave.h cloak.c utils.c utils.h cloak.h
-E_ScreenSave_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_ScreenSave_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_ScreenSave_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_UrlWatch_epplet_SOURCES = E-UrlWatch.c E-UrlWatch.h utils.c utils.h
-E_UrlWatch_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_UrlWatch_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_UrlWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) $(X_LIBS)
 E_UrlWatch_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
 
 E_Areas_epplet_SOURCES = E-Areas.c
-E_Areas_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Areas_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Areas_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 E_Mountbox_epplet_SOURCES = E-Mountbox.c E-Mountbox.h
-E_Mountbox_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+E_Mountbox_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
 E_Mountbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 INCLUDES = -I. -I$(top_builddir)/api -I$(top_srcdir)/api -I$(top_srcdir) -I.. -I$(includedir) -I$(prefix)/include -I/usr/local/include $(X_CFLAGS) @SGI_DEFINES@