diff --git a/make/dirs.mk b/make/dirs.mk
index dbe4c2bc..23842f5b 100644
--- a/make/dirs.mk
+++ b/make/dirs.mk
@@ -33,8 +33,9 @@ SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS))
 endif
 
 ifneq ($(DONT_CHECK_PREREQ_DONE),true)
-PREREQ_DIRS = $(foreach p, $(PREREQ), $(call proj_dir, $(p)))
-PREREQ_DIRS_DONE = $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS)))
+PREREQ := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT))
+PREREQ_DIRS := $(call proj_query,proj-dir $(PREREQ))
+PREREQ_DIRS_DONE := $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS)))
 endif
 
 all: dirs-all.done