diff --git a/Makefile b/Makefile
index 5e016f3..3bcc54a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@ F_POS_N = $@/RAM2GS-top-pos
 F_POS = $(F_POS_N).csv
 F_POS_VCORE = $(F_POS_N).VCORE.csv
 F_POS_JUMPER = $(F_POS_N).JUMPER.csv
-F_ZIP = RAM2GS.4201D.$(CHIPTYPE)-gerber.zip
-F_SCHPDF = RAM2GS.4201D.$(CHIPTYPE)-Schematic.pdf
-F_PCBPDF = RAM2GS.4201D.$(CHIPTYPE)-Placement.pdf
+F_ZIP = $@/RAM2GS.4201D.$(CHIPTYPE)-gerber.zip
+F_SCHPDF = $@/RAM2GS.4201D.$(CHIPTYPE)-Schematic.pdf
+F_PCBPDF = $@/RAM2GS.4201D.$(CHIPTYPE)-Placement.pdf
 
 
 OPT_GERBER = -l $(LAYERS) --subtract-soldermask --no-netlist --no-x2
@@ -21,8 +21,8 @@ CMD_DRILL = pcb export drill -o $@/ $(F_PCB)
 OPT_POS = --smd-only --units mm --side front --format csv
 CMD_POS = pcb export pos $(OPT_POS) -o $(F_POS) $(F_PCB)
 
-CMD_SCHPDF = sch export pdf --black-and-white --no-background-color -o $@/$(F_SCHPDF) $(F_SCH)
-CMD_PCBPDF = pcb export pdf --black-and-white -l F.Fab,Edge.Cuts -o $@/$(F_PCBPDF) $(F_PCB)
+CMD_SCHPDF = sch export pdf --black-and-white --no-background-color -o $(F_SCHPDF) $(F_SCH)
+CMD_PCBPDF = pcb export pdf --black-and-white -l F.Fab,Edge.Cuts -o $(F_PCBPDF) $(F_PCB)
 
 
 .PHONY: all clean \
@@ -50,7 +50,7 @@ Hardware/MAX/gerber Hardware/LCMXO/gerber Hardware/LCMXO2/gerber:
 	cp $(F_POS) $(F_POS_JUMPER)
 	sed -i '' '/"R4"/d' $(F_POS_VCORE)
 	sed -i '' '/"U11"/d' $(F_POS_JUMPER)
-	zip -r $@/$(F_ZIP) $@/
+	zip -r $(F_ZIP) $@/
 
 Hardware/MAX/Documentation Hardware/LCMXO/Documentation Hardware/LCMXO2/Documentation:
 	mkdir -p $@