diff --git a/repos/base-hw/lib/mk/bootstrap-hw.inc b/repos/base-hw/lib/mk/bootstrap-hw.inc
index ea88e1b4f7..91a1689419 100644
--- a/repos/base-hw/lib/mk/bootstrap-hw.inc
+++ b/repos/base-hw/lib/mk/bootstrap-hw.inc
@@ -30,7 +30,7 @@ NR_OF_CPUS ?= 1
 CC_OPT += -Wa,--defsym -Wa,NR_OF_CPUS=$(NR_OF_CPUS) -DNR_OF_CPUS=$(NR_OF_CPUS)
 
 TMP         := $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
-BASE_HW_DIR := $(TMP:%lib/mk/bootstrap-hw.inc=%)
+BASE_HW_DIR := $(TMP:%/lib/mk/bootstrap-hw.inc=%)
 
 vpath base/%        $(BASE_HW_DIR)/src
 vpath bootstrap/%   $(BASE_HW_DIR)/src
diff --git a/repos/base-hw/lib/mk/core-hw.inc b/repos/base-hw/lib/mk/core-hw.inc
index 98ffd7b365..3ccafb95e2 100644
--- a/repos/base-hw/lib/mk/core-hw.inc
+++ b/repos/base-hw/lib/mk/core-hw.inc
@@ -72,7 +72,7 @@ NR_OF_CPUS ?= 1
 CC_OPT += -Wa,--defsym -Wa,NR_OF_CPUS=$(NR_OF_CPUS) -DNR_OF_CPUS=$(NR_OF_CPUS)
 
 TMP         := $(call select_from_repositories,lib/mk/core-hw.inc)
-BASE_HW_DIR := $(TMP:%lib/mk/core-hw.inc=%)
+BASE_HW_DIR := $(TMP:%/lib/mk/core-hw.inc=%)
 
 # declare source locations
 vpath % $(BASE_HW_DIR)/src/core