diff --git a/.gitignore b/.gitignore
index b174ce657..1a71c9696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ config.h
 /tgt-vvp/vvp_config.h
 /tgt-vhdl/vhdl_config.h
 /vpi/vpi_config.h
+stamp-*-h
 /version.h
 /version_tag.h
 
diff --git a/Makefile.in b/Makefile.in
index 095fac65d..4eda7e227 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,9 +106,10 @@ distclean: clean
 ifeq (@MINGW32@,no)
 	(cd driver-vpi ; $(MAKE) $@)
 endif
-	for dir in $(NOTUSED); do (cd $$dir ; $(MAKE) $@); done
-	rm -f Makefile config.status config.log config.cache config.h
-	rm -f _pli_types.h
+	$(foreach dir,$(NOTUSED),$(MAKE) -C $(dir) $@ && ) true
+	rm -f Makefile config.status config.log config.cache
+	rm -f stamp-config-h config.h
+	rm -f stamp-_pli_types-h _pli_types.h
 
 TT = t-dll.o t-dll-api.o t-dll-expr.o t-dll-proc.o t-dll-analog.o
 FF = cprop.o nodangle.o synth.o synth2.o syn-rules.o
@@ -144,7 +145,7 @@ stamp-_pli_types-h: $(srcdir)/_pli_types.h.in config.status
 	./config.status _pli_types.h
 _pli_types.h: stamp-_pli_types-h
 
-$(srcdir)/configure: $(srcdir)/configure.in
+$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
 	cd $(srcdir) && autoconf
 
 config.status: $(srcdir)/configure
diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in
index 43b0d940e..d675319c3 100644
--- a/libveriuser/Makefile.in
+++ b/libveriuser/Makefile.in
@@ -87,7 +87,8 @@ clean:
 	rm -rf *.o dep libveriuser.a libveriuser.o bin32
 
 distclean: clean
-	rm -f Makefile config.log config.h
+	rm -f Makefile config.log
+	rm -f config.h stamp-config-h
 
 install:: all installdirs $(libdir)/libveriuser$(suffix).a $(INSTALL32)
 
diff --git a/tgt-vhdl/Makefile.in b/tgt-vhdl/Makefile.in
index c0de60beb..775d58837 100644
--- a/tgt-vhdl/Makefile.in
+++ b/tgt-vhdl/Makefile.in
@@ -75,7 +75,8 @@ clean:
 	rm -rf $(O) dep vhdl.tgt 
 
 distclean: clean
-	rm -f Makefile config.log vhdl_config.h
+	rm -f Makefile config.log
+	rm -f stamp-vhdl_config-h vhdl_config.h
 
 check: all
 
diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in
index 9964b51a3..7ee3d23a6 100644
--- a/tgt-vvp/Makefile.in
+++ b/tgt-vvp/Makefile.in
@@ -86,7 +86,8 @@ clean:
 	rm -rf *.o dep vvp.tgt vvp.conf vvp-s.conf
 
 distclean: clean
-	rm -f Makefile config.log vvp_config.h
+	rm -f Makefile config.log
+	rm -f stamp-vvp_config-h vvp_config.h
 
 check: all
 
diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index 5959ce9a2..c398932a2 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -109,7 +109,8 @@ clean:
 	rm -f va_math.vpi v2005_math.vpi
 
 distclean: clean
-	rm -f Makefile config.log vpi_config.h
+	rm -f Makefile config.log
+	rm -f vpi_config.h stamp-vpi_config-h
 
 Makefile: $(srcdir)/Makefile.in ../config.status
 	cd ..; ./config.status --file=vpi/$@
diff --git a/vvp/Makefile.in b/vvp/Makefile.in
index 2a8ac7ad3..b9156a71a 100644
--- a/vvp/Makefile.in
+++ b/vvp/Makefile.in
@@ -61,7 +61,8 @@ clean:
 	rm -rf dep vvp@EXEEXT@ libvpi.a bin32 parse.output vvp.pdf vvp.exp
 
 distclean: clean
-	rm -f Makefile config.log config.h
+	rm -f Makefile config.log
+	rm -f stamp-config-h config.h
 
 check: all
 	./vvp -M../vpi $(srcdir)/examples/hello.vvp | grep 'Hello, World.'