diff --git a/Makefile.in b/Makefile.in
index bf243fb6b..34ab92ab7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,9 +112,6 @@ uninstall-nls:
 	    rm -f $(DESTDIR)$(localedir)/*/LC_MESSAGES/$$domain.mo; \
 	done
 
-autoconf:
-	autoconf -I m4
-
 siglist.c signame.c:
 	(cd compat && exec $(MAKE) $@)
 
diff --git a/aclocal.m4 b/aclocal.m4
index 481ffebcf..0c53eebdf 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -364,13 +364,13 @@ EOF
 dnl
 dnl Pull in libtool macros
 dnl
-m4_include([libtool.m4])
-m4_include([ltoptions.m4])
-m4_include([ltsugar.m4])
-m4_include([ltversion.m4])
-m4_include([lt~obsolete.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
 dnl
 dnl Pull in other non-standard macros
 dnl
-m4_include([ax_check_compile_flag.m4])
-m4_include([ax_check_link_flag.m4])
+m4_include([m4/ax_check_compile_flag.m4])
+m4_include([m4/ax_check_link_flag.m4])