diff --git a/ChangeLog b/ChangeLog
index c9f41979..ec3084f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-16  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	Submitted by Timon Van Overveldt:
+	bug #30268: Debugwire broken in avrdude-5.10
+	* jtagmkII.c (jtagmkII_initialize): only try setting up a JTAG chain when
+	the programmer is using JTAG.
+
 2011-08-16  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	bug #29636: AVRDude issues invalid CMD_CHECK_TARGET_CONNECTION
diff --git a/jtagmkII.c b/jtagmkII.c
index 259ba6e9..34876cfc 100644
--- a/jtagmkII.c
+++ b/jtagmkII.c
@@ -1270,7 +1270,8 @@ static int jtagmkII_initialize(PROGRAMMER * pgm, AVRPART * p)
       return -1;
   }
 
-  if (jtagmkII_setparm(pgm, PAR_DAISY_CHAIN_INFO, PDATA(pgm)->jtagchain) < 0) {
+  if ((pgm->flag & PGM_FL_IS_JTAG) &&
+      jtagmkII_setparm(pgm, PAR_DAISY_CHAIN_INFO, PDATA(pgm)->jtagchain) < 0) {
     fprintf(stderr, "%s: jtagmkII_initialize(): Failed to setup JTAG chain\n",
             progname);
     return -1;