diff --git a/Makefile b/Makefile
index 74158b0..ec15231 100644
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,10 @@ static/highlight.css: build.py
 	python build.py highlight $(FLAGS)
 
 server: all
-	-killall flask
-	flask run &
-	nginx -c $$(pwd)/nginx.conf -e stderr
+	@trap 'kill 0' SIGINT; \
+	flask run & \
+	nginx -c $$(pwd)/nginx.conf -e stderr & \
+	wait
 
 clean:
 	-rm -r $(OUT)