diff --git a/Make.mk b/Make.mk
index 4a1b2328..05dda79b 100644
--- a/Make.mk
+++ b/Make.mk
@@ -369,7 +369,8 @@ dist-client: $(cli_distgen)
 	-C $(srcdir)/src/lib/global version.c				\
 	-C $(srcdir)/src/lib $(addprefix w32/, $(client/w32))		\
 	-C $(srcdir)/man empire.6					\
-	-C $(srcdir) COPYING INSTALL install-sh
+	-C $(srcdir)/build-aux install-sh				\
+	-C $(srcdir) COPYING INSTALL
 
 .PHONY: dist-info
 dist-info: info html
diff --git a/compile b/build-aux/compile
similarity index 100%
rename from compile
rename to build-aux/compile
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.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/configure.ac b/configure.ac
index 0c439e40..4c274be7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
 #   configure.ac: Autoconf input file
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2005-2010
+#      Markus Armbruster, 2005-2013
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -40,6 +40,7 @@ AC_PREREQ(2.64)
 AC_INIT([Wolfpack Empire], [4.3.31], [wolfpack@wolfpackempire.com], [empire],
 	[http://www.wolfpackempire.com/])
 AC_CONFIG_SRCDIR([include/combat.h])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])