diff --git a/Makefile.am b/Makefile.am
index a01cb1c1..34f6ed4b 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave
+
 basedirs = build Sparkles Sparkles/Git
 
 SUBDIRS = $(basedirs) $(GUISUBDIRS)
diff --git a/configure.ac b/configure.ac
index c74b82c1..2334c94c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,9 @@ AC_PREREQ([2.54])
 AC_INIT([SparkleShare], sparkleshare_version)
 AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-pax])
 AM_MAINTAINER_MODE
+LT_INIT
+
+AC_CONFIG_MACRO_DIRS([build/m4/sparkleshare build/m4/shamrock build/m4/shave])
 
 dnl Export Version Info
 AC_SUBST([ASM_VERSION], [sparkleshare_version])
@@ -15,8 +18,6 @@ if test "x$PKG_CONFIG" = "xno"; then
         AC_MSG_ERROR([pkg-config is not installed])
 fi
 
-AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"])
-
 SHAMROCK_EXPAND_LIBDIR
 SHAMROCK_EXPAND_BINDIR
 SHAMROCK_EXPAND_DATADIR