diff --git a/wmmemload/configure.ac b/wmmemload/configure.ac
index 1245d9d..3698a98 100644
--- a/wmmemload/configure.ac
+++ b/wmmemload/configure.ac
@@ -5,7 +5,7 @@ dnl AC_INIT(src/main.c)
 AC_INIT(wmmemload, 0.1.6, me@markstaggs.net)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
 
 AC_CONFIG_SRCDIR(src/main.c)
 AM_CONFIG_HEADER(config.h)
diff --git a/wmmemload/src/Makefile.am b/wmmemload/src/Makefile.am
index 7559e7e..aad4d51 100644
--- a/wmmemload/src/Makefile.am
+++ b/wmmemload/src/Makefile.am
@@ -18,9 +18,7 @@ EXTRA_wmmemload_SOURCES = \
 	mem_openbsd.c \
 	mem_solaris.c
 
-CPPFLAGS = @CPPFLAGS@ @DFLAGS@
-
-INCLUDES = @HEADER_SEARCH_PATH@
+AM_CPPFLAGS = @DFLAGS@ @HEADER_SEARCH_PATH@
 
 wmmemload_LDADD = @LIBRARY_SEARCH_PATH@ @XLIBS@