diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index e893f136..8db1886f 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-04  Mike Frysinger  <vapier@gentoo.org>
+
+   * src/flash/amd.c: Handle chipid 0x22ed M29W640DT.
+
 2008-05-02  Arnim Laeuger  <arniml@users.sourceforge.net>
 
    * src/tap/cable/generic_usbconn.c (generic_usbconn_connect):
diff --git a/jtag/src/flash/amd.c b/jtag/src/flash/amd.c
index 4a4c14e3..a4228423 100644
--- a/jtag/src/flash/amd.c
+++ b/jtag/src/flash/amd.c
@@ -314,6 +314,9 @@ amd_flash_print_info( cfi_array_t *cfi_array )
 			case 0x00cb:
 			printf( _("M29W320DB") );
 			break;
+			case 0x22ed:
+			printf( _("M29W640DT") );
+			break;
 			default:
 			printf ( _("Unknown (ID 0x%04x)"), cid );
 			break;