diff --git a/AUTHORS b/AUTHORS
index 5682450..46d2ac4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Werner Almesberger <werner@openmoko.org>
   components/at86rf230.lib
   components/c8051f326.lib
   modules/meander.fpd
+  modules/pads.fpd
   modules/qfn.fpd
   modules/stdpass.fpd
   modules/xtal-4.fpg
diff --git a/modules/INFO b/modules/INFO
index 923a3a2..1eeaa21 100644
--- a/modules/INFO
+++ b/modules/INFO
@@ -41,3 +41,6 @@ N: sot617-3-lp
 # numbering is counter-clockwise)
 F: xtal-4
 N: nx3225sa
+
+# Solder pads and test points
+F: pads
diff --git a/modules/Makefile b/modules/Makefile
index 00806de..b5939d3 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -1,4 +1,4 @@
-MODULES=meander mini-usb stdpass xtal-4
+MODULES=meander mini-usb pads qfn stdpass xtal-4
 
 .SUFFIXES:	.fpd .mod
 .PHONY:		all clean
diff --git a/modules/pads.fpd b/modules/pads.fpd
new file mode 100644
index 0000000..1310218
--- /dev/null
+++ b/modules/pads.fpd
@@ -0,0 +1,18 @@
+/* MACHINE-GENERATED ! */
+
+frame pad {
+	__0: vec @(x/2, y/2)
+	__1: vec @(-x/2, -y/2)
+	rpad "1" . __0
+}
+
+package "PAD_$name"
+unit mm
+
+table
+    { name, x, y }
+    { "2mm", 2mm, 0.5mm }
+    { "60x60", 60mil, 60mil }
+    { "120x60", 120mil, 60mil }
+
+frame pad @
diff --git a/modules/xtal-4.fpd b/modules/xtal-4.fpd
index 216e39a..4941f5c 100644
--- a/modules/xtal-4.fpd
+++ b/modules/xtal-4.fpd
@@ -32,7 +32,7 @@ frame outline {
 	line . __1 w
 }
 
-package "xtal-4-${Dx}x${Dy}"
+package "xtal4-${Dx}x${Dy}"
 unit mm
 
 table