diff --git a/CHANGELOG b/CHANGELOG
index 2d932851ff5fb4251ce7baf2d2f37c20c4a59102..28e19b99e129556de12ef46496b98851315fa46e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 
+* Use linker ASSERT statement to prevent undetected overlapping of
+  sections on PPChameleon board; other boards might use this, too.
+
 * Patch by Stefan Roese, 03 May 2005:
   Update for P3G4
   Fix problems in cmd_universe.c
diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds
index 26938384837ae1495889af0a789df1253faa9d82..d6117674b189d1324a20a03ff5b8c567b414263b 100644
--- a/board/dave/PPChameleonEVB/u-boot.lds
+++ b/board/dave/PPChameleonEVB/u-boot.lds
@@ -140,6 +140,7 @@ SECTIONS
    *(COMMON)
   }
 
+  ppcenv_assert = ASSERT(. < 0xFFFF8000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CFG_MONITOR_BASE, CFG_MONITOR_LEN and TEXT_BASE may need to be modified.");
   . = 0xFFFF8000;
   .ppcenv :
   {