diff --git a/ChangeLog b/ChangeLog
index 21b17292..3ae8e82b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-01  Eric B. Weddington  <eric@ecentral.com>
+
+	*doc/avrdude.texi: Add missing -D option to user manual.
+	[This fixes bug #6804]
+
 2003-11-30  Jan-Hinnerk Reichert  <hinni@despammed.com>
 
 	*avrpart.c,main.c: Moved list_parts() and locate_part()
diff --git a/doc/avrdude.texi b/doc/avrdude.texi
index 7d76f858..bcf938b6 100644
--- a/doc/avrdude.texi
+++ b/doc/avrdude.texi
@@ -347,6 +347,14 @@ specified, AVRDUDE reads the configuration file from
 /usr/local/etc/avrdude.conf (FreeBSD and Linux). See Appendix A for
 the method of searching for the configuration file for Windows.
 
+@item -D
+Disable auto erase for flash.  When the -U option with flash memory is 
+specified, avrdude will perform a chip erase before starting any of the 
+programming operations, since it generally is a mistake to program the flash
+without performing an erase first.  This option disables that.  However, to 
+remain backward compatible, the -i, and -m options automatically disable the 
+auto erase feature.
+
 @item -e
 Causes a chip erase to be executed.  This will reset the contents of the
 flash ROM and EEPROM to the value `0xff', and is basically a