diff --git a/ChangeLog b/ChangeLog
index d9513a79..1c5b3737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-07  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	bug #27507: SIGSEGV when using avrdragon (avrdude 5.8)
+	* stk500v2.c (stk500v2_dragon_isp_initpgm): Use
+	stk500v2_jtagmkII_setup/stk500v2_jtagmkII_rather than their
+	jtagII counterparts, to get the private data properly
+	initialized.
+
 2010-01-07  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* buspirate.c: Cosmetics: remove UTF-8 dashes, adjust for 8-column
diff --git a/stk500v2.c b/stk500v2.c
index 4c4881ef..31bdf8f1 100644
--- a/stk500v2.c
+++ b/stk500v2.c
@@ -3586,8 +3586,8 @@ void stk500v2_dragon_isp_initpgm(PROGRAMMER * pgm)
   pgm->paged_load     = stk500v2_paged_load;
   pgm->print_parms    = stk500v2_print_parms;
   pgm->set_sck_period = stk500v2_set_sck_period_mk2;
-  pgm->setup          = jtagmkII_setup;
-  pgm->teardown       = jtagmkII_teardown;
+  pgm->setup          = stk500v2_jtagmkII_setup;
+  pgm->teardown       = stk500v2_jtagmkII_teardown;
   pgm->page_size      = 256;
 }