diff --git a/library/atmel.dcm b/library/atmel.dcm
index 7da9ec16..b26371dc 100644
--- a/library/atmel.dcm
+++ b/library/atmel.dcm
@@ -2658,8 +2658,8 @@ K IDC10 Male Connector
 $ENDCMP
 #
 $CMP AVR-ISP-6
-D Standard IDC6 Male Connector, ATMEL ISP 6pin
-K IDC6 Male Connector
+D Atmel 6-pin ISP connector
+K AVR ISP Connector
 $ENDCMP
 #
 $CMP AVR-JTAG-10
diff --git a/library/atmel.lib b/library/atmel.lib
index e7f6962b..63f393c8 100644
--- a/library/atmel.lib
+++ b/library/atmel.lib
@@ -10652,28 +10652,28 @@ ENDDEF
 # AVR-ISP-6
 #
 DEF AVR-ISP-6 CON 0 40 Y Y 1 F N
-F0 "CON" -105 240 50 H V C CNN
-F1 "AVR-ISP-6" -265 -230 50 H V L BNN
-F2 "AVR-ISP-6" -520 40 50 V I C CNN
-F3 "" -25 0 50 H I C CNN
+F0 "CON" 0 400 50 H V L CNN
+F1 "AVR-ISP-6" 0 -300 50 H V L CNN
+F2 "" -250 50 50 V I C CNN
+F3 "" -1275 -550 50 H I C CNN
+$FPLIST
+ IDC?Header*2x03*
+ Pin?Header*2x03*
+$ENDFPLIST
 DRAW
-T 0 -315 5 45 0 0 0 SCK Normal 1 C C
-T 0 275 110 45 0 0 0 VCC Normal 1 C C
-T 0 285 -105 45 0 1 0 GND Normal 1 C C
-T 0 -333 102 45 0 1 0 MISO Normal 1 C C
-T 0 307 -2 45 0 1 0 MOSI Normal 1 C C
-T 0 -315 -100 45 0 1 0 RST Normal 1 C C
-S -205 -140 165 -160 0 1 0 F
-S -205 200 155 180 0 1 0 F
-S -200 -160 -220 -40 0 1 0 F
-S -200 200 -220 40 0 1 0 F
-S 155 200 175 -160 0 1 0 F
-X ~ 1 -150 100 100 R 40 40 1 1 P
-X ~ 2 100 100 100 L 40 40 1 1 P
-X ~ 3 -150 0 100 R 40 40 1 1 P
-X ~ 4 100 0 100 L 40 40 1 1 P
-X ~ 5 -150 -100 100 R 40 40 1 1 P
-X ~ 6 100 -100 100 L 40 40 1 1 P
+S -105 -220 -95 -250 0 1 0 N
+S -105 350 -95 320 0 1 0 N
+S 250 -95 220 -105 0 1 0 N
+S 250 5 220 -5 0 1 0 N
+S 250 105 220 95 0 1 0 N
+S 250 205 220 195 0 1 0 N
+S 250 350 -200 -250 0 1 10 f
+X MISO 1 400 200 150 L 50 50 1 1 P
+X VCC 2 -100 500 150 D 50 50 1 1 P
+X SCK 3 400 0 150 L 50 50 1 1 P
+X MOSI 4 400 100 150 L 50 50 1 1 P
+X RST 5 400 -100 150 L 50 50 1 1 P
+X GND 6 -100 -400 150 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #