diff --git a/src/drivers/spi/Makefile.inc b/src/drivers/spi/Makefile.inc
index 3bce214f96..1319ae27ea 100644
--- a/src/drivers/spi/Makefile.inc
+++ b/src/drivers/spi/Makefile.inc
@@ -21,6 +21,16 @@ romstage-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.c
 romstage-$(CONFIG_SPI_FLASH_WINBOND) += winbond.c
 romstage-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c
 
+verstage-$(CONFIG_SPI_FLASH) += spi_flash.c
+verstage-$(CONFIG_SPI_FLASH_EON) += eon.c
+verstage-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.c
+verstage-$(CONFIG_SPI_FLASH_MACRONIX) += macronix.c
+verstage-$(CONFIG_SPI_FLASH_SPANSION) += spansion.c
+verstage-$(CONFIG_SPI_FLASH_SST) += sst.c
+verstage-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.c
+verstage-$(CONFIG_SPI_FLASH_WINBOND) += winbond.c
+verstage-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c
+
 endif
 
 ramstage-$(CONFIG_SPI_FLASH) += spi_flash.c
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 3ec3b88a22..69f2ad96e3 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -42,6 +42,7 @@ verstage-y += delay.c
 verstage-y += cbfs.c
 verstage-y += memcmp.c
 verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
+verstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
 verstage-y += tlcl.c
 verstage-$(CONFIG_GENERIC_UDELAY) += timer.c