diff --git a/.gitignore b/.gitignore
index f1021b263..e25d1ba96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,27 +53,23 @@ doc/openocd.toc
 doc/openocd.tp
 doc/openocd.vr
 doc/version.texi
-texinfo.tex
 src/openocd
 src/openocd.exe
 
 # configure/autotools output
+/build-aux/
 aclocal.m4
 autom4te.cache
-compile
-config.*
+config.h
+config.log
+config.status
 configure
-depcomp
 doxygen
 doxygen.log
 Doxyfile
-install-sh
 libtool
-ltmain.sh
 Makefile
 !contrib/loaders/**/Makefile
-mdate-sh
-missing
 stamp-h1
 stamp-vti
 INSTALL
diff --git a/configure.ac b/configure.ac
index 139598e15..2a455fa55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT([openocd], [0.11.0+dev],
   [OpenOCD Mailing List <openocd-devel@lists.sourceforge.net>])
 AC_CONFIG_SRCDIR([src/openocd.c])
-AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_AUX_DIR([build-aux])
 
 m4_include([config_subdir.m4])dnl