diff --git a/Makefile b/Makefile
index 703616ad..effe97ba 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ $(top_builddir)/config.status: $(top_srcdir)/configure
 	cd $(top_builddir) && $(SHELL) ./config.status --recheck
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-$(ACLOCAL_M4): $(top_srcdir)/configure.in $(top_srcdir)/acinclude.m4
+$(ACLOCAL_M4): $(top_srcdir)/configure.in
 	cd $(top_srcdir) && $(ACLOCAL)
 
 $(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4)
diff --git a/autogen.sh b/autogen.sh
index d87f884d..6c1cdbb1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,12 +1,5 @@
 #!/bin/sh
 
-echo acinclude.m4...
-(
-	echo "dnl Automatically generated from config/m4/ files by autogen.sh!"
-	echo "dnl Do not modify!"
-	cat config/m4/*.m4
-) > acinclude.m4
-
 echo aclocal...
 aclocal
 
diff --git a/configure.in b/configure.in
index eb237f5c..f1d6746e 100644
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,7 @@ AC_PREREQ(2.61)
 AC_INIT
 AC_CONFIG_SRCDIR([src/main/main.c])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR([config/m4])
 
 PACKAGE=elinks
 VERSION=0.13.GIT