diff --git a/ChangeLog b/ChangeLog
index 6beec6f8..b7fc77dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-19  Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* avrdude.1:
+	* doc/avrdude.texi: Document that the JTAG ICE mkII code currently
+	cannot write to flash one byte at a time.  Also mention the bug
+	tracker interface on savannah.
+
 2005/05/14  Brian S. Dean  <bsd@bsdhome.com>
 
 	* configure.ac:
diff --git a/avrdude.1 b/avrdude.1
index 3e6d4bdb..d92716ae 100644
--- a/avrdude.1
+++ b/avrdude.1
@@ -543,4 +543,10 @@ This man page by
 .ie t J\(:org Wunsch.
 .el Joerg Wunsch.
 .Sh BUGS
-Please report bugs to avrdude-dev@nongnu.org.
+Please report bugs via
+.Dl "http://savannah.nongnu.org/bugs/?group=avrdude" .
+.Pp
+The JTAGICE mkII programmer currently cannot write to the flash ROM
+one byte at a time.
+For that reason, updating the flash ROM from terminal mode does not
+work.
diff --git a/doc/avrdude.texi b/doc/avrdude.texi
index ee739fc0..afd61ab6 100644
--- a/doc/avrdude.texi
+++ b/doc/avrdude.texi
@@ -1608,6 +1608,11 @@ line driven and for writing the batch files.
 @node Troubleshooting, ,Platform Dependent Information ,Top
 @appendix Troubleshooting
 
+@noindent
+In general, please report any bugs encountered via
+@url{http://savannah.nongnu.org/bugs/?group=avrdude}.
+
+
 @itemize @bullet
 
 @item
@@ -1656,6 +1661,12 @@ response to a number of occasions when an AVR had stopped responding because the
 by an error caused by the programmer. Programmer of course meaning both the physical device, and the
 person sitting at the keyboard.
 
+@item
+Problem: Updating the flash ROM from terminal mode does not work with the
+JTAG ICE mkII.
+
+Solution: None at this time.  Currently, the JTAG ICE mkII code cannot
+write to the flash ROM one byte at a time.