diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index 64139d30..393b0c2a 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -5923,6 +5923,15 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# ATmega169A
+#------------------------------------------------------------
+
+part parent "m169"
+    id               = "m169a";
+    desc             = "ATmega169A";
+  ;
+
 #------------------------------------------------------------
 # ATmega169P
 #------------------------------------------------------------
@@ -5931,8 +5940,16 @@ part parent "m169"
     id               = "m169p";
     desc             = "ATmega169P";
     signature        = 0x1E 0x94 0x05;
+  ;
 
-    ocdrev              = 3;
+#------------------------------------------------------------
+# ATmega169PA
+#------------------------------------------------------------
+
+part parent "m169"
+    id               = "m169pa";
+    desc             = "ATmega169PA";
+    signature        = 0x1E 0x94 0x05;
   ;
 
 #------------------------------------------------------------
@@ -6120,45 +6137,73 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# ATmega329A
+#------------------------------------------------------------
+
+part parent "m329"
+    id               = "m329a";
+    desc             = "ATmega329a";
+  ;
+
 #------------------------------------------------------------
 # ATmega329P
 #------------------------------------------------------------
-# Identical to ATmega329 except of the signature
 
 part parent "m329"
     id               = "m329p";
     desc             = "ATmega329P";
     signature        = 0x1e 0x95 0x0b;
+  ;
 
-    ocdrev              = 3;
+#------------------------------------------------------------
+# ATmega329PA
+#------------------------------------------------------------
+
+part parent "m329"
+    id               = "m329pa";
+    desc             = "ATmega329PA";
+    signature        = 0x1e 0x95 0x0b;
   ;
 
 #------------------------------------------------------------
 # ATmega3290
 #------------------------------------------------------------
 
-# identical to ATmega329
-
 part parent "m329"
     id               = "m3290";
     desc             = "ATmega3290";
     signature        = 0x1e 0x95 0x04;
+  ;
 
-    ocdrev              = 3;
+#------------------------------------------------------------
+# ATmega3290A
+#------------------------------------------------------------
+
+part parent "m329"
+    id               = "m3290a";
+    desc             = "ATmega3290A";
+    signature        = 0x1e 0x95 0x04;
   ;
 
 #------------------------------------------------------------
 # ATmega3290P
 #------------------------------------------------------------
 
-# identical to ATmega3290 except of the signature
-
-part parent "m3290"
+part parent "m329"
     id               = "m3290p";
     desc             = "ATmega3290P";
     signature        = 0x1e 0x95 0x0c;
+  ;
 
-    ocdrev              = 3;
+#------------------------------------------------------------
+# ATmega3290PA
+#------------------------------------------------------------
+
+part parent "m329"
+    id               = "m3290pa";
+    desc             = "ATmega3290PA";
+    signature        = 0x1e 0x95 0x0c;
   ;
 
 #------------------------------------------------------------
@@ -6347,31 +6392,52 @@ part
   ;
 
 #------------------------------------------------------------
-# ATmega6490
+# ATmega649A
 #------------------------------------------------------------
 
-# identical to ATmega649
+part parent "m649"
+    id               = "m649a";
+    desc             = "ATmega649A";
+  ;
+
+#------------------------------------------------------------
+# ATmega649P
+#------------------------------------------------------------
+
+part parent "m649"
+    id               = "m649p";
+    desc             = "ATmega649P";
+    signature        = 0x1e 0x96 0x0b;
+  ;
+
+#------------------------------------------------------------
+# ATmega6490
+#------------------------------------------------------------
 
 part parent "m649"
     id               = "m6490";
     desc             = "ATmega6490";
     signature        = 0x1e 0x96 0x04;
+  ;
 
-    ocdrev              = 3;
+#------------------------------------------------------------
+# ATmega6490A
+#------------------------------------------------------------
+
+part parent "m649"
+    id               = "m6490a";
+    desc             = "ATmega6490A";
+    signature        = 0x1e 0x96 0x04;
   ;
 
 #------------------------------------------------------------
 # ATmega6490P
 #------------------------------------------------------------
 
-# identical to ATmega6490
-
 part parent "m649"
     id               = "m6490p";
     desc             = "ATmega6490P";
     signature        = 0x1e 0x96 0x0C;
-
-    ocdrev              = 3;
   ;
 
 #------------------------------------------------------------
@@ -14237,12 +14303,12 @@ part
   ;
 
 #------------------------------------------------------------
-# ATmega165A
+# ATmega165
 #------------------------------------------------------------
 
 part
