diff --git a/src/arch/x86/bootblock_crt0.S b/src/arch/x86/bootblock_crt0.S
index 3e9065b707..16daed1b54 100644
--- a/src/arch/x86/bootblock_crt0.S
+++ b/src/arch/x86/bootblock_crt0.S
@@ -16,7 +16,6 @@
  * Include the old code for reset vector and protected mode entry. That code has
  * withstood the test of time.
  */
-#include <cpu/x86/16bit/reset16.inc>
 #include <cpu/x86/32bit/entry32.inc>
 
 #if CONFIG(BOOTBLOCK_DEBUG_SPINLOOP)
diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc
index 393506b8e3..9112ddbe1b 100644
--- a/src/cpu/x86/Makefile.inc
+++ b/src/cpu/x86/Makefile.inc
@@ -9,6 +9,7 @@ ramstage-y += backup_default_smm.c
 subdirs-$(CONFIG_CPU_INTEL_COMMON_SMM) += ../intel/smm
 
 bootblock-y += entry16.S
+bootblock-y += reset16.S
 
 additional-dirs += $(obj)/cpu/x86
 
diff --git a/src/cpu/x86/16bit/reset16.inc b/src/cpu/x86/reset16.S
similarity index 97%
rename from src/cpu/x86/16bit/reset16.inc
rename to src/cpu/x86/reset16.S
index b5abb3d9ec..38580146b4 100644
--- a/src/cpu/x86/16bit/reset16.inc
+++ b/src/cpu/x86/reset16.S
@@ -12,4 +12,3 @@ _start:
 	 * instead of the weird 16 bit relocations that binutils does not
 	 * handle consistently between versions because they are used so rarely.
 	 */
-	.previous