diff --git a/.gitignore b/.gitignore
index d654b07ab..d3bf5bf40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,14 +34,14 @@ tools/mkpasswd
 tools/viconf
 /libtool
 Makefile.in
-m4/argz.m4
-m4/libtool.m4
-m4/ltargz.m4
-m4/ltdl.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
+tools/m4/argz.m4
+tools/m4/libtool.m4
+tools/m4/ltargz.m4
+tools/m4/ltdl.m4
+tools/m4/ltoptions.m4
+tools/m4/ltsugar.m4
+tools/m4/ltversion.m4
+tools/m4/lt~obsolete.m4
 *.dSYM/
 install-sh
 ylwrap
diff --git a/Makefile.am b/Makefile.am
index 24826a60b..e5f83c396 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I tools/m4
 
 SUBDIRS = include/ircd
 SUBDIRS += ircd
diff --git a/autogen.sh b/autogen.sh
index 391aacb77..978d2fd31 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -79,7 +79,7 @@ run_or_die ()
 parse_options "$@"
 
 echo "*** Generating Charybdis build..."
-run_or_die $ACLOCAL -I m4
+run_or_die $ACLOCAL -I tools/m4
 run_or_die $LIBTOOLIZE --force --copy
 run_or_die $AUTOHEADER
 run_or_die $AUTOCONF
diff --git a/configure.ac b/configure.ac
index 1a2ce5dd4..4831fc844 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ AUTOMAKE_OPTIONS = 1.11
 AC_INIT([construct], [1.0-dev])
 AC_GNU_SOURCE
 AC_USE_SYSTEM_EXTENSIONS
-AC_CONFIG_MACRO_DIR([m4])
 AC_PREFIX_DEFAULT([/])
+AC_CONFIG_MACRO_DIR([tools/m4])
 
 AC_PATH_PROG(AUTOMAKE, automake)
 AC_PATH_PROG(ACLOCAL, aclocal)
diff --git a/m4/ax_boost_asio.m4 b/tools/m4/ax_boost_asio.m4
similarity index 100%
rename from m4/ax_boost_asio.m4
rename to tools/m4/ax_boost_asio.m4
diff --git a/m4/ax_boost_base.m4 b/tools/m4/ax_boost_base.m4
similarity index 100%
rename from m4/ax_boost_base.m4
rename to tools/m4/ax_boost_base.m4
diff --git a/m4/ax_boost_filesystem.m4 b/tools/m4/ax_boost_filesystem.m4
similarity index 100%
rename from m4/ax_boost_filesystem.m4
rename to tools/m4/ax_boost_filesystem.m4
diff --git a/m4/ax_boost_system.m4 b/tools/m4/ax_boost_system.m4
similarity index 100%
rename from m4/ax_boost_system.m4
rename to tools/m4/ax_boost_system.m4
diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/tools/m4/ax_cxx_compile_stdcxx.m4
similarity index 100%
rename from m4/ax_cxx_compile_stdcxx.m4
rename to tools/m4/ax_cxx_compile_stdcxx.m4
diff --git a/m4/charybdis.m4 b/tools/m4/charybdis.m4
similarity index 100%
rename from m4/charybdis.m4
rename to tools/m4/charybdis.m4
diff --git a/m4/pkg.m4 b/tools/m4/pkg.m4
similarity index 100%
rename from m4/pkg.m4
rename to tools/m4/pkg.m4