diff --git a/Makefile.am b/Makefile.am
index 172949977..8082bd8e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@ if USE_SCRIPTS
   SUBDIRS += scripts
 endif
 
+ACLOCAL_AMFLAGS = -I m4/config m4/macros m4
+
 EXTRA_DIST = Doxyfile.in CREDITS
 CLEANFILES = apidoc Doxyfile
 
diff --git a/configure.in b/configure.in
index 7d507966e..514cc5a4f 100644
--- a/configure.in
+++ b/configure.in
@@ -18,6 +18,7 @@ dnl ===========================
 
 AC_INIT(strongSwan,4.3.5)
 AM_INIT_AUTOMAKE(tar-ustar)
+AC_CONFIG_MACRO_DIR([m4/config])
 AC_SUBST(confdir, '${sysconfdir}')
 PKG_PROG_PKG_CONFIG