diff --git a/src/cpu/x86/64bit/Makefile.inc b/src/cpu/x86/64bit/Makefile.inc
index 48f56fccfd..526291a7fa 100644
--- a/src/cpu/x86/64bit/Makefile.inc
+++ b/src/cpu/x86/64bit/Makefile.inc
@@ -1,7 +1,5 @@
 bootblock-y += mode_switch.S
-ifneq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y)
-verstage-y += mode_switch.S
-endif
+verstage_x86-y += mode_switch.S
 romstage-y += mode_switch.S
 postcar-y += mode_switch.S
 ramstage-y += mode_switch.S