diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index cfd7f4aceff..962ab90ab66 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-10  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
+
+	PR bootstrap/20437
+	* Makefile.in (configure, config.h.in): change into $(srcdir)
+	before autoconf or autoheader call.
+
 2006-06-23  Steve Ellcey  <sje@cup.hp.com>
 
 	PR target/28084
diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in
index 763dc0563a1..d5c26576304 100644
--- a/fixincludes/Makefile.in
+++ b/fixincludes/Makefile.in
@@ -160,10 +160,10 @@ config.status: $(srcdir)/configure
 	$(SHELL) ./config.status --recheck
 
 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac
-	autoconf
+       cd $(srcdir) && autoconf
 
 $(srcdir)/config.h.in: @MAINT@ $(srcdir)/configure.ac
-	autoheader
+       cd $(srcdir) && autoheader
 
 $(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/../gcc/aclocal.m4
 	cp $(srcdir)/../gcc/aclocal.m4 .
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 743178a5a3b..b8373d18c9c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-10  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
+
+	PR bootstrap/20437
+	* Makefile.in (configure): add missing aclocal.m4 and acinclude.m4
+	dependencies.
+
 2006-07-08  Matthias Klose  <doko@debian.org>
 
 	* doc/sourcebuild.texi: Fix typo.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 3287de9a605..25145910838 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1218,7 +1218,8 @@ cs-tm_p.h: Makefile
 # might be on a read-only file system.  If configured for maintainer mode
 # then do allow autoconf to be run.
 
-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4 \
+  $(srcdir)/acinclude.m4
 	(cd $(srcdir) && autoconf)
 
 gccbug:	$(srcdir)/gccbug.in