diff --git a/resources/install b/resources/install
index f02a1478..1ea898b8 100755
--- a/resources/install
+++ b/resources/install
@@ -69,3 +69,16 @@ mkdir -p /var/run/sshd
 
 # configure nginx
 sed 's/YOUR_SERVER_FQDN/localhost/' -i /etc/nginx/sites-available/gitlab
+
+#
+cat > /etc/supervisor/conf.d/openssh-server.conf <<EOF
+[program:openssh-server]
+priority=20
+directory=/tmp
+command=/usr/sbin/sshd
+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
diff --git a/resources/start b/resources/start
index 5cba98b8..fbd6cdf7 100755
--- a/resources/start
+++ b/resources/start
@@ -28,9 +28,6 @@ if [ "${DB_HOST}" == "localhost" ]; then
 	echo 'GRANT SELECT, LOCK TABLES, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON `gitlabhq_production`.* TO 'root'@'localhost';' | mysql -uroot
 fi
 
-# start ssh server
-/usr/sbin/sshd
-
 if [ "${REDIS_HOST}" == "localhost" ]; then
 	redis-server > /dev/null &
 	sleep 3