diff --git a/CHANGELOG b/CHANGELOG
index e4f4f00961385acd474fcb345c5fc61ead5cbd07..494d0b0debc760a958678e2ec5709a6435c9965a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Update yosemite configuration to enable flash write buffer support
+  Patch by Stefan Roese, 10 May 2006
+
 * Fix compile warnings in common/xyzModem.c
   Patch by Stefan Roese, 10 May 2006
 
diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index a67b834866ba9869f231ca2465e1a396f04dc8d1..d92aff4a9240cdae88bc1b43ee5e2d0e60cf91e3 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -109,6 +109,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