diff --git a/allianceauth/project_template/supervisor.conf b/allianceauth/project_template/supervisor.conf
index 06f5a0d6..38adfff2 100644
--- a/allianceauth/project_template/supervisor.conf
+++ b/allianceauth/project_template/supervisor.conf
@@ -23,6 +23,7 @@ stopwaitsecs = 600
 killasgroup=true
 priority=998
 
+{% if gunicorn %}
 [program:gunicorn]
 user = allianceserver
 directory={{ project_directory }}
@@ -33,6 +34,7 @@ autostart=true
 autorestart=true
 stopsignal=INT
 
+{% endif %}
 [group:{{ project_name }}]
-programs=beat,worker,gunicorn
+programs=beat,worker{% if gunicorn %},gunicorn{% endif %}
 priority=999
diff --git a/docs/index.md b/docs/index.md
index e5b5cfa4..85e8818b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -5,13 +5,11 @@ Alliance service auth to help large scale alliances manage services. Built for "
 
 # Installing
 
-[Ubuntu Setup Guide](installation/auth/ubuntu.md)
-
-For other distros, adapt the procedure and find distro-specific alternatives for the [dependencies](installation/auth/dependencies.md)
+[Setup Guide](installation/auth/allianceauth.md)
 
 # Using
 
-See the [Quick Start Guide](installation/auth/quickstart.md) and learn about individual [features.](features/index.md)
+Learn about individual [features.](features/index.md)
 
 # Troubleshooting
 
diff --git a/docs/installation/auth/allianceauth.md b/docs/installation/auth/allianceauth.md
index 9b4579ed..f00c292c 100644
--- a/docs/installation/auth/allianceauth.md
+++ b/docs/installation/auth/allianceauth.md
@@ -112,6 +112,13 @@ Now you need to create the application that will run the Alliance Auth install.
 
 The `allianceauth start myauth` command will bootstrap a Django project which will run Alliance Auth. You can rename it from `myauth` to anything you'd like: this name is shown by default as the site name but that can be changed later.
 
+```eval_rst
+.. tip::
+   If you plan to use gunicorn as your WSGI server (recommended), ensure it is installed before starting your auth project to have an entry automatically created in the project's supervisor config file. ::
+   
+      pip install gunicorn
+```
+
 The settings file needs configuring. Edit the template at `myauth/myauth/settings/local.py`. Be sure to configure the EVE SSO and Email settings.
 
 Django needs to install models to the database before it can start.
@@ -120,7 +127,7 @@ Django needs to install models to the database before it can start.
 
 Now we need to round up all the static files required to render templates. Make a directory to serve them from and populate it.
     
-    mkdir /var/www/myauth/static
+    mkdir -p /var/www/myauth/static
     python /home/allianceserver/myauth/manage.py collectstatic
     chown -R www-data:www-data /var/www/myauth/static