diff --git a/.gitignore b/.gitignore
index 12c9b94..f9fe4bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,15 +16,10 @@ defs.h.in~
 cscope.*
 
 /aclocal.m4
-/ar-lib
 /autom4te.cache
-/compile
+/build-aux/
 /config.*
 /configure
-/depcomp
 /libtool
-/ltmain.sh
-/install-sh
-/missing
 /*.pc
 
diff --git a/configure.ac b/configure.ac
index 56966a1..e449117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,7 @@ m4_define([libnl_version],
 
 AC_INIT(libnl, [libnl_version], [], [], [http://www.infradead.org/~tgr/libnl/])
 AC_CONFIG_HEADERS([lib/defs.h])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)], [])
diff --git a/doc/.gitignore b/doc/.gitignore
index e7209f6..f7cb70d 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,9 +1,8 @@
 *.html
 libnl.dict
 Doxyfile
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-missing
+/aclocal.m4
+/autom4te.cache/
+/build-aux/
+/config.*
+/configure
diff --git a/doc/configure.ac b/doc/configure.ac
index 8e93968..c245baa 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -11,6 +11,7 @@
 
 AC_INIT(libnl-doc, [3.2.15], [http://www.infradead.org/~tgr/libnl/])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)], [])