diff --git a/ChangeLog b/ChangeLog
index b2f9e3db..465b773c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-12  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	bug #40782: Verify errors for object size > 16 k on x32e5 due
+	to typo in avrdude.conf
+	* avrdude.conf.in (ATmega8E5, ATmega32E5): fix boot location
+
 2014-02-28  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* avrdude.conf.in (atmelice, atmelice_pdi, atmelice_dw, atmelice_isp):
diff --git a/NEWS b/NEWS
index 446b8321..614e6318 100644
--- a/NEWS
+++ b/NEWS
@@ -21,8 +21,11 @@ Current:
   * Bugfixes
     - bug #40055: AVRDUDE segfaults when writing eeprom
     - bug #40085: Typo fix in fuses report (for 6.1-svn-20130917)
+    - bug #40782: Verify errors for object size > 16 k on x32e5 due
+      to typo in avrdude.conf
     - bug #40817: Elf file support (possibly) not working on 6.0.1 windows build
-    - bug #40897: AT Mega2560 not correctly programmed with stk500(v1) ISP (solution patch)
+    - bug #40897: AT Mega2560 not correctly programmed with stk500(v1)
+      ISP (solution patch)
     - bug #41357: OS X: Avrdude messes with the usb stack?
     - bug #41402: dfu.c missing include <stdint.h>
     - patch #7896: DFU FLIPv2 programming support
diff --git a/avrdude.conf.in b/avrdude.conf.in
index aa9fda80..ffe3d45b 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -14233,7 +14233,7 @@ part parent ".xmega"
 
     memory "boot"
         size		= 0x800;
-        offset		= 0x00804000;
+        offset		= 0x00802000;
         page_size	= 0x80;
         readsize	= 0x100;
     ;
@@ -14337,7 +14337,7 @@ part parent ".xmega"
 
     memory "boot"
         size		= 0x1000;
-        offset		= 0x00804000;
+        offset		= 0x00808000;
         page_size	= 0x80;
         readsize	= 0x100;
     ;