diff --git a/.gitignore b/.gitignore
index 93af60b92c..c69f12f413 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,8 @@ aclocal.m4
 INSTALL
 gst-ffmpeg.spec
 -
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
diff --git a/Makefile.am b/Makefile.am
index 120f7e9234..b19b38f629 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = \
 	AUTHORS COPYING NEWS README ChangeLog gst-ffmpeg.doap \
 	$(win32)
 
-ACLOCAL_AMFLAGS = -I common/m4
+ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 include $(top_srcdir)/common/release.mak
 
@@ -24,7 +24,12 @@ check-torture:
 
 CRUFT_FILES = \
 	$(top_builddir)/common/shave \
-	$(top_builddir)/common/shave-libtool
+	$(top_builddir)/common/shave-libtool \
+	$(top_builddir)/common/m4/libtool.m4 \
+	$(top_builddir)/common/m4/ltoptions.m4 \
+	$(top_builddir)/common/m4/ltsugar.m4 \
+	$(top_builddir)/common/m4/ltversion.m4 \
+	$(top_builddir)/common/m4/lt~obsolete.m4
 
 include $(top_srcdir)/common/cruft.mak
 
diff --git a/autogen.sh b/autogen.sh
index 60e3c5bb30..cb3bacf54d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -97,7 +97,7 @@ fi
 toplevel_check $srcfile
 
 tool_run "$libtoolize" "--copy --force"
-tool_run "$aclocal" "-I common/m4 $ACLOCAL_FLAGS"
+tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
 tool_run "$autoheader"
 
 # touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo