diff --git a/Makefile b/Makefile
index a212dcb8d..db7755fe6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,18 @@
 .PHONY: init
-init: webapp/sql/dump.sql
-	$(MAKE) setup-bench-image
+init: webapp/sql/dump.sql benchmarker/userdata/img
 
-webapp/sql/dump.sql:
+webapp/sql/dump.sql.bz2:
 	cd webapp/sql && \
-	curl -L -O https://github.com/catatsuy/private-isu/releases/download/img/dump.sql.bz2 && \
-	bunzip2 dump.sql.bz2
+	curl -L -O https://github.com/catatsuy/private-isu/releases/download/img/dump.sql.bz2
 
-.PHONY: setup-bench-image
-setup-bench-image:
+webapp/sql/dump.sql: webapp/sql/dump.sql.bz2
+	cd webapp/sql && \
+	bunzip2 --keep --force dump.sql.bz2
+
+benchmarker/userdata/img.zip:
+	cd benchmarker/userdata && \
+	curl -L -O https://github.com/catatsuy/private-isu/releases/download/img/img.zip
+
+benchmarker/userdata/img: benchmarker/userdata/img.zip
 	cd benchmarker/userdata && \
-	curl -L -O https://github.com/catatsuy/private-isu/releases/download/img/img.zip && \
-	unzip img.zip
+	unzip -qq -o img.zip