diff --git a/ChangeLog b/ChangeLog
index 5c39cbdb9..a8bb83478 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR other/40159
+	* Makefile.tpl (all): Don't assume gcc-bootstrap and
+	gcc-no-bootstrap are mutually exclusive.
+	* Makefile.in: Rebuilt.
+
 2009-05-18  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR other/40159
diff --git a/Makefile.in b/Makefile.in
index 5b0d47430..110f7d696 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -854,16 +854,16 @@ all:
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 @if gcc-bootstrap
-	if [ -f stage_last ]; then : ; \
+	if [ -f stage_last ]; then \
 	  TFLAGS="$(STAGE$(shell sed s,^stage,, stage_last)_TFLAGS)"; \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
 	else \
 @endif gcc-bootstrap
-@if gcc-no-bootstrap
-	if :; then :; \
-@endif gcc-no-bootstrap
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \
+@if gcc-bootstrap
+	    ; \
 	fi
+@endif gcc-bootstrap
 
 .PHONY: all-build
 
diff --git a/Makefile.tpl b/Makefile.tpl
index d4b2f0314..bc7c415f0 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -625,11 +625,11 @@ all:
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
 	else \
 @endif gcc-bootstrap
-@if gcc-no-bootstrap
-	if :; then :; \
-@endif gcc-no-bootstrap
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \
+@if gcc-bootstrap
+	    ; \
 	fi
+@endif gcc-bootstrap
 
 .PHONY: all-build
 [+ FOR build_modules +]