diff --git a/avrdude.conf.sample b/avrdude.conf.sample
index 86492ec4..a4ee1e2d 100644
--- a/avrdude.conf.sample
+++ b/avrdude.conf.sample
@@ -231,6 +231,9 @@ programmer
 # PART DEFINITIONS
 #
 
+#------------------------------------------------------------
+# ATtiny15
+#------------------------------------------------------------
 
 part
     id                  = "t15";
@@ -315,6 +318,9 @@ part
 ;
 
 
+#------------------------------------------------------------
+# AT90s1200
+#------------------------------------------------------------
 
 part
     id               = "1200";
@@ -392,6 +398,9 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# AT90s4414
+#------------------------------------------------------------
 
 part
     id               = "4414";
@@ -449,6 +458,9 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# AT90s2313
+#------------------------------------------------------------
 
 part
     id               = "2313";
@@ -511,6 +523,9 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# AT90s2333
+#------------------------------------------------------------
 
 part
     id               = "2333";
@@ -589,6 +604,9 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# AT90s4433
+#------------------------------------------------------------
 
 part
     id               = "4433";
@@ -667,6 +685,9 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# AT90s4434
+#------------------------------------------------------------
 
 part
     id               = "4434";
@@ -744,6 +765,9 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# AT90s8515
+#------------------------------------------------------------
 
 part
     id               = "8515";
@@ -815,6 +839,9 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# AT90s8535
+#------------------------------------------------------------
 
 part
     id               = "8535";
@@ -872,6 +899,9 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# ATmega103
+#------------------------------------------------------------
 
 part
     id               = "m103";
@@ -962,6 +992,10 @@ part
   ;
 
 
+#------------------------------------------------------------
+# ATmega128
+#------------------------------------------------------------
+
 part
     id               = "m128";
     desc             = "ATMEGA128";
@@ -1074,6 +1108,9 @@ part
       ;
   ;
 
+#------------------------------------------------------------
+# ATmega16
+#------------------------------------------------------------
 
 part
     id               = "m16";
@@ -1174,8 +1211,9 @@ part
 
 
 #------------------------------------------------------------
-# ATMega163
+# ATmega163
 #------------------------------------------------------------
+
 part
     id               = "m163";
     desc             = "ATMEGA163";
@@ -1285,6 +1323,9 @@ part
   ;
 
 
+#------------------------------------------------------------
+# ATmega8
+#------------------------------------------------------------
 
 part
     id               = "m8";