diff --git a/.gitignore b/.gitignore
index 046e7f5..c0dc485 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 aclocal.m4
 build-aux
 libtool
+m4/l*.m4
 mkinstalldirs
 config.h
 config.h.in
diff --git a/Makefile.am b/Makefile.am
index 1f88b72..961595b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS=-I m4
+
 SUBDIRS=src tests doc
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 1aff958..6c107bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ AC_INIT([libxcb],
         1.9,
         [xcb@lists.freedesktop.org])
 AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([xcb.pc.in])
 
 # Initialize Automake
diff --git a/acinclude.m4 b/m4/xcb.m4
similarity index 100%
rename from acinclude.m4
rename to m4/xcb.m4