diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index e96b271..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-aclocal -I m4 || exit 1
-autoconf || exit 1
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/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 a701be2..8c5247b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,8 @@
 AC_INIT(ObjOpenSSL, 0.1, js@heap.zone)
+
 AC_CONFIG_SRCDIR(src)
+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""], [