-    id               = "m165a";
-    desc             = "ATmega165A";
+    id               = "m165";
+    desc             = "ATmega165";
     signature        = 0x1e 0x94 0x10;
     has_jtag         = yes;
 #   stk500_devcode   = 0x??;
@@ -14428,18 +14494,33 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# ATmega165A
+#------------------------------------------------------------
+
+part parent "m165"
+    id               = "m165a";
+    desc             = "ATmega165A";
+  ;
+
 #------------------------------------------------------------
 # ATmega165P
 #------------------------------------------------------------
 
-# similar to ATmega165A
-
-part parent "m165a"
+part parent "m165"
     id               = "m165p";
     desc             = "ATmega165P";
     signature        = 0x1e 0x94 0x07;
+  ;
 
-    ocdrev              = 3;
+#------------------------------------------------------------
+# ATmega165PA
+#------------------------------------------------------------
+
+part parent "m165"
+    id               = "m165pa";
+    desc             = "ATmega165PA";
+    signature        = 0x1e 0x94 0x07;
   ;
 
 #------------------------------------------------------------
@@ -14634,17 +14715,32 @@ part
   ;
 
 #------------------------------------------------------------
-# ATmega325P
+# ATmega325A
 #------------------------------------------------------------
 
-# similar to ATmega325
+part parent "m325"
+    id               = "m325a";
+    desc             = "ATmega325A";
+  ;
+
+#------------------------------------------------------------
+# ATmega325P
+#------------------------------------------------------------
 
 part parent "m325"
     id               = "m325p";
     desc             = "ATmega325P";
     signature        = 0x1e 0x95 0x0d;
+  ;
 
-    ocdrev              = 3;
+#------------------------------------------------------------
+# ATmega325PA
+#------------------------------------------------------------
+
+part parent "m325"
+    id               = "m325pa";
+    desc             = "ATmega325PA";
+    signature        = 0x1e 0x95 0x0d;
   ;
 
 #------------------------------------------------------------
@@ -14839,17 +14935,22 @@ part
   ;
 
 #------------------------------------------------------------
-# ATmega645P
+# ATmega645A
 #------------------------------------------------------------
 
-# similar to ATmega645
+part parent "m645"
+    id               = "m645a";
+    desc             = "ATmega645A";
+  ;
+
+#------------------------------------------------------------
+# ATmega645P
+#------------------------------------------------------------
 
 part parent "m645"
     id               = "m645p";
     desc             = "ATmega645P";
     signature        = 0x1e 0x96 0x0d;
-
-    ocdrev              = 3;
   ;
 
 #------------------------------------------------------------
@@ -14860,8 +14961,16 @@ part parent "m325"
     id               = "m3250";
     desc             = "ATmega3250";
     signature        = 0x1E 0x95 0x06;
+  ;
 
-    ocdrev              = 3;
+#------------------------------------------------------------
+# ATmega3250A
+#------------------------------------------------------------
+
+part parent "m325"
+    id               = "m3250a";
+    desc             = "ATmega3250A";
+    signature        = 0x1E 0x95 0x06;
   ;
 
 #------------------------------------------------------------
@@ -14872,8 +14981,16 @@ part parent "m325"
     id               = "m3250p";
     desc             = "ATmega3250P";
     signature        = 0x1E 0x95 0x0e;
+  ;
 
-    ocdrev              = 3;
+#------------------------------------------------------------
+# ATmega3250PA
+#------------------------------------------------------------
+
+part parent "m325"
+    id               = "m3250pa";
+    desc             = "ATmega3250PA";
+    signature        = 0x1E 0x95 0x0e;
   ;
 
 #------------------------------------------------------------
@@ -14884,8 +15001,16 @@ part parent "m645"
     id               = "m6450";
     desc             = "ATmega6450";
     signature        = 0x1E 0x96 0x06;
+  ;
 
-    ocdrev              = 3;
+#------------------------------------------------------------
+# ATmega6450A
+#------------------------------------------------------------
+
+part parent "m645"
+    id               = "m6450a";
+    desc             = "ATmega6450A";
+    signature        = 0x1E 0x96 0x06;
   ;
 
 #------------------------------------------------------------
@@ -14896,8 +15021,6 @@ part parent "m645"
     id               = "m6450p";
     desc             = "ATmega6450P";
     signature        = 0x1E 0x96 0x0e;
-
-    ocdrev              = 3;
   ;
 
 #------------------------------------------------------------