diff --git a/atben/Makefile b/atben/Makefile
index ab3b6b7..2433818 100644
--- a/atben/Makefile
+++ b/atben/Makefile
@@ -52,9 +52,10 @@ gerber:
 fab:		gerber
 		pcbnew --plot=dxf --origin=aux -l PCB_Edges $(NAME).brd
 		pcbnew --drill --origin=aux $(NAME).brd
-		tar Ccfz .. $(NAME)-pcb-$(VERSION).tar.gz \
+		mkdir -p fab
+		tar Ccfz .. fab/$(NAME)-pcb-$(VERSION).tar.gz \
 		  $(PCB_FILES:%=$(DIR)/%)
-		cd ..; zip -l $(DIR)/$(NAME)-pcb-$(VERSION).zip \
+		cd ..; zip -l $(DIR)/fab/$(NAME)-pcb-$(VERSION).zip \
 		  $(PCB_FILES:%=$(DIR)/%)
 
 gerbv:
@@ -66,8 +67,8 @@ gerbv:
 		  $(NAME)-Back.gbl
 
 upload:
-		qippl $(NAME)-pcb-$(VERSION).tar.gz \
-		  $(NAME)-pcb-$(VERSION).zip wpan/fab
+		qippl fab/$(NAME)-pcb-$(VERSION).tar.gz \
+		  fab/$(NAME)-pcb-$(VERSION).zip wpan/fab
 
 # --- DIY production (toner transfer) -----------------------------------------
 
diff --git a/atusb/Makefile b/atusb/Makefile
index 16d39a9..2301f16 100644
--- a/atusb/Makefile
+++ b/atusb/Makefile
@@ -69,9 +69,10 @@ gerber:
 fab:		gerber
 		pcbnew --plot=dxf --origin=aux -l PCB_Edges $(NAME).brd
 		pcbnew --drill --origin=aux $(NAME).brd
-		tar Ccfz .. $(NAME)-pcb-$(VERSION).tar.gz \
+		mkdir -p fab
+		tar Ccfz .. fab/$(NAME)-pcb-$(VERSION).tar.gz \
 		  $(PCB_FILES:%=$(DIR)/%)
-		cd ..; zip -l $(DIR)/$(NAME)-pcb-$(VERSION).zip \
+		cd ..; zip -l $(DIR)/fab/$(NAME)-pcb-$(VERSION).zip \
 		  $(PCB_FILES:%=$(DIR)/%)
 
 gerbv:
@@ -83,8 +84,8 @@ gerbv:
 		  $(NAME)-Back.gbl
 
 upload:
-		qippl $(NAME)-pcb-$(VERSION).tar.gz \
-		  $(NAME)-pcb-$(VERSION).zip wpan/fab
+		qippl fab/$(NAME)-pcb-$(VERSION).tar.gz \
+		  fab/$(NAME)-pcb-$(VERSION).zip wpan/fab
 
 # --- Cleanup -----------------------------------------------------------------
 
@@ -96,3 +97,10 @@ clean:
 		rm -f $(NAME)-Back.gbl $(NAME)-Mask_Back.gbs
 		rm -f $(NAME)-SilkS_Back.gbo $(NAME)-SoldP_Back.gbp
 		rm -f $(NAME)-Comments.gbr
+
+spotless:	clean
+		rm -f '$$'savepcb.brd
+		rm -f $(NAME)-cache.bak atrf.bak usb.bak
+		rm -f $(NAME).000
+		rm -f $(NAME).net
+