diff --git a/Makefile.am b/Makefile.am
index e4dfae8..601422c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am
 
-ACLOCAL_AMFLAGS = -I ac-aux
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src exposed
 
diff --git a/configure.ac b/configure.ac
index e355fe1..39a4bdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_INIT([SolveSpace], [2.1], [jwesthues@cq.cx], [solvespace])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/solvespace.cpp])
 AC_CONFIG_AUX_DIR([ac-aux])
-AC_CONFIG_MACRO_DIR([ac-aux])
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.9.6 -Wall -Werror foreign tar-ustar])
 AM_MAINTAINER_MODE
diff --git a/ac-aux/ax_fltk.m4 b/m4/ax_fltk.m4
similarity index 100%
rename from ac-aux/ax_fltk.m4
rename to m4/ax_fltk.m4