diff --git a/labsw/cam/Makefile b/labsw/cam/Makefile
new file mode 100644
index 0000000..6b8c0ee
--- /dev/null
+++ b/labsw/cam/Makefile
@@ -0,0 +1,34 @@
+MKMK=../../../cae-tools/cameo/templates/mkmk-simple
+
+NAME=labsw
+
+BOARD = X0=9.2mm Y0=8.1mm
+
+# drill: 12.5-13.5 mil
+# in:	 35 mil endmill; pretend it is smaller, to compensate for
+#	 tool/board deflections
+# out:	 35 mil endmill, 11 mil deflection
+#
+TOOLS = DRILL=7mil,15mil MILL_IN=12mil MILL_OUT=50mil
+
+#FAB = ROT=90 X=0 Y=1 XN=1 YN=2
+FAB = ROT=90 X=1 Y=1 XN=1 YN=2
+
+.PHONY:			all clean
+
+all:			Makefile.mkmk
+
+Makefile.mkmk:		$(MKMK) ../$(NAME).drl ../$(NAME)-PCB_Edges.gbr Makefile
+			$(MKMK) NAME=$(NAME) $(BOARD) $(TOOLS) $(FAB)
+
+../$(NAME).drl:		../$(NAME).brd
+			pcbnew --drill `pwd`/../$(NAME).brd
+			touch $@
+
+../$(NAME)-PCB_Edges.gbr: ../$(NAME).brd
+			pcbnew --plot=gerber -l PCB_Edges `pwd`/../$(NAME).brd
+
+-include Makefile.mkmk
+
+clean::
+			rm -f Makefile.mkmk
diff --git a/labsw/labsw.brd b/labsw/labsw.brd
index b4eec69..3516f3d 100644
--- a/labsw/labsw.brd
+++ b/labsw/labsw.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Sun Aug 28 12:04:12 2011
+PCBNEW-BOARD Version 1 date Thu Sep  1 04:34:04 2011
 
 # Created by Pcbnew(2010-12-27 BZR 2685)-unstable
 
@@ -20,7 +20,7 @@ $EndGENERAL
 $SHEETDESCR
 Sheet A4 11700 8267
 Title "Lab Switch"
-Date "28 aug 2011"
+Date "1 sep 2011"
 Rev "0"
 Comp "Werner Almesberger"
 Comment1 ""
@@ -1477,78 +1477,6 @@ Ne 38 "CH1_RELAY"
 Po 295 0
 $EndPAD
 $EndMODULE  0603
-$MODULE SPACER
-Po 39370 41417 0 15 4E592360 4E592396 ~~
-Li SPACER
-Sc 4E592396
-AR 
-Op 0 0 0
-At SMD 
-T0 0 -150 200 200 0 40 N V 25 N"SPACER"
-T1 0 150 200 200 0 40 N I 25 N"Val*"
-DC 0 0 0 -1968 50 21
-$PAD
-Sh "1" O 3542 3542 0 0 0
-Dr 1180 0 0
-At STD N 00CC8001
-Ne 0 ""
-Po 0 0
-$EndPAD
-$EndMODULE  SPACER
-$MODULE SPACER
-Po 39370 26772 0 15 4E592360 4E5923AA ~~
-Li SPACER
-Sc 4E5923AA
-AR 
-Op 0 0 0
-At SMD 
-T0 0 -150 200 200 0 40 N V 25 N"SPACER"
-T1 0 150 200 200 0 40 N I 25 N"Val*"
-DC 0 0 0 -1968 50 21
-$PAD
-Sh "1" O 3542 3542 0 0 0
-Dr 1180 0 0
-At STD N 00CC8001
-Ne 0 ""
-Po 0 0
-$EndPAD
-$EndMODULE  SPACER
-$MODULE SPACER
-Po 74803 40394 0 15 4E592360 4E5923BD ~~
-Li SPACER
-Sc 4E5923BD
-AR 
-Op 0 0 0
-At SMD 
-T0 0 -150 200 200 0 40 N V 25 N"SPACER"
-T1 0 150 200 200 0 40 N I 25 N"Val*"
-DC 0 0 0 -1968 50 21
-$PAD
-Sh "1" O 3542 3542 0 0 0
-Dr 1180 0 0
-At STD N 00CC8001
-Ne 0 ""
-Po 0 0
-$EndPAD
-$EndMODULE  SPACER
-$MODULE SPACER
-Po 74803 26772 0 15 4E592360 4E592A99 ~~
-Li SPACER
-Sc 4E592A99
-AR 
-Op 0 0 0
-At SMD 
-T0 0 -150 200 200 0 40 N V 25 N"SPACER"
-T1 0 150 200 200 0 40 N I 25 N"Val*"
-DC 0 0 0 -1968 50 21
-$PAD
-Sh "1" O 3542 3542 0 0 0
-Dr 1180 0 0
-At STD N 00CC8001
-Ne 0 ""
-Po 0 0
-$EndPAD
-$EndMODULE  SPACER
 $MODULE RELAY
 Po 56378 34252 1800 15 4E595583 4E5713F4 ~~
 Li RELAY
