diff --git a/Makefile.am b/Makefile.am
index 09f5880..8e7d9b7 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/bootstrap.sh b/bootstrap.sh
index 7c590a3..cd8bec7 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
+mkdir -p m4
 autoreconf -i
diff --git a/configure.ac b/configure.ac
index 2a3abf7..2e521f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,5 @@
 AC_INIT([libstrophe], [0.8.5], [jack@metajack.im])
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT([dlopen])