diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 4874c515d7bb52a02b23e106cb0aa5891c2c71ff..4d5426e501dd043d6762c8cd5fdbc15a2267229d 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -105,15 +105,15 @@
 
 /* Environment */
 #define CONFIG_ENV_SIZE			SZ_16K
-#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_IN_FAT
+#define FAT_ENV_INTERFACE		"mmc"
+#define FAT_ENV_DEVICE_AND_PART		"0:1"
+#define FAT_ENV_FILE			"uboot.env"
+#define CONFIG_FAT_WRITE
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_SYS_LOAD_ADDR		0x1000000
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_PREBOOT \
-	"if load mmc 0:1 ${loadaddr} /uEnv.txt; then " \
-		"env import -t -r ${loadaddr} ${filesize}; " \
-	"fi"
 
 /* Shell */
 #define CONFIG_SYS_MAXARGS		8
@@ -138,7 +138,6 @@
 
 /* Some things don't make sense on this HW or yet */
 #undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SAVEENV
 
 /* Environment */
 #define ENV_DEVICE_SETTINGS \