diff --git a/Makefile.am b/Makefile.am
index 5df2cc8..912f64b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = src tools data doc examples
 
 EXTRA_DIST = autogen.sh bootstrap libdbus-c++.spec libdbus-c++.spec.in
 
+ACLOCAL_AMFLAGS = -I m4
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dbus-c++-1.pc
 
diff --git a/bootstrap b/bootstrap
index 292c981..6b2c608 100755
--- a/bootstrap
+++ b/bootstrap
@@ -58,7 +58,7 @@ fi
 echo "Running libtoolize..."
 libtoolize --force --copy
 
-aclocalinclude="$ACLOCAL_FLAGS -I config"
+aclocalinclude="$ACLOCAL_FLAGS -I m4"
 echo "Running aclocal $aclocalinclude ..."
 aclocal $aclocalinclude
  
diff --git a/configure.ac b/configure.ac
index 2054a07..16042db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_INIT([libdbus-c++], 0.5.0, [shackan@gmail.com])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_HOST
 
diff --git a/config/acx_pthread.m4 b/m4/acx_pthread.m4
similarity index 100%
rename from config/acx_pthread.m4
rename to m4/acx_pthread.m4