diff --git a/.gitignore b/.gitignore
index c95174a2a878997c43231f258740591c76728fdd..54c3ba46b5d18288456ec6bd0181cb1ebf2f7eb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,9 @@ update.log
 tests/*.log
 /GNUmakefile
 /maint.mk
+gnulib/
+*.orig
+*.rej
+*#*#
+*.#*#
+ChangeLog
diff --git a/Makefile.am b/Makefile.am
index 30c67f6981de2d78145efea5d438e8c7ad38fe5f..f9efff580bd13041a39e808eaab085689098a72a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ GENHTML = genhtml
 SUBDIRS = gnulib/lib include src qemud tools proxy docs gnulib/tests \
   python tests po examples/domain-events/events-c examples/hellolibvirt
 
-ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
+ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
 EXTRA_DIST = \
   ChangeLog-old \