diff --git a/CCache/Makefile.in b/CCache/Makefile.in
index b96d42a60..fd7ee7eb0 100644
--- a/CCache/Makefile.in
+++ b/CCache/Makefile.in
@@ -61,6 +61,7 @@ check: test
 
 distclean: clean
 	/bin/rm -f Makefile config.h config.sub config.log build-stamp config.status ccache_swig_config.h
+	/bin/rm -rf autom4te.cache
 
 maintainer-clean: distclean
 	/bin/rm -f configure config.h.in 
diff --git a/Makefile.in b/Makefile.in
index 7b74870b6..228b9201d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -349,6 +349,7 @@ distclean-docs-ccache:
 
 distclean-dead:
 	rm -f $(DISTCLEAN-DEAD)
+	rm -rf autom4te.cache
 
 #####################################################################
 # MAINTAINER CLEAN - clean what the maintainer builds and ships in
diff --git a/Source/Makefile.am b/Source/Makefile.am
index 3f710302a..26f37b2fe 100644
--- a/Source/Makefile.am
+++ b/Source/Makefile.am
@@ -104,7 +104,7 @@ clean-local:
 	rm -f $(top_builddir)/swig@EXEEXT@
 	rm -f core @EXTRA_CLEAN@
 
-distclean:
+distclean-local:
 	rm -f $(top_builddir)/Source/Include/swigconfig.h
 	rm -f $(top_builddir)/Source/Include/stamp-h1