diff --git a/CHANGELOG b/CHANGELOG
index 3a9d22ab5a..3ae8058ac9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes for U-Boot 1.0.0:
 ======================================================================
 
+* Add generic filesystem image type
+
 * Make fatload set filesize environment variable
 
 * enable basic / medium / high-end configurations for PPChameleonEVB
diff --git a/tools/mkimage.c b/tools/mkimage.c
index 241853a01f..05c6f97be4 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -110,6 +110,7 @@ table_entry_t type_name[] = {
     {	IH_TYPE_MULTI,	    "multi",	  "Multi-File Image",	},
     {	IH_TYPE_FIRMWARE,   "firmware",	  "Firmware",		},
     {	IH_TYPE_SCRIPT,     "script",	  "Script",		},
+    {	IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image",	},
     {	-1,		    "",		  "",			},
 };