diff --git a/pcb/Makefile b/pcb/Makefile
index 9b15b9c..8e6777b 100644
--- a/pcb/Makefile
+++ b/pcb/Makefile
@@ -17,8 +17,9 @@ $(BOARD)_pcb.zip: fab doc
 
 gen/$(BOARD)_fab.zip: gen/fab/$(BOARD)-F_Cu.gbr gen/fab/$(BOARD)-B_Cu.gbr gen/fab/$(BOARD)-F_Mask.gbr gen/fab/$(BOARD)-B_Mask.gbr
 gen/$(BOARD)_fab.zip: gen/fab/$(BOARD)-F_Paste.gbr gen/fab/$(BOARD)-B_Paste.gbr gen/fab/$(BOARD)-F_SilkS.gbr gen/fab/$(BOARD)-B_SilkS.gbr
+gen/$(BOARD)_fab.zip: gen/fab/$(BOARD).drl
 	@mkdir -p gen/fab
-	cd gen/fab; zip -r ../$(BOARD)_fab.zip $(BOARD)*.gbr
+	cd gen/fab; zip -r ../$(BOARD)_fab.zip $(BOARD)*.gbr $(BOARD).drl
 
 gen/$(BOARD)-erc.txt:  $(BOARD).kiplot.yaml $(BOARD).kicad_pro $(BOARD).kicad_pcb
 	@mkdir -p gen
@@ -32,13 +33,17 @@ gen/fab/%.gbr: $(BOARD).kiplot.yaml $(BOARD).kicad_pro $(BOARD).kicad_pcb
 	@mkdir -p gen
 	kibot -d gen -c $(BOARD).kiplot.yaml -s all print_front gerbers
 
+gen/fab/$(BOARD).drl: $(BOARD).kiplot.yaml $(BOARD).kicad_pro $(BOARD).kicad_pcb
+	@mkdir -p gen
+	kibot -d gen -c $(BOARD).kiplot.yaml -s all drill
+
 gen/$(BOARD)-top-pos.csv: $(BOARD).kiplot.yaml $(BOARD).kicad_pro $(BOARD).kicad_pcb
 	@mkdir -p gen
-	kibot -d gen -c $(BOARD).kiplot.yaml -s all print_front position
+	kibot -d gen -c $(BOARD).kiplot.yaml -s all position
 
 gen/$(BOARD).csv: $(BOARD).kiplot.yaml $(BOARD).kicad_pro $(BOARD).kicad_pcb
 	@mkdir -p gen
-	kibot -d gen -c $(BOARD).kiplot.yaml -s all print_front bom
+	kibot -d gen -c $(BOARD).kiplot.yaml -s all bom
 
 gen/$(BOARD).pdf: $(BOARD).kiplot.yaml $(BOARD).kicad_pro $(BOARD).kicad_sch
 	@mkdir -p gen
diff --git a/pcb/fiatlux.kiplot.yaml b/pcb/fiatlux.kiplot.yaml
index a035fc6..5289f60 100644
--- a/pcb/fiatlux.kiplot.yaml
+++ b/pcb/fiatlux.kiplot.yaml
@@ -38,14 +38,14 @@ outputs:
     type: pdf_sch_print
     dir: .
     options:
-      output: fiatlux.pdf
+      output: '%f.pdf'
 
   - name: 'print_front'
     comment: "Print F.Cu+Dwgs.User"
     type: pdf_pcb_print
     dir: .
     options:
-      output_name: fiatlux-top.pdf
+      output_name: '%f-top.pdf'
     layers:
       - layer: B.Cu
       - layer: F.SilkS
@@ -94,6 +94,15 @@ outputs:
       - layer: Edge.Cuts
         suffix: Edge_Cuts
 
+  - name: 'drill'
+    comment: "Drill Files"
+    type: excellon
+    dir: fab
+    options:
+      output: '%f.drl'
+      metric_units: true
+
+
   - name: 'position'
     comment: "Pick and place file, JLC style"
     type: position
diff --git a/pcb/fiatlux_cc48.kiplot.yaml b/pcb/fiatlux_cc48.kiplot.yaml
index 67eff0c..e635492 100644
--- a/pcb/fiatlux_cc48.kiplot.yaml
+++ b/pcb/fiatlux_cc48.kiplot.yaml
@@ -38,14 +38,14 @@ outputs:
     type: pdf_sch_print
     dir: .
     options:
-      output: fiatlux_cc48.pdf
+      output: '%f.pdf'
 
   - name: 'print_front'
     comment: "Print F.Cu+Dwgs.User"
     type: pdf_pcb_print
     dir: .
     options:
-      output_name: fiatlux_cc48-top.pdf
+      output_name: '%f-top.pdf'
     layers:
       - layer: B.Cu
       - layer: F.SilkS
@@ -94,6 +94,15 @@ outputs:
       - layer: Edge.Cuts
         suffix: Edge_Cuts
 
+  - name: 'drill'
+    comment: "Drill Files"
+    type: excellon
+    dir: fab
+    options:
+      output: '%f.drl'
+      metric_units: true
+
+
   - name: 'position'
     comment: "Pick and place file, JLC style"
     type: position