diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 7e344925ce3a26d3c57de5963ac5edcc84ddc36d..524ff7c92834d32665809d6cb2555d1aa5eb4755 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -197,6 +197,7 @@
 #undef CFG_RAMBOOT
 #endif
 
+/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
 #define CFG_MONITOR_LEN		(256 * 1024) /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN		(512 * 1024) /* Reserved for malloc */
 
@@ -386,7 +387,7 @@
  */
 #ifndef CFG_RAMBOOT
 	#define CFG_ENV_IS_IN_FLASH	1
-	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE + 0x40000)
+	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 	#define CFG_ENV_SECT_SIZE	0x20000 /* 128K(one sector) for env */
 	#define CFG_ENV_SIZE		0x2000
 #else