diff --git "a/Makefile.am" "b/Makefile.am"
index 769cc63..3a0ba86 100644
--- "a/Makefile.am"
+++ "b/Makefile.am"
@@ -26,4 +26,5 @@ dist_pkgdata_DATA = extra/dx7_roms.dx7 \
        extra/tx7_roms.dx7
 
 AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
 
diff --git "a/configure.ac" "b/configure.ac"
index c9f7e48..565c233 100644
--- "a/configure.ac"
+++ "b/configure.ac"
@@ -3,8 +3,9 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(hexter, 1.1.0, sean-at-smbolton-dot-com)
 
 AC_CONFIG_SRCDIR(src/hexter.c)
-AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([subdir-objects])
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIRS([m4])
 
 AC_PROG_CC