diff --git a/Makefile.am b/Makefile.am
index 058e10f..9e777e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index c7261a6..c6c23fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,8 @@
 # General init
 AC_INIT(libnfc, 1.3.0, info@libnfc.org)
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AC_CONFIG_HEADER(config.h)
 
 # SVN revison