diff --git a/ChangeLog b/ChangeLog
index 6523b68e..7bcd5210 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-15 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* avrdude.conf.in: Fix the STK500v2 ISP delay parameter for
+	ATmega640/1280/1281/2560/2561.  Atmel has changed the XML
+	files after the initial release.
+
 2007-05-01 Colin O'Flynn <coflynn@newae.com>
 
 	* safemode.c: -Oops - bug in verbose output. Fixed.
diff --git a/avrdude.conf.in b/avrdude.conf.in
index b8b0f7f3..837f2747 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -8633,7 +8633,7 @@ part
                           "  x   x   x   x      x   x   x   x";
 
 	mode		= 0x41;
-	delay		= 6;
+	delay		= 10;
 	blocksize	= 256;
 	readsize	= 256;
       ;
@@ -8821,7 +8821,7 @@ part
                           "  x   x   x   x      x   x   x   x";
 
 	mode		= 0x41;
-	delay		= 6;
+	delay		= 10;
 	blocksize	= 256;
 	readsize	= 256;
       ;
@@ -9010,7 +9010,7 @@ part
                           "  x   x   x   x      x   x   x   x";
 
 	mode		= 0x41;
-	delay		= 6;
+	delay		= 10;
 	blocksize	= 256;
 	readsize	= 256;
       ;
@@ -9203,7 +9203,7 @@ part
                           "  0   0   0   0      0   0   0   0";
 
 	mode		= 0x41;
-	delay		= 6;
+	delay		= 10;
 	blocksize	= 256;
 	readsize	= 256;
       ;
@@ -9396,7 +9396,7 @@ part
                           "  0   0   0   0      0   0   0   0";
 
 	mode		= 0x41;
-	delay		= 6;
+	delay		= 10;
 	blocksize	= 256;
 	readsize	= 256;
       ;