diff --git a/.gitignore b/.gitignore
index ad5172f..5749016 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 .auto
 .libs
 .deps
+INSTALL
 Makefile
 Makefile.in
 aclocal.m4
@@ -17,6 +18,7 @@ config.log
 config.status
 configure
 libtool
+m4
 stamp-*
 *-stamp
 # Configure-generated files
diff --git a/Makefile.am b/Makefile.am
index bd71dd6..386b282 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 
 SUBDIRS = include src lib scm doc examples test
 DIST_SUBDIRS = $(SUBDIRS)
@@ -12,5 +12,6 @@ EXTRA_DIST = \
 	MIGRATE \
 	$(NULL)
 
-AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
+AUTOMAKE_OPTIONS = dist-bzip2
diff --git a/configure.ac b/configure.ac
index 12d1f3f..885db67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_CONFIG_SRCDIR([src/main.c])
 
 AC_PREREQ([2.71])
 AC_CONFIG_AUX_DIR(.auto)
+AC_CONFIG_MACRO_DIRS([m4])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
@@ -539,8 +540,8 @@ AM_CONDITIONAL(HAVE_MOTIF, test "${ac_cv_my_have_motif}" = "yes")
 AC_SUBST(MOTIF_CFLAGS)
 AC_SUBST(MOTIF_LIBS)
 
-INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_builddir)/include"
-AC_SUBST(INCLUDES)
+AM_CPPFLAGS="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_builddir)/include"
+AC_SUBST(AM_CPPFLAGS)
 
 dnl  Export variables
 AC_SUBST(ELK_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 716e096..afad81b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 
 lib_LTLIBRARIES = libelk.la
 libelk_la_CFLAGS = @ELK_CFLAGS@ -I/usr/include/libelf
@@ -66,7 +66,7 @@ EXTRA_DIST = \
 	$(NULL)
 
 bin_PROGRAMS = elk
-elk_LDADD = $(top_builddir)/src/libelk.la
+elk_LDADD = libelk.la
 elk_SOURCES = main.c
 
 install-exec-hook:
@@ -74,4 +74,3 @@ install-exec-hook:
 	ln -s elk "$(DESTDIR)$(bindir)/scheme-elk"
 
 echo-sources: ; echo $(SOURCES)
-