diff --git a/ChangeLog b/ChangeLog
index d3d52bc0..97b895af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-09-10  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	Submitted by Matthias Trute:
+	bug #36901 flashing Atmega32U4 EEPROM produces garbage on chip
+	* avrdude.conf.in (ATmega32U4): Fix EEPROM pagesize to 4, the
+	datasheet is wrong here.
+
 2013-09-09  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* configure.ac: check for ar and ranlib in the target tool
diff --git a/NEWS b/NEWS
index 88e1e2e4..7ee78a29 100644
--- a/NEWS
+++ b/NEWS
@@ -93,6 +93,7 @@ Current:
       - bug #38951: AVR109 use byte offset instead of word offset
       - patch #7769: Write flash fails for AVR910 programmers
       - bug #38732: Support for ATtiny1634
+      - bug #36901 flashing Atmega32U4 EEPROM produces garbage on chip
 
   * Keep track of input file contents
 
diff --git a/avrdude.conf.in b/avrdude.conf.in
index 6581c557..0f4921d7 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -10765,7 +10765,7 @@ part
 
     memory "eeprom"
         paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
+        page_size       = 4;  /* for parallel programming */
         size            = 1024;
         min_write_delay = 9000;
         max_write_delay = 9000;
@@ -10792,8 +10792,8 @@ part
 			  "  x   x   x   x      x   x   x   x";
 
 	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
+	delay		= 20;
+	blocksize	= 4;
 	readsize	= 256;
       ;