diff --git a/CHANGELOG b/CHANGELOG
index e7606ee3ec5d72e4811645801f4ae781501259fc..9e8557083e908238a399cea67c6d3482bb420b66 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Adjust bd->bi_flashstart on Yellowstone & Yosemite to correct size
+  Patch by Stefan Roese, 05 Nov 2005
+
 * Additional fix for external IRQ config on Yellowstone & Yosemite
   Patch by Stefan Roese, 03 Nov 2005
 
diff --git a/board/amcc/yellowstone/yellowstone.c b/board/amcc/yellowstone/yellowstone.c
index 7ca60b6401220a73e1b1d29daf447843ab3d6bdd..069e28f3c80dfc83e7646c2d2bc64dc8d079f551 100644
--- a/board/amcc/yellowstone/yellowstone.c
+++ b/board/amcc/yellowstone/yellowstone.c
@@ -173,6 +173,10 @@ int misc_init_r (void)
 	mtdcr(ebccfga, pb0cr);
 	mtdcr(ebccfgd, pbcr);
 
+	/* adjust flash start and offset */
+	gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize;
+	gd->bd->bi_flashoffset = 0;
+
 	/* Monitor protection ON by default */
 	(void)flash_protect(FLAG_PROTECT_SET,
 			    -CFG_MONITOR_LEN,
diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c
index bc3d85bb5484b9b38e213836317e513749773978..61a39beed7d1abd3528d231eb52e1a76176bda2c 100644
--- a/board/amcc/yosemite/yosemite.c
+++ b/board/amcc/yosemite/yosemite.c
@@ -169,6 +169,10 @@ int misc_init_r (void)
 	mtdcr(ebccfga, pb0cr);
 	mtdcr(ebccfgd, pbcr);
 
+	/* adjust flash start and offset */
+	gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize;
+	gd->bd->bi_flashoffset = 0;
+
 	/* Monitor protection ON by default */
 	(void)flash_protect(FLAG_PROTECT_SET,
 			    -CFG_MONITOR_LEN,