diff --git a/.autom4te.cfg b/.autom4te.cfg
new file mode 100644
index 000000000..787905ad8
--- /dev/null
+++ b/.autom4te.cfg
@@ -0,0 +1,5 @@
+## autom4te.cfg for the Automake package.
+##
+begin-language: "Autoconf-without-aclocal-m4"
+args: --cache=.autom4te.cache
+end-language: "Autoconf-without-aclocal-m4"
diff --git a/.gitignore b/.gitignore
index 6ee37087b..fd0c05b21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ Makefile
 /ChangeLog
 /aclocal.m4
 /configure
-/autom4te.cache
+/.autom4te.cache
 /config.cache
 /config.log
 /config.status
diff --git a/Makefile.am b/Makefile.am
index a06cd8d94..985e7da2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,21 +31,23 @@ AUTOMAKESOURCES = automake.in aclocal.in
 TAGS_FILES = $(AUTOMAKESOURCES)
 
 EXTRA_DIST = \
+  $(AUTOMAKESOURCES) \
+  bootstrap \
   GNUmakefile \
   syntax-checks.mk \
   HACKING \
-  ChangeLog.96 \
-  ChangeLog.98 \
-  ChangeLog.00 \
-  ChangeLog.01 \
-  ChangeLog.02 \
-  ChangeLog.03 \
-  ChangeLog.04 \
-  ChangeLog.09 \
-  ChangeLog.11 \
-  bootstrap \
   $(gitlog_to_changelog_fixes) \
-  $(AUTOMAKESOURCES)
+  old/ChangeLog-tests \
+  old/ChangeLog.96 \
+  old/ChangeLog.98 \
+  old/ChangeLog.00 \
+  old/ChangeLog.01 \
+  old/ChangeLog.02 \
+  old/ChangeLog.03 \
+  old/ChangeLog.04 \
+  old/ChangeLog.09 \
+  old/ChangeLog.11 \
+  old/TODO
 
 ## Make versioned links.  We only run the transform on the root name;
 ## then we make a versioned link with the transformed base name.  This
@@ -107,6 +109,11 @@ recheck:
 	$(am__cd) tests && $(MAKE) $(AM_MAKEFLAGS) $@
 .PHONY: recheck
 
+# We don't use the default name for the autom4te cache directory,
+# so we need this.
+maintainer-clean-local:
+	rm -rf .autom4te.cache
+
 ################################################################
 ##
 ## Everything past here is useful to the maintainer, but probably not
diff --git a/tests/ChangeLog-old b/old/ChangeLog-tests
similarity index 100%
rename from tests/ChangeLog-old
rename to old/ChangeLog-tests
diff --git a/ChangeLog.00 b/old/ChangeLog.00
similarity index 100%
rename from ChangeLog.00
rename to old/ChangeLog.00
diff --git a/ChangeLog.01 b/old/ChangeLog.01
similarity index 100%
rename from ChangeLog.01
rename to old/ChangeLog.01
diff --git a/ChangeLog.02 b/old/ChangeLog.02
similarity index 100%
rename from ChangeLog.02
rename to old/ChangeLog.02
diff --git a/ChangeLog.03 b/old/ChangeLog.03
similarity index 100%
rename from ChangeLog.03
rename to old/ChangeLog.03
diff --git a/ChangeLog.04 b/old/ChangeLog.04
similarity index 100%
rename from ChangeLog.04
rename to old/ChangeLog.04
diff --git a/ChangeLog.09 b/old/ChangeLog.09
similarity index 100%
rename from ChangeLog.09
rename to old/ChangeLog.09
diff --git a/ChangeLog.11 b/old/ChangeLog.11
similarity index 100%
rename from ChangeLog.11
rename to old/ChangeLog.11
diff --git a/ChangeLog.96 b/old/ChangeLog.96
similarity index 100%
rename from ChangeLog.96
rename to old/ChangeLog.96
diff --git a/ChangeLog.98 b/old/ChangeLog.98
similarity index 100%
rename from ChangeLog.98
rename to old/ChangeLog.98
diff --git a/TODO b/old/TODO
similarity index 100%
rename from TODO
rename to old/TODO
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 890115575..864bd24c2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,7 +28,7 @@ TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
 
 AM_TAP_LOG_DRIVER_FLAGS = --merge
 
-EXTRA_DIST = ax/is ChangeLog-old
+EXTRA_DIST = ax/is
 
 TESTS = ## Will be updated later.