diff --git a/config.guess b/build-aux/config.guess
similarity index 100%
rename from config.guess
rename to build-aux/config.guess
diff --git a/config.rpath b/build-aux/config.rpath
similarity index 100%
rename from config.rpath
rename to build-aux/config.rpath
diff --git a/config.sub b/build-aux/config.sub
similarity index 100%
rename from config.sub
rename to build-aux/config.sub
diff --git a/depcomp b/build-aux/depcomp
similarity index 100%
rename from depcomp
rename to build-aux/depcomp
diff --git a/install-sh b/build-aux/install-sh
similarity index 100%
rename from install-sh
rename to build-aux/install-sh
diff --git a/ltmain.sh b/build-aux/ltmain.sh
similarity index 100%
rename from ltmain.sh
rename to build-aux/ltmain.sh
diff --git a/missing b/build-aux/missing
similarity index 100%
rename from missing
rename to build-aux/missing
diff --git a/mkinstalldirs b/build-aux/mkinstalldirs
similarity index 100%
rename from mkinstalldirs
rename to build-aux/mkinstalldirs
diff --git a/configure.ac b/configure.ac
index 93f8f140..98e6af1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,7 @@ AC_INIT([pacman], [pacman_version], [pacman-dev@archlinux.org])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
 
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.11])