diff --git a/src/mainboard/facebook/watson/Kconfig b/src/mainboard/facebook/watson/Kconfig
index 43b47849ed..3235b6cc99 100644
--- a/src/mainboard/facebook/watson/Kconfig
+++ b/src/mainboard/facebook/watson/Kconfig
@@ -13,6 +13,14 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_TPM1
 	select NO_UART_ON_SUPERIO
 
+config VBOOT
+	select VBOOT_VBNV_CMOS
+	select VBOOT_NO_BOARD_SUPPORT
+	select GBB_FLAG_DISABLE_LID_SHUTDOWN
+	select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
+	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
+	select GBB_FLAG_DISABLE_FWMP
+
 config MAINBOARD_DIR
 	string
 	default "facebook/watson"
diff --git a/src/mainboard/facebook/watson/cmos.layout b/src/mainboard/facebook/watson/cmos.layout
index 85506ebe26..675370df70 100644
--- a/src/mainboard/facebook/watson/cmos.layout
+++ b/src/mainboard/facebook/watson/cmos.layout
@@ -72,6 +72,7 @@ entries
 #392          3       r       0        unused
 395          4       e       6        debug_level
 #399          1       r       0        unused
+416          128      r      0        vbnv
 
 # coreboot config options: check sums
 984         16       h       0        check_sum
diff --git a/src/mainboard/facebook/watson/vboot-ro.fmd b/src/mainboard/facebook/watson/vboot-ro.fmd
new file mode 100644
index 0000000000..cc6a7c57a8
--- /dev/null
+++ b/src/mainboard/facebook/watson/vboot-ro.fmd
@@ -0,0 +1,26 @@
+FLASH 16M {
+	SI_ALL@0x0 0x600000 {
+		SI_DESC@0x0 0x1000
+		UNUSED_1@0x1000 0x1000
+		IDPROM@0x2000 0x400
+		UNUSED_2@0x2400 0x1ec00
+		SI_ME@0x21000 0x3de000
+		UNUSED_3@0x400000 0x200000
+        }
+	SI_BIOS@0x600000 0xA00000 {
+		MISC_RW@0x0 0x20000 {
+			RW_MRC_CACHE@0x0 0x10000
+			RW_VPD(PRESERVE)@0x010000 0x4000
+		}
+		WP_RO@0x20000 0x9e0000 {
+			RO_VPD(PRESERVE)@0x0 0x4000
+			RO_SECTION@0x4000 0x9dc000 {
+				FMAP@0x0 0x800
+				RO_FRID@0x800 0x40
+				RO_FRID_PAD@0x840 0x7c0
+				GBB@0x1000 0x4000
+				COREBOOT(CBFS)@0x5000 0x9d7000
+			}
+		}
+	}
+}