diff --git a/.gitignore b/.gitignore
index d744d3833..42cf135f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,26 +12,20 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
-compile
-config.guess
 config.h
 config.h.in
 config.log
 config.mk
 config.status
-config.sub
 config_detected.h
 config_detected.mk
 configure
 configure.lineno
-depcomp
 depmode
-install-sh
 libtool
 ltmain.sh
-missing
 mkinstalldirs
-/test-driver
+/build
 /src/mpd
 /systemd/mpd.service
 stamp-h1
diff --git a/Makefile.am b/Makefile.am
index e21a1f920..d17277899 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1213,6 +1213,8 @@ sparse-check:
 # Test programs
 #
 
+TEST_SUITE_LOG = build/test-suite.log
+
 if ENABLE_TEST
 
 C_TESTS = \
diff --git a/autogen.sh b/autogen.sh
index f163e35a7..d3ca3d2d3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -119,6 +119,9 @@ for i in $ac_local_paths; do
 	fi
 done
 
+rm -rf config.cache build
+mkdir build
+
 echo "  $ACLOCAL $ACLOCAL_FLAGS"
 $ACLOCAL $ACLOCAL_FLAGS || exit 1
 
diff --git a/configure.ac b/configure.ac
index 7fa1e3522..42bf9898d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ VERSION_REVISION=0
 VERSION_EXTRA=0
 
 AC_CONFIG_SRCDIR([src/Main.cxx])
+AC_CONFIG_AUX_DIR(build)
 AM_INIT_AUTOMAKE([foreign 1.11 dist-xz subdir-objects])
 AM_SILENT_RULES
 AC_CONFIG_HEADERS(config.h)