diff --git a/ChangeLog b/ChangeLog
index f97126205edbc85905b623726d2202690aaba724..123cd441386c3ec35eb0de0ad1c192fbcc19bb12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-18  Paolo Bonzini  <bonzini@gnu.org>
+
+        * Makefile.tpl (restrap): Call `make all' using double-colon rules.
+        * Makefile.in: Regenerate.
+
 2008-04-18  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
 
         * configure.ac (cr16-*-*): Add case for cr16 target and include gdb
diff --git a/Makefile.in b/Makefile.in
index dc3b0c5569a879b89b532d0b2d4abf179e42050f..16b94cfeef55e1d1326f5b5585348955cc1dd679 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52690,10 +52690,10 @@ stage_current:
 	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
 
 .PHONY: restrap
-restrap:
+restrap::
 	@: $(MAKE); $(stage)
 	rm -rf stage1-$(TARGET_SUBDIR) stage2-* stageb2g0-* stage3-* stageb3g2-* stage4-* stageprofile-* stagefeedback-* 
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+restrap:: all
 @endif gcc-bootstrap
 
 # --------------------------------------
diff --git a/Makefile.tpl b/Makefile.tpl
index e9629e2da2c1a7938e2a8993e7d75223f0a1866c..ea2676fced662b090df876e671db30a4808afc7c 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1450,11 +1450,11 @@ stage_current:
 	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
 
 .PHONY: restrap
-restrap:
+restrap::
 	@: $(MAKE); $(stage)
 	rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev
 	  +]stage[+id+]-* [+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+restrap:: all
 @endif gcc-bootstrap
 
 # --------------------------------------