diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index b941021..be1411e 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -148,6 +148,7 @@
 #endif
 
 	struct pei_data pei_data = {
+		.pei_version = PEI_VERSION,
 		.mchbar = DEFAULT_MCHBAR,
 		.dmibar = DEFAULT_DMIBAR,
 		.epbar = DEFAULT_EPBAR,
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index dda3ab5..f64e860 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -183,6 +183,7 @@
 	};
 #endif
 	struct pei_data pei_data = {
+		pei_version: PEI_VERSION,
 		mchbar: DEFAULT_MCHBAR,
 		dmibar: DEFAULT_DMIBAR,
 		epbar: DEFAULT_EPBAR,
diff --git a/src/northbridge/intel/haswell/pei_data.h b/src/northbridge/intel/haswell/pei_data.h
index 280c73b..7c10e41 100644
--- a/src/northbridge/intel/haswell/pei_data.h
+++ b/src/northbridge/intel/haswell/pei_data.h
@@ -31,7 +31,7 @@
 #define PEI_DATA_H
 
 typedef void (*tx_byte_func)(unsigned char byte);
-#define PEI_VERSION 10
+#define PEI_VERSION 11
 
 struct pei_data
 {
@@ -53,6 +53,7 @@
 	uint8_t spd_addresses[4];
 	int boot_mode;
 	int ec_present;
+	int gbe_enable;
 	// 0 = leave channel enabled
 	// 1 = disable dimm 0 on channel
 	// 2 = disable dimm 1 on channel
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index 56d2cd7..3a65782 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -118,8 +118,7 @@
 config MRC_FILE
 	string "Intel System Agent path and filename"
 	depends on HAVE_MRC
-	default "systemagent-ivybridge.bin" if NORTHBRIDGE_INTEL_IVYBRIDGE
-	default "systemagent-sandybridge.bin" if NORTHBRIDGE_INTEL_SANDYBRIDGE
+	default "systemagent-r6.bin"
 	help
 	  The path and filename of the file to use as System Agent
 	  binary.
diff --git a/src/northbridge/intel/sandybridge/Makefile.inc b/src/northbridge/intel/sandybridge/Makefile.inc
index 1428bdb..be07e93 100644
--- a/src/northbridge/intel/sandybridge/Makefile.inc
+++ b/src/northbridge/intel/sandybridge/Makefile.inc
@@ -35,12 +35,7 @@
 # We don't ship that, but booting without it is bound to fail
 cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin
 mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE))
-ifeq ($(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE),y)
 mrc.bin-position := 0xfffa0000
-endif
-ifeq ($(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE),y)
-mrc.bin-position := 0xfffe0000
-endif
 mrc.bin-type := 0xab
 
 $(obj)/mrc.cache:
diff --git a/src/northbridge/intel/sandybridge/pei_data.h b/src/northbridge/intel/sandybridge/pei_data.h
index fb56873..d317515 100644
--- a/src/northbridge/intel/sandybridge/pei_data.h
+++ b/src/northbridge/intel/sandybridge/pei_data.h
@@ -38,7 +38,7 @@
 } pch_usb3_controller_settings;
 
 typedef void (*tx_byte_func)(unsigned char byte);
-#define PEI_VERSION 5
+#define PEI_VERSION 6
 
 struct pei_data
 {
@@ -61,6 +61,7 @@
 	uint8_t ts_addresses[4];
 	int boot_mode;
 	int ec_present;
+	int gbe_enable;
 	// 0 = leave channel enabled
 	// 1 = disable dimm 0 on channel
 	// 2 = disable dimm 1 on channel