diff --git a/Makefile b/Makefile
index b76f7d6..0dc868a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,13 @@
 KICAD = /Applications/KiCad/KiCad.app/Contents/MacOS/kicad-cli
 LAYERS = F.Cu,In1.Cu,In2.Cu,B.Cu,F.Paste,F.SilkS,B.SilkS,F.Mask,B.Mask,Edge.Cuts
 
+PYTHON = python3
+BOM_SCRIPT =  ../GW_KiCADBuild/export_bom.py
+
 F_PCB = $@/../MacIIROMSIMM.kicad_pcb
 F_SCH = $@/../MacIIROMSIMM.kicad_sch
+F_NETLIST = $@/MacIIROMSIMM-NET.xml
+F_BOM = $@/MacIIROMSIMM-BOM.csv
 F_POS = $@/MacIIROMSIMM-top-pos.csv
 F_ZIP = $@/MacIIROMSIMM.4402B-gerber.zip
 F_SCHPDF = $@/MacIIROMSIMM.4402B-Schematic.pdf
@@ -14,6 +19,8 @@ CMD_GERBER = pcb export gerbers $(OPT_GERBER) -o $@/ $(F_PCB)
 
 CMD_DRILL = pcb export drill -o $@/ $(F_PCB)
 
+CMD_NETLIST = sch export netlist --format kicadxml -o $(F_NETLIST) $(F_SCH)
+
 OPT_POS = --smd-only --units mm --side front --format csv
 CMD_POS = pcb export pos $(OPT_POS) -o $(F_POS) $(F_PCB)
 
@@ -33,9 +40,12 @@ gerber:
 	$(KICAD) $(CMD_GERBER)
 	$(KICAD) $(CMD_DRILL)
 	$(KICAD) $(CMD_POS)
+	$(KICAD) $(CMD_NETLIST)
 	sed -i '' 's/PosX/MidX/g' $(F_POS)
 	sed -i '' 's/PosY/MidY/g' $(F_POS)
 	sed -i '' 's/Rot/Rotation/g' $(F_POS)
+	$(PYTHON) $(BOM_SCRIPT) $(F_NETLIST) $(F_BOM)
+	rm -f $(F_ZIP)
 	zip -r $(F_ZIP) $@/
 Documentation:
 	mkdir -p $@