diff --git a/.gitignore b/.gitignore
index 5b79e51..88cfc3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ tests/test_hash
 tests/test_jid
 tests/test_sasl
 tests/test_sock
+m4/
diff --git a/Makefile.am b/Makefile.am
index 9e4d3db..f942380 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
+ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = -g -Wall
 
 PARSER_CFLAGS=@PARSER_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 2fb54b7..85f1060 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,5 @@
 AC_INIT([libstrophe], [0.8.7], [jack@metajack.im])
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT([dlopen])