diff --git a/.gitignore b/.gitignore
index e96db5728f..125a5820c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ stubdom/*.tar.gz
 autom4te.cache/
 config.log
 config.status
+config.cache
 config/Toplevel.mk
 
 build-*
@@ -101,10 +102,11 @@ patches/tmp/*
 pristine-*
 ref-*
 tmp-*
-stubdom/autom4te.cache
+stubdom/autom4te.cache/
 stubdom/binutils-*
 stubdom/config.log
 stubdom/config.status
+stubdom/config.cache
 stubdom/cross-root-*
 stubdom/gcc-*
 stubdom/include
@@ -128,7 +130,7 @@ stubdom/ioemu/
 stubdom/stubdompath.sh
 stubdom/vtpm/vtpm_manager.h
 tools/*/build/lib*/*.py
-tools/autom4te.cache
+tools/autom4te.cache/
 tools/config.h
 tools/config.log
 tools/config.status
diff --git a/.hgignore b/.hgignore
index 5efd72c048..74fd424921 100644
--- a/.hgignore
+++ b/.hgignore
@@ -28,8 +28,9 @@
 (^|/)(GTAGS|GPATH|GSYMS|GRTAGS)$
 ^autom4te\.cache$
 ^config\.log$
-^config\.status
-^config/Toplevel\.mk
+^config\.status$
+^config\.cache$
+^config/Toplevel\.mk$
 ^build-.*$
 ^dist/.*$
 ^docs/autom4te\.cache$
@@ -101,6 +102,7 @@
 ^stubdom/binutils-.*$
 ^stubdom/config\.log$
 ^stubdom/config\.status$
+^stubdom/config\.cache$
 ^stubdom/cross-root-.*$
 ^stubdom/gcc-.*$
 ^stubdom/include$
diff --git a/Makefile b/Makefile
index aa3c7bdb25..2d3ed82282 100644
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,7 @@ endif
 	rm -rf dist patches/tmp
 	for i in $(ALLKERNELS) ; do $(MAKE) $$i-delete ; done
 	rm -rf patches/*/.makedep
+	rm -rf config.log config.status config.cache autom4te.cache
 
 # Linux name for GNU distclean
 .PHONY: mrproper
diff --git a/stubdom/Makefile b/stubdom/Makefile
index 970f227ee9..dc7664f11a 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -548,6 +548,7 @@ downloadclean: patchclean
 .PHONY: distclean
 distclean: downloadclean
 	-rm ../config/Stubdom.mk
+	rm -rf config.log config.status config.cache autom4te.cache
 
 ifeq (,$(findstring clean,$(MAKECMDGOALS)))
 $(XEN_ROOT)/config/Stubdom.mk: