diff --git a/Makefile.am b/Makefile.am
index 13367ad..e017225 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I build-aux/m4
 EXTRA_DIST = \
 	CONTRIBUTING.md \
 	COPYING \
diff --git a/autogen b/autogen
index e2f5440..4475b01 100755
--- a/autogen
+++ b/autogen
@@ -7,7 +7,7 @@ fatal() { error "$@"; exit 1; }
 try() { "$@" || fatal "'$@' failed"; }
 
 try cd "${0%/*}"
-try mkdir -p m4 build-aux
+try mkdir -p build-aux/m4
 try autoreconf -fviW all
 
 # Ignore changes to build-aux/tap-driver, but only if we're in a clone
diff --git a/m4/ax_compare_version.m4 b/build-aux/m4/ax_compare_version.m4
similarity index 100%
rename from m4/ax_compare_version.m4
rename to build-aux/m4/ax_compare_version.m4
diff --git a/m4/ax_prog_perl_modules.m4 b/build-aux/m4/ax_prog_perl_modules.m4
similarity index 100%
rename from m4/ax_prog_perl_modules.m4
rename to build-aux/m4/ax_prog_perl_modules.m4
diff --git a/m4/ax_prog_perl_version.m4 b/build-aux/m4/ax_prog_perl_version.m4
similarity index 100%
rename from m4/ax_prog_perl_version.m4
rename to build-aux/m4/ax_prog_perl_version.m4
diff --git a/m4/ax_with_prog.m4 b/build-aux/m4/ax_with_prog.m4
similarity index 100%
rename from m4/ax_with_prog.m4
rename to build-aux/m4/ax_with_prog.m4
diff --git a/configure.ac b/configure.ac
index 7f1c580..827f8b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_INIT([ddclient], m4_dquote(m4_esyscmd([printf '[%s]' "$(./ddclient.in --versi
 AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/ddclient.in'])
 AC_CONFIG_SRCDIR([ddclient.in])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([build-aux/m4])
 AC_REQUIRE_AUX_FILE([tap-driver.sh])
 # If the automake dependency is bumped to v1.12 or newer, remove
 # build-aux/tap-driver.sh from the repository.  Automake 1.12+ comes