diff --git a/autogen.sh b/autogen.sh
index 9d2b49b..f1b850b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,6 +16,7 @@ echo > $OUT
 DISTDIRS=""
 
 echo "AUTOMAKE_OPTIONS = subdir-objects" >>$OUT
+echo "ACLOCAL_AMFLAGS = -I m4" >>$OUT
 echo "dist_man_MANS = man/${NAME}.1" >>$OUT
 echo "dist_noinst_SCRIPTS = autogen.sh" `for i in $DISTDIRS ; do find \$i -type f ; done | tr "\n" " " ` >>$OUT
 
diff --git a/configure.ac b/configure.ac
index bf9c74f..46482c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,7 @@
 AC_PREREQ(2.6)
 AC_INIT([codecrypt], [1.2])
 AC_CONFIG_AUX_DIR(.) # because of libtoolize
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE()
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])