diff --git a/repos/base-hw/lib/mk/spec/arm_64/startup-hw.mk b/repos/base-hw/lib/mk/spec/arm_64/startup-hw.mk
index 613d120742..2e0b44eb62 100644
--- a/repos/base-hw/lib/mk/spec/arm_64/startup-hw.mk
+++ b/repos/base-hw/lib/mk/spec/arm_64/startup-hw.mk
@@ -1,3 +1,3 @@
 include $(BASE_DIR)/lib/mk/startup.inc
 
-vpath crt0.s $(BASE_DIR)/src/lib/startup/spec/arm_64
+vpath crt0.s $(call select_from_repositories,src/lib/startup/spec/arm_64)
diff --git a/repos/base/lib/mk/spec/arm/startup.inc b/repos/base/lib/mk/spec/arm/startup.inc
index d08fe25098..c051a095b5 100644
--- a/repos/base/lib/mk/spec/arm/startup.inc
+++ b/repos/base/lib/mk/spec/arm/startup.inc
@@ -1,3 +1,3 @@
 include $(BASE_DIR)/lib/mk/startup.inc
 
-vpath crt0.s $(BASE_DIR)/src/lib/startup/spec/arm
+vpath crt0.s $(call select_from_repositories,src/lib/startup/spec/arm)
diff --git a/repos/base/lib/mk/spec/x86_64/startup.inc b/repos/base/lib/mk/spec/x86_64/startup.inc
index e713371875..267bbc21d8 100644
--- a/repos/base/lib/mk/spec/x86_64/startup.inc
+++ b/repos/base/lib/mk/spec/x86_64/startup.inc
@@ -1,3 +1,3 @@
 include $(BASE_DIR)/lib/mk/startup.inc
 
-vpath crt0.s $(BASE_DIR)/src/lib/startup/spec/x86_64
+vpath crt0.s $(call select_from_repositories,src/lib/startup/spec/x86_64)
diff --git a/repos/base-hw/src/lib/startup/spec/riscv/crt0.s b/repos/base/src/lib/startup/spec/riscv/crt0.s
similarity index 100%
rename from repos/base-hw/src/lib/startup/spec/riscv/crt0.s
rename to repos/base/src/lib/startup/spec/riscv/crt0.s