@@ -2429,6 +2357,78 @@ Ne 2 "/Back/EXT_IN_1_N"
 Po 1499 1499
 $EndPAD
 $EndMODULE  DIP-8-300mil
+$MODULE SPACER-4mm
+Po 39370 26772 0 15 4E5F3472 4E5F34BE ~~
+Li SPACER-4mm
+Sc 4E5F34BE
+AR 
+Op 0 0 0
+At SMD 
+T0 0 -150 200 200 0 40 N V 25 N"SPACER-4mm"
+T1 0 150 200 200 0 40 N I 25 N"Val*"
+DC 0 0 0 -1968 50 21
+$PAD
+Sh "1" O 3542 3542 0 0 0
+Dr 1652 0 0
+At STD N 00CC8001
+Ne 0 ""
+Po 0 0
+$EndPAD
+$EndMODULE  SPACER-4mm
+$MODULE SPACER-4mm
+Po 74803 40394 0 15 4E5F3472 4E5923BD ~~
+Li SPACER-4mm
+Sc 4E5923BD
+AR 
+Op 0 0 0
+At SMD 
+T0 0 -150 200 200 0 40 N V 25 N"SPACER"
+T1 0 150 200 200 0 40 N I 25 N"Val*"
+DC 0 0 0 -1968 50 21
+$PAD
+Sh "1" O 3542 3542 0 0 0
+Dr 1652 0 0
+At STD N 00CC8001
+Ne 0 ""
+Po 0 0
+$EndPAD
+$EndMODULE  SPACER-4mm
+$MODULE SPACER-4mm
+Po 39370 41417 0 15 4E5F3472 4E592396 ~~
+Li SPACER-4mm
+Sc 4E592396
+AR 
+Op 0 0 0
+At SMD 
+T0 0 -150 200 200 0 40 N V 25 N"SPACER"
+T1 0 150 200 200 0 40 N I 25 N"Val*"
+DC 0 0 0 -1968 50 21
+$PAD
+Sh "1" O 3542 3542 0 0 0
+Dr 1652 0 0
+At STD N 00CC8001
+Ne 0 ""
+Po 0 0
+$EndPAD
+$EndMODULE  SPACER-4mm
+$MODULE SPACER-4mm
+Po 74803 26772 0 15 4E5F3472 4E592A99 ~~
+Li SPACER-4mm
+Sc 4E592A99
+AR 
+Op 0 0 0
+At SMD 
+T0 0 -150 200 200 0 40 N V 25 N"SPACER"
+T1 0 150 200 200 0 40 N I 25 N"Val*"
+DC 0 0 0 -1968 50 21
+$PAD
+Sh "1" O 3542 3542 0 0 0
+Dr 1652 0 0
+At STD N 00CC8001
+Ne 0 ""
+Po 0 0
+$EndPAD
+$EndMODULE  SPACER-4mm
 $DRAWSEGMENT
 Po 0 77165 25984 77165 35354 50
 De 28 0 900 0 0
diff --git a/labsw/modules/spacer.fpd b/labsw/modules/spacer.fpd
index 63d8850..0c48f35 100644
--- a/labsw/modules/spacer.fpd
+++ b/labsw/modules/spacer.fpd
@@ -1,9 +1,14 @@
 /* MACHINE-GENERATED ! */
 
-package "SPACER"
+package "SPACER-$nominal"
 unit mm
 
-set hole = 3mm
+table
+    { nominal }
+    { 3mm }
+    { 4mm }
+
+set hole = nominal+0.2mm
 
 set disc = 9mm