diff --git a/autogen.sh b/autogen.sh
index 474c7467..72c45b13 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -84,4 +84,4 @@ run_or_die $ACLOCAL -I m4
 run_or_die $LIBTOOLIZE --force --copy
 run_or_die $AUTOHEADER
 run_or_die $AUTOCONF
-run_or_die $AUTOMAKE
+run_or_die $AUTOMAKE --add-missing
diff --git a/configure.ac b/configure.ac
index 2b11d9c0..731bb8e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,6 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER(include/setup.h)
 AC_CONFIG_SUBDIRS([libratbox])
 AC_CONFIG_AUX_DIR([libltdl/config])
-AC_CONFIG_MACRO_DIR([libltdl/m4])
 
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_SILENT_RULES([yes])