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/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 c605581..43360d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,8 @@
 AC_INIT(ObjXMPP, 0.1, js@webkeks.org)
 BUILDSYS_INIT
+
 AC_CONFIG_SRCDIR(src)
+AC_CONFIG_AUX_DIR(build-aux)
 
 AC_CHECK_TOOL(OBJFW_CONFIG, objfw-config)
 AS_IF([test x"$OBJFW_CONFIG" = x""], [