diff --git a/atben/cam/mkmk b/atben/cam/mkmk
index b4f697a..6be467b 100755
--- a/atben/cam/mkmk
+++ b/atben/cam/mkmk
@@ -3,6 +3,8 @@ PATH=$PATH:/home/qi/cae-tools/cameo
 PATH=$PATH:/home/moko/svn.openmoko.org/developers/werner/cncmap/gp2rml
 
 NAME=atben
+X0=8.6mm
+Y0=7.1mm
 X=0
 Y=0
 
@@ -10,9 +12,9 @@ cameo <<EOF
 mm
 
 gerber 35mil ../$NAME-PCB_Edges.gbr
-align 1 4.4mm 12.1mm	# align relative to board corner
+align 1 $X0 $Y0		# align relative to board corner
 translate 4mm 4mm	# move to PCB zone assigned to project
-translate 40mm 0mm	# skip over previous boards
+#translate 40mm 0mm	# skip over previous boards
 array +19mm +2.5mm $X $Y
 
 z 0 -58.9mm		# board surface (tool fully retracted)
@@ -49,9 +51,9 @@ reset
 gerber 35mil ../$NAME-PCB_Edges.gbr
 rotate 180
 
-align 1 4.4mm 12.1mm	# align relative to board corner
+align 1 $X0 $Y0		# align relative to board corner
 translate 4mm 4mm	# move to PCB zone assigned to project
-translate 40mm 0mm	# skip over previous boards
+#translate 40mm 0mm	# skip over previous boards
 translate 15mm 0mm
 array +19mm +2.5mm $X $Y
 
diff --git a/atusb-pgm/cam/Makefile b/atusb-pgm/cam/Makefile
index 75c5473..eace33d 100644
--- a/atusb-pgm/cam/Makefile
+++ b/atusb-pgm/cam/Makefile
@@ -7,6 +7,10 @@ NAME=atusb-pgm
 # 6.8 / 8.4 mm
 # + 0 / 59 mm
 BOARD = X0=6.8mm Y0=67.4mm
+# 9.2 8.1
+# 0   59
+# 0   -0.5
+BOARD = X0=9.2mm Y0=66.6mm
 TOOLS = DRILL=7mil,15mil MILL_IN=25mil MILL_OUT=45mil
 FAB = X=0 Y=0 XN=3 YN=1
 
diff --git a/atusb/cam/Makefile b/atusb/cam/Makefile
index 9b82cc2..9dc26d8 100644
--- a/atusb/cam/Makefile
+++ b/atusb/cam/Makefile
@@ -1,15 +1,32 @@
+MKMK=../../../cae-tools/cameo/templates/mkmk-simple
+
+NAME=atusb
+
+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 ../atusb.drl ../atusb-PCB_Edges.gbr
-			./mkmk
+Makefile.mkmk:		$(MKMK) ../$(NAME).drl ../$(NAME)-PCB_Edges.gbr Makefile
+			$(MKMK) NAME=$(NAME) $(BOARD) $(TOOLS) $(FAB)
 
-../atusb.drl:		../atusb.brd
-			pcbnew --drill `pwd`/../atusb.brd
+../$(NAME).drl:		../$(NAME).brd
+			pcbnew --drill `pwd`/../$(NAME).brd
+			touch $@
 
-../atusb-PCB_Edges.gbr:	../atusb.brd
-			pcbnew --plot=gerber -l PCB_Edges `pwd`/../atusb.brd
+../$(NAME)-PCB_Edges.gbr: ../$(NAME).brd
+			pcbnew --plot=gerber -l PCB_Edges `pwd`/../$(NAME).brd
 
 -include Makefile.mkmk
 
diff --git a/atusb/cam/mkmk b/atusb/cam/mkmk
deleted file mode 100755
index afe670a..0000000
--- a/atusb/cam/mkmk
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/home/qi/cae-tools/cameo
-PATH=$PATH:/home/moko/svn.openmoko.org/developers/werner/cncmap/gp2rml
-
-NAME=atusb
-X=0
-Y=0
-
-cameo <<EOF
-mm
-
-gerber 35mil ../$NAME-PCB_Edges.gbr
-rotate 90
-align 1 6.8mm 8.4mm	# align relative to board corner
-translate 4mm 4mm	# move to PCB zone assigned to project
-array +3mm +3mm $X $Y
-z 0 -58.9mm		# board surface (tool fully retracted)
-z 1.5mm			# slack for extending the tool
-z -0.8mm		# board thickness
-z -0.5mm		# tool extra depth
-clear
-
-excellon ../$NAME.drl
-drill 7mil 15mil	# 12.5-13.5 mil drill
-optimize
-write drill.gp
-
-remainder
-mill 20mil 0.01mm	# 35 mil endmill; pretend it is a little smaller,
-			# to compensate for tool/board deflections
-write mill.gp
-
-remainder
-empty
-
-gerber 32mil ../$NAME-PCB_Edges.gbr	# 35 mil endmill, 3 mil deflection
-offset
-append mill.gp
-EOF
-
-
-gp2rml 2 0.5 0.5 mill.gp >mill.rml
-gp2rml 2 0.1 0.5 drill.gp >drill.rml
-
-
-cat <<EOF >Makefile.mkmk
-SPOOL=/home/moko/svn.openmoko.org/developers/werner/cncmap/spool/spool
-CNGT=/home/qi/cae-tools/cngt/cngt
-
-.PHONY:		mill drill cng plot dplot
-
-mill:
-		PORT=/dev/ttyUSB0 \$(SPOOL) mill.rml
-
-drill:
-		PORT=/dev/ttyUSB0 \$(SPOOL) drill.rml
-
-cng:
-		\$(CNGT) -57.4 20 mill.gp
-
-plot:
-		echo 'plot "drill.gp" with points, "mill.gp" with lines' | \\
-		  gnuplot -persist
-
-dplot:
-		echo 'plot "< sed /^\$\$/d drill.gp" with linespoints' | \\
-		  gnuplot -persist
-
-clean::
-		rm -f mill.gp mill.rml drill.gp drill.rml
-EOF