diff --git a/Device.dcm b/Device.dcm
index 2823e99329..3f369fb75f 100644
--- a/Device.dcm
+++ b/Device.dcm
@@ -240,6 +240,12 @@ K AC diode DIAC
 F ~
 $ENDCMP
 #
+$CMP D_AAK
+D Diode, anode on pins 1 and 2
+K diode
+F ~
+$ENDCMP
+#
 $CMP D_ALT
 D Diode, filled shape
 K diode
@@ -288,6 +294,24 @@ K capacitance diode varicap varactor
 F ~
 $ENDCMP
 #
+$CMP D_KAA
+D Diode, anode on pins 2 and 3
+K diode
+F ~
+$ENDCMP
+#
+$CMP D_KAK
+D Diode, cathode on pins 1 and 3
+K diode
+F ~
+$ENDCMP
+#
+$CMP D_KKA
+D Diode, cathode on pins 1 and 2
+K diode
+F ~
+$ENDCMP
+#
 $CMP D_Photo
 D Photodiode
 K photodiode diode opto
diff --git a/Device.lib b/Device.lib
index 3f714318cb..da1cd1b01c 100644
--- a/Device.lib
+++ b/Device.lib
@@ -859,6 +859,30 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# D_AAK
+#
+DEF D_AAK D 0 0 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_AAK" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+C 100 0 10 0 1 0 F
+P 2 0 1 8 -50 50 -50 -50 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 0 150 100 100 100 100 0 -50 0 N
+X A 1 200 100 100 L 50 50 1 1 P
+X A 2 200 0 100 L 50 50 1 1 P
+X K 3 -150 0 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # D_ALT
 #
 DEF D_ALT D 0 40 N N 1 F N
@@ -1093,6 +1117,78 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# D_KAA
+#
+DEF D_KAA D 0 0 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_KAA" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+C 100 0 10 0 1 0 F
+P 2 0 1 8 -50 50 -50 -50 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 0 150 100 100 100 100 0 -50 0 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 200 100 100 L 50 50 1 1 I
+X A 3 200 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_KAK
+#
+DEF D_KAK D 0 0 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_KAK" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+C -150 0 10 0 1 0 F
+P 2 0 1 8 -50 50 -50 -50 N
+P 3 0 1 0 -150 100 -150 0 100 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+X K 1 -250 100 100 R 50 50 1 1 P
+X A 2 200 0 100 L 50 50 1 1 P
+X K 3 -250 0 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_KKA
+#
+DEF D_KKA D 0 0 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_KKA" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+C -150 0 10 0 1 0 F
+P 2 0 1 8 -50 50 -50 -50 N
+P 4 0 1 0 -200 100 -150 100 -150 0 100 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+X K 1 -250 100 100 R 50 50 1 1 I
+X K 2 -250 0 100 R 50 50 1 1 P
+X A 3 200 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # D_Photo
 #
 DEF D_Photo D 0 20 N N 1 F N
@@ -1227,7 +1323,7 @@ C 100 0 10 0 1 0 F
 P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 0 150 100 100 100 100 0 -50 0 N
 P 6 0 1 8 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X A 1 200 100 100 L 50 50 1 1 I
+X A 1 200 100 100 L 50 50 1 1 P
 X A 2 200 0 100 L 50 50 1 1 P
 X K 3 -150 0 100 R 50 50 1 1 P
 ENDDRAW
@@ -1310,6 +1406,12 @@ F0 "D" 0 100 50 H V C CNN
 F1 "D_Schottky_KAA" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
 C 100 0 10 0 1 0 F
 P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
@@ -1328,12 +1430,18 @@ F0 "D" 0 100 50 H V C CNN
 F1 "D_Schottky_KAK" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
 C -150 0 10 0 1 0 F
-P 4 0 1 0 -200 100 -150 100 -150 0 100 0 N
+P 3 0 1 0 -150 100 -150 0 100 0 N
 P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
 P 6 0 1 8 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X K 1 -250 100 100 R 50 50 1 1 I
+X K 1 -250 100 100 R 50 50 1 1 P
 X A 2 200 0 100 L 50 50 1 1 P
 X K 3 -250 0 100 R 50 50 1 1 P
 ENDDRAW
@@ -1346,6 +1454,12 @@ F0 "D" 0 100 50 H V C CNN
 F1 "D_Schottky_KKA" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
 C -150 0 10 0 1 0 F
 P 4 0 1 0 -200 100 -150 100 -150 0 100 0 N