diff --git a/CHANGELOG b/CHANGELOG
index 576cd7fb86141f85c626feb2ee652967ef29d294..f71c864228acec70a5a09239aa81dd464f88f4c8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Change Yellowstone to use CFI write buffer
+  Patch by Stefan Roese, 07 Aug 2006
+
 * Add support for AMCC Sequoia PPC440EPx eval board
   - Add support for PPC440EPx & PPC440GRx
   - Add support for PPC440EP(x)/GR(x) NAND controller
diff --git a/include/configs/yellowstone.h b/include/configs/yellowstone.h
index bcafd8ba8b3c8c23d06513e35b5f19c5c7a587b5..ba27f37f6ebe3505ad24433d5973b5dee2687047 100644
--- a/include/configs/yellowstone.h
+++ b/include/configs/yellowstone.h
@@ -110,6 +110,8 @@
 #define CFG_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms)	*/
 #define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/
 
+#define CFG_FLASH_USE_BUFFER_WRITE 1	/* use buffered writes (20x faster)	*/
+
 #define CFG_FLASH_EMPTY_INFO		/* print 'E' for empty sector on flinfo */
 
 #ifdef CFG_ENV_IS_IN_FLASH