diff --git a/repos/base-hw/lib/mk/arm/core.inc b/repos/base-hw/lib/mk/arm/core.inc
index f87d78bf6..5bfd4ecb3 100644
--- a/repos/base-hw/lib/mk/arm/core.inc
+++ b/repos/base-hw/lib/mk/arm/core.inc
@@ -13,8 +13,5 @@ SRC_CC += spec/arm/kernel/thread_base.cc
 # add assembly sources
 SRC_S += spec/arm/crt0.s
 
-# use dummy boot-modules per default
-BOOT_MODULES_VPATH = $(REP_DIR)/src/core/spec/arm
-
 # include less specific configuration
 include $(REP_DIR)/lib/mk/core.inc
diff --git a/repos/base-hw/lib/mk/core.inc b/repos/base-hw/lib/mk/core.inc
index f23f039f1..c6f4eb576 100644
--- a/repos/base-hw/lib/mk/core.inc
+++ b/repos/base-hw/lib/mk/core.inc
@@ -62,10 +62,13 @@ SRC_S += boot_modules.s
 # provide Genode version information
 include $(BASE_DIR)/src/core/version.inc
 
-# switch to specific boot-modules if further images shall be available
+# switch to build-specific boot-modules if further images shall be available
 ifneq ($(wildcard $(BUILD_BASE_DIR)/boot_modules.s),)
   BOOT_MODULES_VPATH = $(BUILD_BASE_DIR)
   INC_DIR += $(BOOT_MODULES_VPATH)
+else
+  # use dummy boot-modules per default
+  BOOT_MODULES_VPATH = $(REP_DIR)/src/core/
 endif
 vpath boot_modules.s $(BOOT_MODULES_VPATH)