diff --git a/.gitignore b/.gitignore
index a37092b..4f59d62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,33 @@
 .svn
+
+/aclocal.m4
+/autom4te.cache
+/compile
+/config.guess
+/config.h
+/config.h.in
+/config.log
+/config.status
+/config.sub
+/configure
+/depcomp
+/install-sh
+/libtool
+/ltmain.sh
+/missing
+/stamp-h1
+/m4
+
 Makefile
 Makefile.in
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
 .deps
 .libs
 
-epplets.spec
-api/epplet.h
-epplets-*.tar.gz
+/epplets.spec
+/api/epplet.h
+/epplets-*.tar.gz
 
 *.o
 *.lo
 *.la
-*.epplet
-
-cscope.*
-*~
-.*.sw*
+/epplets/*.epplet
diff --git a/Makefile.am b/Makefile.am
index 4dbf48d..848c5ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,13 @@
-
 AUTOMAKE_OPTIONS = foreign
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = api epplets
 
 #EXTRA_DIST =
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.* configure depcomp \
-		       install-sh ltmain.sh missing */Makefile.in
+		       install-sh ltmain.sh missing */Makefile.in m4/*.m4
 
 changelog:
 	cvs2cl -l "-d>20050101" --gmt --separate-header --tagdates --no-indent
diff --git a/configure.ac b/configure.ac
index 60c6f43..b47ccd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,8 @@ m4_define([rpm_revision], m4_ifdef([pkg_revision], ["0.%(date '+%y%m%d')"], [1])
 AC_INIT([epplets], [pkg_version], [enlightenment-devel@lists.sourceforge.net])
 AM_INIT_AUTOMAKE([foreign])
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AC_SUBST(E_RPM_REVISION, [rpm_revision])
 
 dnl reasonable guesses for where stuff is installed