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..c621438b 100644
--- a/library/conn.lib
+++ b/library/conn.lib
@@ -7044,6 +7044,62 @@ 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" -100 650 50 H V R CNN
+F1 "CONN_ARM_JTAG_SWD_20" -100 550 50 H V R BNN
+F2 "Connectors:IDC_Header_Straight_20pins" 450 -650 50 H I L TNN
+F3 "" -250 -1050 50 V I C CNN
+$FPLIST
+ IDC*
+ Pin_Header*Pitch2.54mm*
+$ENDFPLIST
+DRAW
+S -600 -190 -560 -210 0 1 0 N
+S -600 -90 -560 -110 0 1 0 N
+S -600 10 -560 -10 0 1 0 N
+S -600 110 -560 90 0 1 0 N
+S -600 500 600 -600 0 1 10 f
+S -410 -600 -390 -560 0 1 0 N
+S -310 -600 -290 -560 0 1 0 N
+S -210 -600 -190 -560 0 1 0 N
+S -110 -600 -90 -560 0 1 0 N
+S -10 -600 10 -560 0 1 0 N
+S -10 500 10 460 0 1 0 N
+S 90 -600 110 -560 0 1 0 N
+S 90 500 110 460 0 1 0 N
+S 190 -600 210 -560 0 1 0 N
+S 290 -600 310 -560 0 1 0 N
+S 390 -600 410 -560 0 1 0 N
+S 600 -190 560 -210 0 1 0 N
+S 600 -90 560 -110 0 1 0 N
+S 600 10 560 -10 0 1 0 N
+S 600 110 560 90 0 1 0 N
+S 600 210 560 190 0 1 0 N
+X VTREF 1 0 600 100 D 50 50 1 1 W
+X VCC/NC 2 100 600 100 D 50 50 1 1 W
+X ~TRST~ 3 700 200 100 L 50 50 1 1 O
+X GND 4 -400 -700 100 U 50 50 1 1 W
+X TDI 5 700 100 100 L 50 50 1 1 O
+X GND 6 -300 -700 100 U 50 50 1 1 W
+X TMS/SWDIO 7 700 0 100 L 50 50 1 1 O
+X GND 8 -200 -700 100 U 50 50 1 1 W
+X TCK/SWDCLK 9 700 -100 100 L 50 50 1 1 O
+X GND 10 -100 -700 100 U 50 50 1 1 W
+X GND 20 400 -700 100 U 50 50 1 1 W
+X RTCK 11 -700 100 100 R 50 50 1 1 I
+X GND 12 0 -700 100 U 50 50 1 1 W
+X TDO/SWO 13 -700 0 100 R 50 50 1 1 I
+X GND 14 100 -700 100 U 50 50 1 1 W
+X ~SRST~ 15 -700 -100 100 R 50 50 1 1 B
+X GND 16 200 -700 100 U 50 50 1 1 W
+X DBGRQ/NC 17 700 -200 100 L 50 50 1 1 O
+X GND 18 300 -700 100 U 50 50 1 1 W
+X DBGACK/NC 19 -700 -200 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # CONN_COAXIAL
 #
 DEF CONN_COAXIAL J 0 40 Y N 1 F N