diff --git a/AUTHORS b/AUTHORS
index 335b16d..25418e6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -85,6 +85,7 @@ Werner Almesberger <werner@almesberger.net>
   components/inductor.lib (based on filter.lib by Adam Wang)
   components/kl25-48.lib
   components/er-oled-fpc30.lib
+  components/tswa.lib
   modules/pads.fpd
   modules/stdpass.fpd
   modules/8_10-card.fpd
@@ -103,10 +104,10 @@ Werner Almesberger <werner@almesberger.net>
   modules/inductor-2p.fpd
   modules/er-oled-fpc30.fpd
   modules/memcard8-amp-10100660.fpd
+  modules/tswa.fpd
 
 Xiangfu  <xiangfu@openmobilefree.net>
  
   components/c.lib
   components/led.lib
   components/r.lib
-
diff --git a/components/HIERARCHY b/components/HIERARCHY
index f34d6ab..b8a0812 100644
--- a/components/HIERARCHY
+++ b/components/HIERARCHY
@@ -146,6 +146,7 @@ Electromechanical
 		FSMRA2JH
 		SW_PUSH
 		EVQQ7
+		TSWA
 	Case
 		MH
 Sensor
diff --git a/components/components.pro b/components/components.pro
index ebfaf88..b3d93f6 100644
--- a/components/components.pro
+++ b/components/components.pro
@@ -150,3 +150,4 @@ LibName78=./memcard8
 LibName79=./inductor
 LibName80=./kl25-48
 LibName81=./er-oled-fpc30
+LibName82=./tswa
diff --git a/components/tswa.lib b/components/tswa.lib
new file mode 100644
index 0000000..5ae0803
--- /dev/null
+++ b/components/tswa.lib
@@ -0,0 +1,29 @@
+EESchema-LIBRARY Version 2.3  Date: Sun Sep 15 15:56:00 2013
+#encoding utf-8
+#
+# TSWA
+#
+DEF TSWA SW 0 40 Y N 1 F N
+F0 "SW" -50 300 60 H V C CNN
+F1 "TSWA" 0 -250 60 H V C CNN
+F2 "~" 0 0 60 H V C CNN
+F3 "~" 0 0 60 H V C CNN
+DRAW
+S -150 250 150 -200 0 1 0 N
+P 2 0 1 0  -100 -150  -150 -150 N
+P 2 0 1 0  -100 0  -150 0 N
+P 2 0 1 0  -100 150  -150 150 N
+P 2 0 1 0  50 -150  -100 -100 N
+P 2 0 1 0  50 -150  100 -150 N
+P 2 0 1 0  50 0  -100 50 N
+P 2 0 1 0  50 0  100 0 N
+P 2 0 1 0  50 150  -100 200 N
+P 4 0 1 0  50 150  100 150  100 -150  150 -150 N
+X A A -450 0 300 R 50 50 1 1 P
+X B B -450 -150 300 R 50 50 1 1 P
+X NO NO -450 150 300 R 50 50 1 1 P
+X COM COM 450 -150 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/modules/HIERARCHY b/modules/HIERARCHY
index 2a60ca8..ca7599c 100644
--- a/modules/HIERARCHY
+++ b/modules/HIERARCHY
@@ -400,3 +400,4 @@ Mechanical
 		TACTIL-SW-SPST-RA-13.26mm-15.85mm
 		E-SWITCH_320
 		EVQQ7
+		TSWA-22mm
diff --git a/modules/Makefile b/modules/Makefile
index 759ef71..d029a97 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -12,7 +12,7 @@ MODULES=8_10-card 8_10-socket-ra 8_10-socket-ra-push-pull \
 	qfn qfp \
 	rca-3-ra rj45 \
 	soic sot23 spacer sot sot-323 ssop stdpass \
-	tactile-sw-spst-ra-dip to tsop tssop5 \
+	tactile-sw-spst-ra-dip to tsop tssop5 tswa \
 	usb-a-dual-recept-r usb-a-pcb usb_a_plug_smt \
 	xlr-plug xlr-socket \
  	xtal-2 xtal-4 \
diff --git a/modules/tswa.fpd b/modules/tswa.fpd
new file mode 100644
index 0000000..914eaba
--- /dev/null
+++ b/modules/tswa.fpd
@@ -0,0 +1,56 @@
+/* MACHINE-GENERATED ! */
+
+frame holes {
+	set xi = 9mm
+
+	set d = 1.6mm
+
+	loop i = 0, 1
+
+	__0: vec @(xi*(i-0.5), 0mm)
+	__1: vec .(d/2, d/2)
+	__2: vec __0(-d/2, -d/2)
+	hole . __1
+}
+
+frame pins {
+	table
+	    { pin, x, y }
+	    { "NO", 0mm, y2-y1 }
+	    { "A", -xo/2, 0mm }
+	    { "B", 0mm, -y1 }
+	    { "COM", xo/2, 0mm }
+
+	table
+	    { xo, y1, y2 }
+	    { 18.52mm, xo/2, 10.83mm }
+
+	set d = 1.3mm
+
+	__0: vec @(x, y)
+	__1: vec .(d/2, d/2)
+	__2: vec __0(-d/2, -d/2)
+	rpad "$pin" . __1
+}
+
+frame outline {
+	set w = 5mil
+
+	__0: vec @(0mm, d/2)
+	circ @ . w
+}
+
+package "TSWA-${d}"
+unit mm
+
+set d = 22mm
+
+frame pins @
+frame outline @
+frame holes @
+measx pins.__0 >> pins.__0 5mm
+measx holes.__0 >> holes.__0 4mm
+measx holes.__2 -> holes.__1 -1mm
+measx pins.__2 -> pins.__1 -1mm
+measy pins.__0 >> pins.__0 14mm
+measy pins.__0 >> holes.__0 13mm