diff --git a/AUTHORS b/AUTHORS
index 4336cd7..1d123fc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,5 +18,6 @@ Werner Almesberger <werner@openmoko.org>
   modules/mmcx-f-edge.fpd
   modules/qfn.fpd
   modules/qfp.fpd
+  modules/sot-323.fpd
   moduled/usb_a_plug_smt.fpd
   modules/xtal-4.fpd
diff --git a/BOOKSHELF b/BOOKSHELF
index f649d28..461e526 100644
--- a/BOOKSHELF
+++ b/BOOKSHELF
@@ -101,3 +101,8 @@ D: http://www.molex.com/pdm_docs/sd/734150961_sd.pdf
 # USB A plug for SMT (Molex 0480371000)
 N: usb_a_plug_smt
 D: http://www.molex.com/pdm_docs/sd/480371000_sd.pdf
+
+# MMST3904: NPN small signal transistor in a SOT-323 package
+N: mmst3904
+A: npn
+D: http://61.222.192.61/mccsemi/up_pdf/MMST3904(SOT-323).PDF
diff --git a/modules/INFO b/modules/INFO
index 769ebee..186ab30 100644
--- a/modules/INFO
+++ b/modules/INFO
@@ -67,3 +67,7 @@ N: 73415-0961
 
 # USB A plug for SMT
 F: usb_a_plug_smt
+
+# SOT-323 package with counter-clockweise or clockwise pin assignment
+F: sot-323
+N: mmst3904
diff --git a/modules/Makefile b/modules/Makefile
index 2c693dd..2d7d3a8 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -1,4 +1,5 @@
-MODULES=0805-6 meander mini-usb mmcx-f-edge qfn qfp usb_a_plug_smt xtal-4
+MODULES=0805-6 meander mini-usb mmcx-f-edge qfn qfp sot-323 \
+	usb_a_plug_smt xtal-4
 
 .SUFFIXES:	.fpd .mod
 .PHONY:		all clean
diff --git a/modules/sot-323.fpd b/modules/sot-323.fpd
new file mode 100644
index 0000000..e0fa037
--- /dev/null
+++ b/modules/sot-323.fpd
@@ -0,0 +1,70 @@
+/* MACHINE-GENERATED ! */
+
+frame pad {
+	__0: vec @(w/2, h/2)
+	__1: vec @(-w/2, -h/2)
+	pad "$n" . __0
+}
+
+frame pads {
+	table
+	    { n, x, y }
+	    { 1, -e*ccw, -f/2 }
+	    { 2, e*ccw, -f/2 }
+	    { 3, 0mm, f/2 }
+
+	__0: vec @(x, y)
+	frame pad .
+}
+
+frame outline {
+	set lw = 5mil
+
+	set clear = lw/2+0.1mm
+
+	set s = (A-w)/2-clear
+
+	set m2 = e-w/2-clear
+
+	__0: vec @(A/2, B/2)
+	__2: vec @(-A/2, B/2)
+	__3: vec .(0mm, -B)
+	line __2 . lw
+	__1: vec __0(0mm, -B)
+	line . __0 lw
+	__4: vec __2(s, 0mm)
+	line __2 . lw
+	__5: vec __0(-s, 0mm)
+	line . __0 lw
+	__6: vec @(0mm, -B/2)
+	__7: vec .(m2, 0mm)
+	__8: vec __6(-m2, 0mm)
+	line . __7 lw
+}
+
+package "SOT-323$suffix"
+unit mm
+
+table
+    { A, B }
+    { 2.2mm, 1.35mm }
+
+set e = 0.65mm
+
+table
+    { f, h, w }
+    { 1.9mm, 0.9mm, 0.7mm }
+
+table
+    { suffix, ccw }
+    { "", 1 }
+    { "-CW", -1 }
+
+frame outline @
+frame pads @
+measx outline.__2 >> outline.__0 1.5mm
+measy outline.__3 >> outline.__2 0.5mm
+measx pads.__0 -> pads.__0 1.7mm+f/2
+measy pads.__0 >> pads.__0 1.5mm
+measy pad.__1 -> pad.__0 0.5mm
+measx pad.__1 -> pad.__0 -0.5mm