--- /etc/avrdude.conf	2010-03-23 08:05:33.000000000 -0700
+++ /home/matt/avrdude.conf	2010-07-13 20:12:58.470381845 -0700
@@ -9053,65 +9053,65 @@
 
          read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
                            "x x x x  x x x x  x x o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "lfuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
                            "x x x x  x x x x  i i i i  i i i i";
 
          read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "hfuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
                            "x x x x  x x x x  i i i i  i i i i";
 
          read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "efuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+                           "x x x x  x x x x  i i i i  1 i i i";
 
          read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
      ;
 
      memory "calibration"
          size            = 1;
          read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
                            "0  0  0  0   0  0  0  0    o o o o  o o o o";
      ;
   ;
 
 #------------------------------------------------------------
 # AT90PWM3
 #------------------------------------------------------------
 
 # Completely identical to AT90PWM2 (including the signature!)
 
 part
      id            = "pwm3";
      desc          = "AT90PWM3";
      has_debugwire = yes;
      flash_instr   = 0xB6, 0x01, 0x11;
      eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
 	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
 	             0x99, 0xF9, 0xBB, 0xAF;
      stk500_devcode   = 0x65;
 ##  avr910_devcode   = ?;
      signature        = 0x1e 0x93 0x81;
      pagel            = 0xD8;
@@ -9237,65 +9237,65 @@
 
          read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
                            "x x x x  x x x x  x x o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "lfuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
                            "x x x x  x x x x  i i i i  i i i i";
 
          read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "hfuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
                            "x x x x  x x x x  i i i i  i i i i";
 
          read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "efuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+                           "x x x x  x x x x  i i i i  1 i i i";
 
          read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
      ;
 
      memory "calibration"
          size            = 1;
          read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
                            "0  0  0  0   0  0  0  0    o o o o  o o o o";
      ;
   ;
 
 #------------------------------------------------------------
 # AT90PWM2B
 #------------------------------------------------------------
 # Same as AT90PWM2 but different signature.
 
 part
      id            = "pwm2b";
      desc          = "AT90PWM2B";
      has_debugwire = yes;
      flash_instr   = 0xB6, 0x01, 0x11;
      eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
 	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
 	             0x99, 0xF9, 0xBB, 0xAF;
      stk500_devcode   = 0x65;
 ##  avr910_devcode   = ?;
      signature        = 0x1e 0x93 0x83;
      pagel            = 0xD8;
      bs2              = 0xE2;
@@ -9419,65 +9419,65 @@
 
          read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
                            "x x x x  x x x x  x x o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "lfuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
                            "x x x x  x x x x  i i i i  i i i i";
 
          read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "hfuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
                            "x x x x  x x x x  i i i i  i i i i";
 
          read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "efuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+                           "x x x x  x x x x  i i i i  1 i i i";
 
          read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
      ;
 
      memory "calibration"
          size            = 1;
          read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
                            "0  0  0  0   0  0  0  0    o o o o  o o o o";
      ;
   ;
 
 #------------------------------------------------------------
 # AT90PWM3B
 #------------------------------------------------------------
 
 # Completely identical to AT90PWM2B (including the signature!)
 
 part
      id            = "pwm3b";
      desc          = "AT90PWM3B";
      has_debugwire = yes;
      flash_instr   = 0xB6, 0x01, 0x11;
      eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
 	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
 	             0x99, 0xF9, 0xBB, 0xAF;
      stk500_devcode   = 0x65;
 ##  avr910_devcode   = ?;
      signature        = 0x1e 0x93 0x83;
      pagel            = 0xD8;
@@ -9602,65 +9602,65 @@
 
          read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
                            "x x x x  x x x x  x x o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "lfuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
                            "x x x x  x x x x  i i i i  i i i i";
 
          read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "hfuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
                            "x x x x  x x x x  i i i i  i i i i";
 
          read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
        ;
 
      memory "efuse"
          size            = 1;
          write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+                           "x x x x  x x x x  i i i i  1 i i i";
 
          read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
                            "x x x x  x x x x  o o o o  o o o o";
         min_write_delay = 9000;
         max_write_delay = 9000;
      ;
 
      memory "calibration"
          size            = 1;
          read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
                            "0  0  0  0   0  0  0  0    o o o o  o o o o";
      ;
   ;
 
 #------------------------------------------------------------
 # ATtiny25
 #------------------------------------------------------------
 
 part
      id            = "t25";
      desc          = "ATtiny25";
      has_debugwire = yes;
      flash_instr   = 0xB4, 0x02, 0x12;
      eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
 	             0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
 	             0x99, 0xE1, 0xBB, 0xAC;
 ## no STK500 devcode in XML file, use the ATtiny45 one
      stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
      avr910_devcode   = 0x20;
      signature        = 0x1e 0x91 0x08;
