diff --git a/m4/ax_check_compiler_flags.m4 b/build-aux/m4/ax_check_compiler_flags.m4
similarity index 100%
rename from m4/ax_check_compiler_flags.m4
rename to build-aux/m4/ax_check_compiler_flags.m4
diff --git a/m4/buildsys.m4 b/build-aux/m4/buildsys.m4
similarity index 100%
rename from m4/buildsys.m4
rename to build-aux/m4/buildsys.m4
diff --git a/configure.ac b/configure.ac
index 13f31db..eb4b863 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ AC_INIT(ObjXMPP, 0.1, js@webkeks.org)
 BUILDSYS_INIT
 
 AC_CONFIG_SRCDIR(src)
-AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_MACRO_DIR(build-aux/m4)
 
 AC_CHECK_TOOL(OBJFW_CONFIG, objfw-config)
 AS_IF([test x"$OBJFW_CONFIG" = x""], [