diff --git a/Makefile.am b/Makefile.am
index 3d598ba..04e71f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
 AM_DEFAULT_SOURCE_EXT = .cpp
 
 libi2ccmdsdir = ${libdir}/ipmid-providers
diff --git a/configure.ac b/configure.ac
index b239894..9ebc80d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,8 @@
 AC_INIT([i2c-ipmi], [1.0], [https://www.github.com/google-ipmi-i2c/issues])
 AC_LANG([C++])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIRS([m4])
+AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign dist-xz])
 AM_SILENT_RULES([yes])