diff --git a/CHANGELOG.md b/CHANGELOG.md
index 951d04fa7..557c56c80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ v2.5.9 (FUTURE)
 
 ## Enhancements
 
+* [#2902](https://github.com/digitalocean/netbox/issues/2902) - Replace supervisord with systemd
 * [#3011](https://github.com/digitalocean/netbox/issues/3011) - Add SSL support for django-rq (requires django-rq v1.3.1+)
 
 ## Bug Fixes
@@ -47,7 +48,6 @@ v2.5.7 (2019-02-21)
 
 ## Enhancements
 
-* [#2902](https://github.com/digitalocean/netbox/issues/2902) - Replace supervisord with systemd
 * [#2357](https://github.com/digitalocean/netbox/issues/2357) - Enable filtering of devices by rack face
 * [#2638](https://github.com/digitalocean/netbox/issues/2638) - Add button to copy unlocked secret to clipboard
 * [#2870](https://github.com/digitalocean/netbox/issues/2870) - Add Markdown rendering for provider NOC/admin contact fields
diff --git a/contrib/netbox@.service b/contrib/netbox@.service
index d1ea96f57..8616ccc52 100644
--- a/contrib/netbox@.service
+++ b/contrib/netbox@.service
@@ -14,7 +14,7 @@ Group=www-data
 PIDFile=${PidPath}
 WorkingDirectory=${WorkingDirectory}
 
-ExecStart=/usr/local/bin/gunicorn --config ${ConfigPath} --pythonpath ${WorkingDirectory}/netbox netbox.wsgi
+ExecStart=/usr/local/bin/gunicorn --pid ${PidPath} --pythonpath ${WorkingDirectory}/netbox --config ${ConfigPath} netbox.wsgi
 
 Restart=on-failure
 RestartSec=30
diff --git a/docs/installation/index.md b/docs/installation/index.md
index 9b780391a..4962eb7d0 100644
--- a/docs/installation/index.md
+++ b/docs/installation/index.md
@@ -13,4 +13,4 @@ If you are upgrading from an existing installation, please consult the [upgradin
 
 NetBox v2.5 and later requires Python 3.5 or higher. Please see the instructions for [migrating to Python 3](migrating-to-python3.md) if you are still using Python 2.
 
-Netbox v2.5.7 and later moved to using systemd instead of supervisord.  Please see the instructions for [migrating to systemd](migrating-to-systemd.md) if you are still using supervisord.
+Netbox v2.5.9 and later moved to using systemd instead of supervisord.  Please see the instructions for [migrating to systemd](migrating-to-systemd.md) if you are still using supervisord.