diff --git a/src/mainboard/lenovo/haswell/Kconfig b/src/mainboard/lenovo/haswell/Kconfig
index 71d30f2778..efac41b1d7 100644
--- a/src/mainboard/lenovo/haswell/Kconfig
+++ b/src/mainboard/lenovo/haswell/Kconfig
@@ -10,7 +10,6 @@ config BOARD_LENOVO_HASWELL_COMMON
 	select HAVE_CMOS_DEFAULT
 	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
-	select INTEL_INT15
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_USES_IFD_GBE_REGION
@@ -23,6 +22,7 @@ config BOARD_LENOVO_HASWELL_COMMON
 
 config BOARD_LENOVO_THINKPAD_T440P
 	select BOARD_LENOVO_HASWELL_COMMON
+	select INTEL_INT15
 
 if BOARD_LENOVO_HASWELL_COMMON
 
diff --git a/src/mainboard/lenovo/haswell/Makefile.inc b/src/mainboard/lenovo/haswell/Makefile.inc
index 5af50e7139..d1300f8f67 100644
--- a/src/mainboard/lenovo/haswell/Makefile.inc
+++ b/src/mainboard/lenovo/haswell/Makefile.inc
@@ -1,7 +1,6 @@
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/romstage.c
 
-ramstage-y += mainboard.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads
 
 subdirs-y += variants/$(VARIANT_DIR)
diff --git a/src/mainboard/lenovo/haswell/variants/t440p/Makefile.inc b/src/mainboard/lenovo/haswell/variants/t440p/Makefile.inc
new file mode 100644
index 0000000000..f3c87b2318
--- /dev/null
+++ b/src/mainboard/lenovo/haswell/variants/t440p/Makefile.inc
@@ -0,0 +1 @@
+ramstage-y += mainboard.c
diff --git a/src/mainboard/lenovo/haswell/mainboard.c b/src/mainboard/lenovo/haswell/variants/t440p/mainboard.c
similarity index 100%
rename from src/mainboard/lenovo/haswell/mainboard.c
rename to src/mainboard/lenovo/haswell/variants/t440p/mainboard.c