diff --git a/CHANGELOG b/CHANGELOG
index eefc04f240c6719bed13f477b553ab1b2f885937..f558718460915aa205450095e4ac10419e782df1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Add JFFS2 support for TRAB board
+  Patch by Martin Krause, 25 Aug 2005
+
 * Remove unnecessary dependency of netconsole on CONFIG_NET_MULTI
   Patch by Marcus Hall, 24 Aug 2005
 
diff --git a/include/configs/trab.h b/include/configs/trab.h
index 8ffd1c96e9e80ba4fa585607ad11b545863d299d..7fd3e466e7f628c8a430b937603193cdc834bf95 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -159,10 +159,11 @@
 				CFG_CMD_BSP			| \
 				CFG_CMD_DATE			| \
 				CFG_CMD_DHCP			| \
-				CFG_CMD_USB			| \
 				CFG_CMD_FAT			| \
+				CFG_CMD_JFFS2			| \
 				CFG_CMD_NFS			| \
-				CFG_CMD_SNTP	)
+				CFG_CMD_SNTP			| \
+				CFG_CMD_USB	)
 #else
 #define CONFIG_COMMANDS	       (CONFIG_CMD_DFL			| \
 				CONFIG_COMMANDS_ADD_HWFLOW	| \
@@ -172,10 +173,11 @@
 				CFG_CMD_BSP			| \
 				CFG_CMD_DATE			| \
 				CFG_CMD_DHCP			| \
-				CFG_CMD_USB			| \
 				CFG_CMD_FAT			| \
+				CFG_CMD_JFFS2			| \
 				CFG_CMD_NFS			| \
-				CFG_CMD_SNTP	)
+				CFG_CMD_SNTP			| \
+				CFG_CMD_USB	)
 #endif
 
 /* moved up */
@@ -377,6 +379,20 @@
 #define	CFG_MONITOR_BASE	CFG_FLASH_BASE
 #define	CFG_MONITOR_LEN		(256 << 10)
 
+/* Dynamic MTD partition support */
+#define CONFIG_JFFS2_CMDLINE
+#define MTDIDS_DEFAULT		"nor0=0"
+
+/* production flash layout */
+#define MTDPARTS_DEFAULT	"mtdparts=0:32k(Firmware1)ro,"		\
+						"16k(Env1),"		\
+						"16k(Env2),"		\
+						"320k(Firmware2)ro,"	\
+						"896k(Kernel),"		\
+						"5376k(Root-FS),"	\
+						"1408k(JFFS2),"		\
+						"-(VFD)"
+
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */