diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 335bbfb1..cfb624dd 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-26  Kolja Waschk <kawk>
+
+   * src/flash/amd.c: Separate Chip name by Manufacturer (Andrey F. Ilchuk)
+
 2008-04-24  Mike Frysinger  <vapier@gentoo.org>
 
    * src/tap/usbconn/libusb.c (usbconn_libusb_connect): Use the
diff --git a/jtag/src/flash/amd.c b/jtag/src/flash/amd.c
index 41b32b1b..4a4c14e3 100644
--- a/jtag/src/flash/amd.c
+++ b/jtag/src/flash/amd.c
@@ -282,46 +282,58 @@ amd_flash_print_info( cfi_array_t *cfi_array )
 	switch (mid) {
 		case 0x0001:
 			printf( _("AMD") );
+		printf( _("\n\tChip: ") );
+			switch (cid) {
+			case 0x0049:
+			printf( _("AM29LV160DB") );
 			break;
-		case 0x0020:
-			printf( _("ST/Samsung") );
-			break;
-		case 0x002C:
-			printf( _("Macronix") );
-			break;
-		default:
-			printf( _("Unknown manufacturer (ID 0x%04x)"), mid );
+			case 0x0093:
+			printf( _("Am29LV065D") );
 			break;
-	}
-	printf( _("\n\tChip: ") );
-	switch (cid) {
-		case 0x004F:
+			case 0x004F:
 			printf( _("Am29LV040B") );
 			break;
-		case 0x22D7:
+			case 0x22D7:
 			printf( _("Am29LV640D/Am29LV641D/Am29LV642D") );
 			break;
-		case 0x225B:
+			case 0x225B:
 			printf( _("Am29LV800B") );
 			break;
-		case 0x2249:
-			printf( _("MX29LV160B") );
-			break;
-		case 0x0049:
-			printf( _("AM29LV160DB") );
-			break;
-		case 0x0093:
-			printf( _("Am29LV065D") );
+			default:
+			printf ( _("Unknown (ID 0x%04x)"), cid );
 			break;
-		case 0x00ca:
+		}
+		break;
+		case 0x0020:
+			printf( _("ST/Samsung") );
+		printf( _("\n\tChip: ") );
+			switch (cid) {
+			case 0x00ca:
 			printf( _("M29W320DT") );
 			break;
-		case 0x00cb:
+			case 0x00cb:
 			printf( _("M29W320DB") );
 			break;
-		default:
+			default:
+			printf ( _("Unknown (ID 0x%04x)"), cid );
+			break;
+		}
+		break;
+		case 0x00C2:
+			printf( _("Macronix") );
+		printf( _("\n\tChip: ") );
+			switch (cid) {
+			case 0x2249:
+			printf( _("MX29LV160B") );
+			break;
+			default:
 			printf ( _("Unknown (ID 0x%04x)"), cid );
 			break;
+		}
+		break;
+		default:
+			printf( _("Unknown manufacturer (ID 0x%04x) Chip (ID 0x%04x)"), mid, cid );
+			break;
 	}
 	printf( _("\n\tProtected: %04x\n"), prot );