diff --git a/ChangeLog b/ChangeLog
index 4685eca4..5a869a33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-10 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* avrdude.conf.in (ATtiny11): fix the HVSP control stack,
+	add delay values required for flash and EEPROM.
+	* stk500v2.c: reverse the argument order for
+	CMD_CHIP_ERASE_HVSP; AVR068 and stk500.exe differ here.
+
 2006-08-09 Joerg Wunsch <j@uriah.heep.sax.de>
 
 	* stk500v2.c (stk500v2_program_enable): Fix a typo
diff --git a/avrdude.conf.in b/avrdude.conf.in
index 719193af..2c0d941f 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -611,9 +611,9 @@ part
 
     timeout		= 200;
     hvsp_controlstack     =
-	0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
+        0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
+        0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
         0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
     hventerstabdelay    = 100;
     progmodedelay       = 0;
@@ -635,12 +635,14 @@ part
         size            = 64;
 	blocksize	= 64;
 	readsize	= 256;
+	delay		= 5;
     ;
 
     memory "flash"
         size            = 1024;
 	blocksize	= 128;
 	readsize	= 256;
+	delay		= 3;
     ;
 
     memory "signature"