diff --git a/modules/qfn.fpd b/modules/qfn.fpd
index 38269ac..19d24dc 100644
--- a/modules/qfn.fpd
+++ b/modules/qfn.fpd
@@ -55,6 +55,22 @@ frame center {
 	frame paste @
 }
 
+frame pad_round {
+	set ?round = 1
+
+	__0: vec @(px, py)
+	__1: vec @(-px, -py)
+	rpad "$pin" __0 .
+}
+
+frame pad_rect {
+	set ?round = 0
+
+	__0: vec @(px, py)
+	__1: vec @(-px, -py)
+	pad "$pin" __0 .
+}
+
 frame pad {
 	set px = (dx*X1+dy*Y1)/2
 
@@ -64,8 +80,9 @@ frame pad {
 
 	__0: vec @(px, py)
 	__1: vec @(-px, -py)
-	pad "$pin" __0 .
 	__2: vec @(px, -py)
+	frame pad_rect @
+	frame pad_round @
 }
 
 frame side {
@@ -126,20 +143,20 @@ frame outline {
 }
 
 package "QFN$pins-$variant"
-unit mil
+unit mm
 allow holes
 
 table
-    { pins, variant, X1, Y1, X2, Y2, E, C1, C2, SE, SNX, SNY, SX, SY }
-    { 16, "LFCSP_LQ", 0.35mm, 1.2mm, 2.43mm, 2.43mm, 0.65mm, 4.1mm, 4.1mm, 1mm, 2, 2, 0.7mm, 0.7mm }
-    { 28, "Atmel", 0.24mm, 0.7mm, 2.4mm, 2.4mm, 0.45mm, 4.1mm, 4.1mm, 1mm, 2, 2, 0.8mm, 0.8mm }
-    { 28, "MCHP-ML", 0.37mm, 1mm, 4.25mm, 4.25mm, 0.65mm, 5.7mm, 5.7mm, 1mm, 3, 3, 0.65mm, 0.65mm }
-    { 28, "SiLabs", 0.25mm, 0.9mm, 3.3mm, 3.3mm, 0.5mm, 4.8mm, 4.8mm, 1.1mm, 3, 3, 0.9mm, 0.9mm }
-    { 32, "VHHD-2", 0.26mm, 0.69mm, 3.7mm, 3.7mm, 0.5mm, 5.1mm, 5.1mm, 0.8mm, 3, 3, 0.55mm, 0.55mm }
-    { 32, "VHHD-6", 0.26mm, 0.69mm, 3.4mm, 3.4mm, 0.5mm, 5.1mm, 5.1mm, 1.2mm, 2, 2, 0.75mm, 0.75mm }
-    { 32, "HVQFN", 0.3mm, 1.08mm, 4.85mm, 4.85mm, 0.65mm, 6.9mm, 6.9mm, 1.7mm, 2, 2, 1mm, 1mm }
-    { 32, "Freescale", 0.25mm, 0.9mm, 3.6mm, 3.6mm, 0.5mm, 5mm, 5mm, 1.2mm, 2, 2, 0.9mm, 0.9mm }
-    { 48, "Freescale", 0.25mm, 0.9mm, 5.1mm, 5.1mm, 0.5mm, 7mm, 7mm, 1.1mm, 3, 3, 0.8mm, 0.8mm }
+    { pins, variant, X1, Y1, X2, Y2, E, C1, C2, SE, SNX, SNY, SX, SY, round }
+    { 16, "LFCSP_LQ", 0.35mm, 1.2mm, 2.43mm, 2.43mm, 0.65mm, 4.1mm, 4.1mm, 1mm, 2, 2, 0.7mm, 0.7mm, 0 }
+    { 28, "Atmel", 0.24mm, 0.7mm, 2.4mm, 2.4mm, 0.45mm, 4.1mm, 4.1mm, 1mm, 2, 2, 0.8mm, 0.8mm, 0 }
+    { 28, "MCHP-ML", 0.37mm, 1mm, 4.25mm, 4.25mm, 0.65mm, 5.7mm, 5.7mm, 1mm, 3, 3, 0.65mm, 0.65mm, 0 }
+    { 28, "SiLabs", 0.25mm, 0.9mm, 3.3mm, 3.3mm, 0.5mm, 4.8mm, 4.8mm, 1.1mm, 3, 3, 0.9mm, 0.9mm, 0 }
+    { 32, "VHHD-2", 0.26mm, 0.69mm, 3.7mm, 3.7mm, 0.5mm, 5.1mm, 5.1mm, 0.8mm, 3, 3, 0.55mm, 0.55mm, 0 }
+    { 32, "VHHD-6", 0.26mm, 0.69mm, 3.4mm, 3.4mm, 0.5mm, 5.1mm, 5.1mm, 1.2mm, 2, 2, 0.75mm, 0.75mm, 0 }
+    { 32, "HVQFN", 0.3mm, 1.08mm, 4.85mm, 4.85mm, 0.65mm, 6.9mm, 6.9mm, 1.7mm, 2, 2, 1mm, 1mm, 0 }
+    { 32, "Freescale", 0.25mm, 0.9mm, 3.6mm, 3.6mm, 0.5mm, 5mm, 5mm, 1.2mm, 2, 2, 0.9mm, 0.9mm, 1 }
+    { 48, "Freescale", 0.25mm, 0.9mm, 5.1mm, 5.1mm, 0.5mm, 7mm, 7mm, 1.1mm, 3, 3, 0.8mm, 0.8mm, 0 }
 
 set w = 5mil