diff --git a/ChangeLog b/ChangeLog
index 69970a7c..ea8053c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2014-01-22  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	Contributed by Alan Horstmann:
-	Fix handling of devices > 128 KiB in stk500v1 protocol
+	bug #40897: AT Mega2560 not correctly programmed with stk500(v1) ISP (solution patch)
 	* stk500.c: Implement extended address byte handling.
 	* avrdude.conf.in (ATmega2560): enable stk500_devcode so
 	STK500v1 protocol actually starts at all.
diff --git a/NEWS b/NEWS
index 751fc1f4..46b8fb6c 100644
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,7 @@ Current:
     - bug #40055: AVRDUDE segfaults when writing eeprom
     - bug #40085: Typo fix in fuses report (for 6.1-svn-20130917)
     - bug #40817: Elf file support (possibly) not working on 6.0.1 windows build
-    - [no-id]:    Fix handling of devices > 128 KiB in stk500v1 protocol
+    - bug #40897: AT Mega2560 not correctly programmed with stk500(v1) ISP (solution patch)
     - patch #7896: DFU FLIPv2 programming support
     - patch #XXXX: xxx