diff --git a/.gitignore b/.gitignore
index 19ff60ff..3909aa44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,20 +12,14 @@ cscope.out
 .libs
 /aclocal.m4
 /autom4te.cache
-/compile
-/config.guess
+/build-aux/
 /config.h
 /config.h.in
 /config.log
 /config.mk
 /config.status
-/config.sub
 /configure
-/depcomp
-/install-sh
 /libtool
-/ltmain.sh
-/missing
 /stamp-h1
 /test-driver
 /weston.ini
diff --git a/configure.ac b/configure.ac
index 9862761d..00d71234 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,7 @@ AC_SUBST([WESTON_VERSION_MINOR], [weston_minor_version])
 AC_SUBST([WESTON_VERSION_MICRO], [weston_micro_version])
 AC_SUBST([WESTON_VERSION], [weston_version])
 
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 
 AC_USE_SYSTEM_EXTENSIONS