diff --git a/makefile b/makefile
index 90fb2e4..30db587 100644
--- a/makefile
+++ b/makefile
@@ -8,7 +8,7 @@ run:
 
 clean:
 	./gradlew clean
-	rm -f *.tar.gz *.tar.gz.minisig
+	rm -f *.tar.gz *.tar.gz.minisig *.zip *.jpg
 	rm -f app/krusty.db
 
 test:
@@ -29,10 +29,10 @@ release:
 	scp krusty-imbus_$(GITHASH).tar.gz.minisig server:/public/krusty/krusty-imbus_$(GITHASH).tar.gz.minisig
 
 zip:
-	git archive --format=zip --output=krusty-imbus_$(GITHASH).zip HEAD
+	git archive --format=zip --prefix krusty11/ --output=krusty11-$(GITHASH).zip HEAD
 
 # Generate ERD. Requires eralchemy2 (pip install eralchemy2)
-erd:
+erd: migrate
 	eralchemy2 -i sqlite:///app/krusty.db -o erd.jpg
 
 .PHONY: run clean test build dbdump migrate release erd