diff --git a/library/conn.dcm b/library/conn.dcm
index ff7fb080..3c9c567c 100644
--- a/library/conn.dcm
+++ b/library/conn.dcm
@@ -480,6 +480,12 @@ D Connector Europe, 60 contacts, ranges A,B,C,D
 K connector
 $ENDCMP
 #
+$CMP CONN_ARM_JTAG_SWD_20
+D Standard IDC20 Male Connector, ARM legacy JTAG and SWD interface
+K IDC20 Male Connector ARM JTAG SWD
+F http://infocenter.arm.com/help/topic/com.arm.doc.dui0499b/DUI0499B_system_design_reference.pdf
+$ENDCMP
+#
 $CMP CONN_COAXIAL
 D coaxial connector (BNC, SMA, SMB, SMC, Cinch/RCA, ...)
 K BNC SMA SMB SMC coaxial connector CINCH RCA
diff --git a/library/conn.lib b/library/conn.lib
index 983c0017..f31374bb 100644
--- a/library/conn.lib
+++ b/library/conn.lib
@@ -7044,6 +7044,54 @@ X 15D D15 -500 -2950 300 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# CONN_ARM_JTAG_SWD_20
+#
+DEF CONN_ARM_JTAG_SWD_20 J 0 40 Y Y 1 F N
+F0 "J" -200 850 50 H V R CNN
+F1 "CONN_ARM_JTAG_SWD_20" -200 750 50 H V R BNN
+F2 "" 450 -1050 50 H I L TNN
+F3 "" -350 -1250 50 V I C CNN
+$FPLIST
+ IDC*Header*Straight*
+ Pin_Header*2x10*Pitch2.54mm*
+$ENDFPLIST
+DRAW
+S -500 700 500 -700 0 1 10 f
+S -110 -700 -90 -660 0 1 0 N
+S -110 700 -90 660 0 1 0 N
+S -10 700 10 660 0 1 0 N
+S 460 90 500 110 0 1 0 N
+S 500 -490 460 -510 0 1 0 N
+S 500 -390 460 -410 0 1 0 N
+S 500 -110 460 -90 0 1 0 N
+S 500 -10 460 10 0 1 0 N
+S 500 190 460 210 0 1 0 N
+S 500 410 460 390 0 1 0 N
+S 500 510 460 490 0 1 0 N
+S 460 -210 500 -190 1 1 0 N
+X VTREF 1 -100 800 100 D 50 50 1 1 W
+X VCC/NC 2 0 800 100 D 50 50 1 1 W
+X ~TRST~ 3 600 500 100 L 50 50 1 1 O
+X GND 4 -100 -800 100 U 50 50 1 1 W
+X TDI 5 600 -200 100 L 50 50 1 1 O
+X GND 6 -100 -800 100 U 50 50 1 1 W N
+X TMS/SWDIO 7 600 0 100 L 50 50 1 1 O
+X GND 8 -100 -800 100 U 50 50 1 1 W N
+X TCK/SWDCLK 9 600 100 100 L 50 50 1 1 O
+X GND 10 -100 -800 100 U 50 50 1 1 W N
+X GND 20 -100 -800 100 U 50 50 1 1 W N
+X RTCK 11 600 200 100 L 50 50 1 1 I
+X GND 12 -100 -800 100 U 50 50 1 1 W N
+X TDO/SWO 13 600 -100 100 L 50 50 1 1 I
+X GND 14 -100 -800 100 U 50 50 1 1 W N
+X ~SRST~ 15 600 400 100 L 50 50 1 1 B
+X GND 16 -100 -800 100 U 50 50 1 1 W N
+X DBGRQ/NC 17 600 -500 100 L 50 50 1 1 O
+X GND 18 -100 -800 100 U 50 50 1 1 W N
+X DBGACK/NC 19 600 -400 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # CONN_COAXIAL
 #
 DEF CONN_COAXIAL J 0 40 Y N 1 F N