diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index 0e61c8c2..1939161b 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -1,3 +1,10 @@
+2013-09-15  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	Submitted by Joakim Lubeck:
+	bug #40033: Support for the XMegaE5 family
+	* avrdude.conf.in (ATxmega8E6, ATxmega16E5, ATxmega32E5): New
+	entries.
+
 2013-09-13  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* stk500v2.c (stk500v2_set_sck_period): Revamp this to match the
diff --git a/avrdude/NEWS b/avrdude/NEWS
index 21587955..be6e15dd 100644
--- a/avrdude/NEWS
+++ b/avrdude/NEWS
@@ -23,6 +23,7 @@ Current:
       ATxmega64B3, ATxmega64C3, ATxmega64D3
     - ATtiny43U
     - ATmega406
+    - ATxmega8E6, ATxmega16E5, ATxmega32E5
 
 
   * New programmers supported:
diff --git a/avrdude/avrdude.conf.in b/avrdude/avrdude.conf.in
index 6a2750dc..4b5986b4 100644
--- a/avrdude/avrdude.conf.in
+++ b/avrdude/avrdude.conf.in
@@ -13790,6 +13790,162 @@ part parent "x384c3"
     signature	= 0x1e 0x98 0x47;
 ;
 
+#------------------------------------------------------------
+# ATxmega8E5
+#------------------------------------------------------------
+
+part parent ".xmega"
+    id		= "x8e5";
+    desc	= "ATxmega8E5";
+    signature	= 0x1e 0x93 0x41;
+
+    memory "eeprom"
+        size		= 0x0200;
+        offset		= 0x08c0000;
+        page_size	= 0x20;
+        readsize	= 0x100;
+    ;
+
+    memory "application"
+        size		= 0x2000;
+        offset		= 0x0800000;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "apptable"
+        size		= 0x800;
+        offset		= 0x00801800;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "boot"
+        size		= 0x800;
+        offset		= 0x00804000;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "flash"
+        size		= 0x2800;
+        offset		= 0x0800000;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "usersig"
+        size            = 0x80;
+        offset          = 0x8e0400;
+        page_size       = 0x80;
+        readsize	= 0x100;
+    ;
+;
+
+#------------------------------------------------------------
+# ATxmega16E5
+#------------------------------------------------------------
+
+part parent ".xmega"
+    id		= "x16e5";
+    desc	= "ATxmega16E5";
+    signature	= 0x1e 0x94 0x45;
+
+    memory "eeprom"
+        size		= 0x0200;
+        offset		= 0x08c0000;
+        page_size	= 0x20;
+        readsize	= 0x100;
+    ;
+
+    memory "application"
+        size		= 0x4000;
+        offset		= 0x0800000;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "apptable"
+        size		= 0x1000;
+        offset		= 0x00803000;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "boot"
+        size		= 0x1000;
+        offset		= 0x00804000;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "flash"
+        size		= 0x5000;
+        offset		= 0x0800000;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "usersig"
+        size            = 0x80;
+        offset          = 0x8e0400;
+        page_size       = 0x80;
+        readsize	= 0x100;
+    ;
+;
+
+#------------------------------------------------------------
+# ATxmega32E5
+#------------------------------------------------------------
+
+part parent ".xmega"
+    id		= "x32e5";
+    desc	= "ATxmega32E5";
+    signature	= 0x1e 0x95 0x4c;
+
+    memory "eeprom"
+        size		= 0x0400;
+        offset		= 0x08c0000;
+        page_size	= 0x20;
+        readsize	= 0x100;
+    ;
+
+    memory "application"
+        size		= 0x8000;
+        offset		= 0x0800000;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "apptable"
+        size		= 0x1000;
+        offset		= 0x00807000;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "boot"
+        size		= 0x1000;
+        offset		= 0x00804000;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "flash"
+        size		= 0x9000;
+        offset		= 0x0800000;
+        page_size	= 0x80;
+        readsize	= 0x100;
+    ;
+
+    memory "usersig"
+        size            = 0x80;
+        offset          = 0x8e0400;
+        page_size       = 0x80;
+        readsize	= 0x100;
+    ;
+;
+
 #------------------------------------------------------------
 # AVR32UC3A0512
 #------------------------------------------------------------