diff --git a/CCache/Makefile.in b/CCache/Makefile.in
index ef20f48a0..543970f9e 100644
--- a/CCache/Makefile.in
+++ b/CCache/Makefile.in
@@ -63,10 +63,10 @@ test: test.sh
 check: test
 
 distclean: clean distclean-docs
-	/bin/rm -f Makefile config.h config.sub config.log build-stamp config.status config.h.in ccache_swig_config.h
+	/bin/rm -f Makefile config.h config.sub config.log build-stamp config.status ccache_swig_config.h
 
 maintainer-clean: distclean
-	/bin/rm -f configure
+	/bin/rm -f configure config.h.in 
 	
 # FIXME: To fix this, test.sh needs to be able to take ccache from the
 # installed prefix, not from the source dir.
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 3516d6f28..7f11884ee 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -84,6 +84,11 @@ CXXSHARED=      @CXXSHARED@
 
 OBJS      = $(SRCS:.c=.@OBJEXT@) $(CXXSRCS:.cxx=.@OBJEXT@)
 
+distclean:
+	rm -f Makefile
+	rm -f guile/Makefile
+	rm -f xml/Makefile
+
 ##################################################################
 #####                       Tcl/Tk                          ######
 ##################################################################
diff --git a/Makefile.in b/Makefile.in
index 6effe59b9..1401ea9fc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -336,9 +336,9 @@ maintainer-clean: clean-libfiles
 # DISTCLEAN
 #####################################################################
 
-DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log libtool
+DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log libtool preinst-swig Lib/ocaml/swigp4.ml
 
-distclean: clean-docs distclean-objects clean-examples distclean-test-suite distclean-dead distclean-ccache
+distclean: clean-docs distclean-objects distclean-test-suite distclean-examples distclean-dead distclean-ccache
 
 distclean-objects: distclean-source
 
@@ -351,6 +351,11 @@ distclean-test-suite:
 	@echo distcleaning Examples/test-suite
 	@$(MAKE) -k -s check-test-suite ACTION=distclean NOSKIP=1
 
+distclean-examples:
+	@echo distcleaning Examples
+	@$(MAKE) -k -s clean-examples
+	@cd Examples && $(MAKE) -k -s distclean
+
 distclean-ccache:
 	test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s distclean)
 
@@ -360,6 +365,9 @@ distclean-docs-ccache:
 distclean-dead:
 	rm -f $(DISTCLEAN-DEAD)
 
+distclean-:
+	rm -f Lib/ocaml/swigp4.ml
+
 #####################################################################
 # Update the Lib/swigwarn.swg file
 # Note: Generated into the source tree rather than build tree
diff --git a/Source/Makefile.am b/Source/Makefile.am
index bc3222b25..3f710302a 100644
--- a/Source/Makefile.am
+++ b/Source/Makefile.am
@@ -104,6 +104,9 @@ clean-local:
 	rm -f $(top_builddir)/swig@EXEEXT@
 	rm -f core @EXTRA_CLEAN@
 
+distclean:
+	rm -f $(top_builddir)/Source/Include/swigconfig.h
+	rm -f $(top_builddir)/Source/Include/stamp-h1
 
 # Beautify the code.
 # Note that this works well on C code, but does some odd joining of lines for C++ code.