diff --git a/ChangeLog b/ChangeLog
index e6826424..2f46e9ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-26  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	Submitted by an anonymous contributor on the mailinglist:
+	* avrdude.conf (jtagkey): Add a definition for the Amontec
+	JTAGKey
+
 2011-08-26  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	Submitted by Juergen Weigert:
diff --git a/avrdude.conf.in b/avrdude.conf.in
index 45bbf4fe..03c308da 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -395,6 +395,29 @@ programmer
   vfyled = ~ 13;
 ;
 
+programmer
+  id    = "jtagkey";
+  desc  = "Amontec JTAGKey, JTAGKey-Tiny and JTAGKey2";
+  type  = avrftdi;
+  usbvid     = 0x0403;
+# Note: This PID is used in all JTAGKey variants
+  usbpid    = 0xCFF8;
+  usbdev = "A";
+  usbvendor  = "";
+  usbproduct = "";
+  usbsn      = "";
+#ISP-signals => 20 - Pin connector on JTAGKey
+  reset  = 4; # TMS 7 violet
+  sck    = 1; # TCK 9 white
+  mosi   = 2; # TDI 5 green
+  miso   = 3; # TDO 13 orange
+  buff   = 5;
+# VTG           VREF 1 brown with red tip
+# GND           GND 20 black
+# The colors are on the 20 pin breakout cable
+# from Amontec
+;
+
 programmer
   id    = "avrisp";
   desc  = "Atmel AVR ISP";