diff --git a/Makefile b/Makefile
index 8cb02df323..e43cc3037a 100644
--- a/Makefile
+++ b/Makefile
@@ -449,6 +449,9 @@ factcacher:
 	fi; \
 	$(PYTHON) manage.py run_fact_cache_receiver
 
+nginx:
+	nginx -g "daemon off;"
+
 reports:
 	mkdir -p $@
 
diff --git a/Procfile b/Procfile
index 09dfe2411c..b30dfcad2b 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,4 @@
+nginx:          make nginx
 runworker:      make runworker
 daphne:         make daphne
 celeryd:        make celeryd
diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh
index 01fa0a9dcd..e2db66c3e4 100755
--- a/tools/docker-compose/start_development.sh
+++ b/tools/docker-compose/start_development.sh
@@ -40,8 +40,5 @@ make version_file
 make migrate
 make init
 
-# Start nginx
-nginx
-
 # Start the service
 make honcho