diff --git a/ChangeLog b/ChangeLog
index 3556f7664bb..0975c93a66f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.tpl (all): Avoid harmless warning in make all when
+	gcc-bootstrap is enabled but stage_last does not exist.
+	* Makefile.in: Rebuilt.
+
 2009-05-24  Nicolas Roche  <roche@adacore.com>
 
 	* Makefile.tpl (compare-target): Skip ./ada/*tools directories.
diff --git a/Makefile.in b/Makefile.in
index 65835c59580..bac64461b33 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -855,7 +855,7 @@ all:
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 @if gcc-bootstrap
 	if [ -f stage_last ]; then \
-	  TFLAGS="$(STAGE$(shell sed s,^stage,, stage_last)_TFLAGS)"; \
+	  TFLAGS="$(STAGE$(shell test ! -f stage_last || sed s,^stage,, stage_last)_TFLAGS)"; \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
 	else \
 @endif gcc-bootstrap
diff --git a/Makefile.tpl b/Makefile.tpl
index ecc903ed614..f49f3fcb272 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -621,7 +621,7 @@ all:
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 @if gcc-bootstrap
 	if [ -f stage_last ]; then \
-	  TFLAGS="$(STAGE$(shell sed s,^stage,, stage_last)_TFLAGS)"; \
+	  TFLAGS="$(STAGE$(shell test ! -f stage_last || sed s,^stage,, stage_last)_TFLAGS)"; \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
 	else \
 @endif gcc-bootstrap