diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index d27876af..e4428b6e 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-04  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	bug #22882: Erase Cycle Counter does not work for stk500v2
+	* stk500v2.c (stk500v2_chip_erase,stk500hv_chip_erase): Return
+	the expected 0 for success rather than a protocol-dependant
+	number.
+ 
 2008-11-04  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	bug #22883: Chip Erase performed even with no-write flag (-n)
diff --git a/avrdude/stk500v2.c b/avrdude/stk500v2.c
index 5d598bf0..145fdb8e 100644
--- a/avrdude/stk500v2.c
+++ b/avrdude/stk500v2.c
@@ -753,7 +753,7 @@ static int stk500v2_chip_erase(PROGRAMMER * pgm, AVRPART * p)
 
   pgm->pgm_led(pgm, OFF);
 
-  return result;
+  return result >= 0? 0: -1;
 }
 
 /*
@@ -781,7 +781,7 @@ static int stk500hv_chip_erase(PROGRAMMER * pgm, AVRPART * p, enum hvmode mode)
 
   pgm->pgm_led(pgm, OFF);
 
-  return result;
+  return result >= 0? 0: -1;
 }
 
 /*