diff --git a/Makefile b/Makefile
index f3729f7..4fc8774 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,6 @@ FILES = \
 	base_image/launcher.fxf
 
 fox32os.img: $(BOOTLOADER) $(FILES)
-	$(RYFS) -s $(IMAGE_SIZE) -l fox32os -b $(BOOTLOADER) create fox32os.img.tmp
-	cd base_image; for file in *; do $(RYFS) add ../fox32os.img.tmp $$file; done
-	cp fox32os.img.tmp fox32os.img
+	$(RYFS) -s $(IMAGE_SIZE) -l fox32os -b $(BOOTLOADER) create $@.tmp
+	for file in $(FILES); do $(RYFS) add $@.tmp $$file; done
+	mv $@.tmp $@