diff --git a/resources/install b/resources/install
index 1ea898b8..f0a9a0bf 100755
--- a/resources/install
+++ b/resources/install
@@ -69,6 +69,18 @@ mkdir -p /var/run/sshd
 
 # configure nginx
 sed 's/YOUR_SERVER_FQDN/localhost/' -i /etc/nginx/sites-available/gitlab
+echo "daemon off;" >> /etc/nginx/nginx.conf
+cat > /etc/supervisor/conf.d/nginx.conf <<EOF
+[program:nginx]
+priority=20
+directory=/tmp
+command=/usr/sbin/nginx
+user=root
+autostart=true
+autorestart=true
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+EOF
 
 #
 cat > /etc/supervisor/conf.d/openssh-server.conf <<EOF
diff --git a/resources/start b/resources/start
index fbd6cdf7..dc934fc8 100755
--- a/resources/start
+++ b/resources/start
@@ -88,9 +88,6 @@ fi
 sudo -u git -H bundle exec rake gitlab:satellites:create RAILS_ENV=production
 sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
 
-# start the nginx server
-/etc/init.d/nginx start
-
 # kickstart the rails application
 wget "http://localhost" -O /dev/null