diff --git a/CHANGELOG b/CHANGELOG
index 614ec569b7..fb88164723 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Enable buffered flash writes for TQM5200 board.
+
 * Fix problems with SanDisk Corporation Cruzer Micro USB memory stick.
 
 * Add support for TQM885D board.
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 6b8759f2b5..6dc7b12d80 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -292,7 +292,7 @@
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_SIZE		0x04000000 /* 64 MByte */
 #define CFG_MAX_FLASH_SECT	512	/* max num of sects on one chip */
-#undef CFG_FLASH_USE_BUFFER_WRITE	/* not supported yet for AMD */
+#define CFG_FLASH_USE_BUFFER_WRITE	1
 
 #if !defined(CFG_LOWBOOT)
 #define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x00760000 + 0x00800000)