diff --git a/src/avrdude.1 b/src/avrdude.1
index af2ca4143..28e7b0d7b 100644
--- a/src/avrdude.1
+++ b/src/avrdude.1
@@ -1264,8 +1264,9 @@ command line argument.
 .Ar verify
 flushes the cache before verifying memories.
 .It Ar erase
-Perform a chip erase and discard all pending writes to EEPROM and flash.
-Note that EEPROM will be preserved if the EESAVE fuse bit is set.
+Perform a chip erase and discard all pending writes to flash, EEPROM and bootrow.
+Note that EEPROM will be preserved if the EESAVE fuse bit is active, ie, had
+a corresponding value at the last reset prior to the operation.
 .It Ar erase memory
 Erase the entire specified memory.
 .It Ar erase memory addr len
diff --git a/src/doc/avrdude.texi b/src/doc/avrdude.texi
index c084ad61c..40746ba45 100644
--- a/src/doc/avrdude.texi
+++ b/src/doc/avrdude.texi
@@ -2509,8 +2509,9 @@ comma separated list of memories just as in the @code{-U} command line
 argument. @code{verify} flushes the cache before verifying memories.
 
 @item erase
-Perform a chip erase and discard all pending writes to EEPROM and flash.
-Note that EEPROM will be preserved if the EESAVE fuse bit is set.
+Perform a chip erase and discard all pending writes to flash, EEPROM and bootrow.
+Note that EEPROM will be preserved if the EESAVE fuse bit is active, ie, had
+a corresponding value at the last reset prior to the operation.
 
 @item erase @var{memory}
 Erase the entire specified memory.
diff --git a/src/term.c b/src/term.c
index d7057a50f..07ade813d 100644
--- a/src/term.c
+++ b/src/term.c
@@ -964,8 +964,9 @@ static int cmd_erase(const PROGRAMMER *pgm, const AVRPART *p, int argc, const ch
     return cmd_write(pgm, p, 6, args);
   }
 
-  term_out("%s chip erase ...\n", (pgm->prog_modes & PM_SPM)?
-    "asking bootloader to perform": "performing");
+  term_out("%s chip erase; discarded pending writes to flash%s\n",
+    (pgm->prog_modes & PM_SPM)? "asking bootloader to perform": "performing",
+    avr_locate_bootrow(p)? ", EEPROM and bootrow": avr_locate_eeprom(p)? "and EEPROM": "");
 
   // Erase chip and clear cache
   int rc = pgm->chip_erase_cached(pgm, p);