diff --git a/configure.ac b/configure.ac
index 6c73bea..9cc40f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ AC_PREREQ(2.64)
 
 AC_INIT([gnucap], [2013-04-23])
 AM_INIT_AUTOMAKE([-Wno-portability])
+AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER([config.h])
 LT_INIT()
 
diff --git a/modelgen/Makefile.am b/modelgen/Makefile.am
index 97ee2d6..c65b62b 100644
--- a/modelgen/Makefile.am
+++ b/modelgen/Makefile.am
@@ -42,5 +42,5 @@ EXTRA_DIST= \
  Make1 Make.depend Make2.g++ Make2.Debug Make2.mingw32
 
 
-INCLUDES=	-I$(top_srcdir)/src
+AM_CPPFLAGS=	-I$(top_srcdir)/src