diff --git a/ChangeLog b/ChangeLog
index 4f3930aa..d9b66c44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-13  Hannes Weisbach <hannes_weisbach@gmx.net>
+
+	* avrftdi.c: fixes pin_limit for different FTDI devices (there was a mixup
+	between 2232C and 2232H)
+
 2012-07-29  Hannes Weisbach <hannes_weisbach@gmx.net>
 
 	* avrftdi.c: bugfixes (synchronisation) and maintenance (paged programming,
diff --git a/avrftdi.c b/avrftdi.c
index 2d32e2bf..c285fc69 100644
--- a/avrftdi.c
+++ b/avrftdi.c
@@ -764,15 +764,24 @@ static int avrftdi_open(PROGRAMMER * pgm, char *port)
 
 	/* set pin limit depending on chip type */
 	switch(pdata->ftdic->type) {
+#if 0
+		//TODO: issue an error - no MPSSE. hint the user to syncbb?
+		case TYPE_AM:
+		case TYPE_BM:
+		case TYPE_R:
+#endif
 		case TYPE_2232C:
-			pdata->pin_limit = 15;
-			break;
-		case TYPE_2232H:
 			pdata->pin_limit = 11;
 			break;
+		case TYPE_2232H:
+		case TYPE_232H:
+			pdata->pin_limit = 15;
+			break;
 		case TYPE_4232H:
-		default:
 			pdata->pin_limit = 7;
+			break;
+		default:
+		//TODO: error/unsupported device
 	}
 	
 	/* add SCK, MOSI and RESET as output pins - MISO needs no configuration */