diff --git a/Makefile b/Makefile
index 2b9b4ab3bd198299ee2638cb111ce6f10835434f..b6bb983e6ad291391cc4390cf79d840fd07cfa42 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,9 @@ all: gluon-tools
 download prepare images: gluon-tools
 	+@$(GLUONMAKE) $@
 
+tools/% toolchain/% package/% target/%: gluon-tools
+	+@$(GLUONMAKE) $@
+
 manifest: gluon-tools
 	[ -n "$(GLUON_BRANCH)" ] || (echo 'Please set GLUON_BRANCH to create a manifest.'; false)
 	+@$(GLUONMAKE) $@