diff --git a/Makefile b/Makefile
index 9f9e93a71733..3cab80612277 100644
--- a/Makefile
+++ b/Makefile
@@ -352,11 +352,8 @@ config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in auto
 #
 # Bootstap
 #
-$(WORKDIR)/bootstrap: autogen
-	@cd $(SRCDIR) && ./bootstrap
-	@mkdir -p $(dir $@) && touch $@
 
-bootstrap: $(WORKDIR)/bootstrap autogen
+bootstrap: $(WORKDIR)/bootstrap
 
 #
 # Fetch
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 2149f4d1fd42..332e0d4ded09 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -27,6 +27,10 @@
 
 .PHONY: cross-build-toolset dev-install build findunusedcode
 
+$(WORKDIR)/bootstrap:
+	@cd $(SRCDIR) && ./bootstrap
+	@mkdir -p $(dir $@) && touch $@
+
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),buildpl)
 
 .DEFAULT_GOAL=all