diff --git a/Makefile.am b/Makefile.am
index b4ebc7ba..c661db04 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 # Automake file
 
+ACLOCAL_AMFLAGS = -I m4
+
 # Nonstandard package files for distribution
 EXTRA_DIST = \
   CHANGES \
diff --git a/configure.ac b/configure.ac
index 1b912374..de2d1e7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,7 @@ AC_INIT([Google C++ Testing Framework],
 # Provide various options to initialize the Autoconf and configure processes.
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([./COPYING])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([build-aux/config.h])
 AC_CONFIG_FILES([Makefile])