diff --git a/Makefile.am b/Makefile.am
index 314cabdf..438922fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,8 @@
 # distclean: remove everything except what goes in the distribution
 #
 
+AUTOMAKE_OPTIONS = 1.7
+
 SUBDIRS = doc include man src test build flac.pbproj obj
 
 DISTCLEANFILES = libtool-disable-static
diff --git a/autogen.sh b/autogen.sh
index b8a6c138..6b70b19a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,6 +11,8 @@ test -z "$srcdir" && srcdir=.
 cd "$srcdir"
 DIE=0
 
+ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
+
 echo "checking for autoconf... "
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
         echo