diff --git a/src/cpu/intel/haswell/Makefile.inc b/src/cpu/intel/haswell/Makefile.inc
index 3c4db4f1c8..bfb501133c 100644
--- a/src/cpu/intel/haswell/Makefile.inc
+++ b/src/cpu/intel/haswell/Makefile.inc
@@ -1,4 +1,6 @@
 ramstage-y += haswell_init.c
+
+romstage-y += romstage.c
 romstage-y += ../car/romstage.c
 
 ramstage-y += acpi.c
diff --git a/src/soc/intel/broadwell/cpu/romstage.c b/src/cpu/intel/haswell/romstage.c
similarity index 100%
rename from src/soc/intel/broadwell/cpu/romstage.c
rename to src/cpu/intel/haswell/romstage.c
diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc
index dc16ae4bb9..5e0ce649bf 100644
--- a/src/soc/intel/broadwell/Makefile.inc
+++ b/src/soc/intel/broadwell/Makefile.inc
@@ -1,7 +1,5 @@
 ifeq ($(CONFIG_SOC_INTEL_BROADWELL),y)
 
-romstage-y += cpu/romstage.c
-
 subdirs-y += pch
 
 bootblock-y += bootblock.c