diff --git a/etc/init.d/pandora b/etc/init.d/pandora
index bb8d9f08..e87eddee 100755
--- a/etc/init.d/pandora
+++ b/etc/init.d/pandora
@@ -17,9 +17,9 @@ DESC="pan.do/ra daemon"
 NAME=pandora
 PANDORA_BASE=/srv/pandora
 DAEMON_USER="pandora"
-DAEMON_NAME=bin/gunicorn_django
+DAEMON_NAME=bin/gunicorn
 DAEMON="$PANDORA_BASE/$DAEMON_NAME"
-DAEMON_ARGS="--bind 127.0.0.1:2620 --max-requests 1000 --timeout 90 --log-level info --log-file /var/log/pandora/$NAME.log --workers 5"
+DAEMON_ARGS="wsgi:application --bind 127.0.0.1:2620 --max-requests 1000 --timeout 90 --log-level info --log-file /var/log/pandora/$NAME.log --workers 5"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
diff --git a/etc/init/pandora.conf b/etc/init/pandora.conf
index 9aa94476..0abbc4e7 100644
--- a/etc/init/pandora.conf
+++ b/etc/init/pandora.conf
@@ -17,12 +17,13 @@ pre-start script
 test -e /var/log/pandora || (mkdir -p /var/log/pandora && chown $USER:$USER /var/log/pandora)
 test -e /var/run/pandora || (mkdir -p /var/run/pandora && chown $USER:$USER /var/run/pandora)
 cd $VENV/pandora
-/usr/bin/sudo -u $USER ./manage.py compile_pyc
+/usr/bin/sudo -u $USER ./manage.py compile_pyc -p $VENV/pandora
 end script
 
 exec start-stop-daemon \
     --start -c $USER -d $VENV/pandora --exec \
-    $VENV/bin/gunicorn_django -- \
+    $VENV/bin/gunicorn -- \
+       wsgi:application \
        --bind      127.0.0.1:2620 \
        --timeout   90 \
        --max-requests 1000 \
diff --git a/etc/systemd/pandora.service b/etc/systemd/pandora.service
index f9fd2daa..f32f940e 100644
--- a/etc/systemd/pandora.service
+++ b/etc/systemd/pandora.service
@@ -10,8 +10,9 @@ PIDFile=/run/pandora/pandora.pid
 WorkingDirectory=/srv/pandora/pandora
 StandardOutput=syslog
 StandardError=syslog
-ExecStartPre=/srv/pandora/pandora/manage.py compile_pyc
-ExecStart=/srv/pandora/bin/gunicorn_django \
+ExecStartPre=/srv/pandora/pandora/manage.py compile_pyc -p /srv/pandora/pandora
+ExecStart=/srv/pandora/bin/gunicorn \
+    wsgi:application \
     -p /run/pandora/pandora.pid \
     --bind 127.0.0.1:2620 \
     --timeout 90 \