diff --git a/.buildbot/deploy/02-setup.sh b/.buildbot/deploy/02-setup.sh
index ffc32c2..36af0ef 100644
--- a/.buildbot/deploy/02-setup.sh
+++ b/.buildbot/deploy/02-setup.sh
@@ -1,5 +1,13 @@
-django-dav-admin setup env/django
+django-dav-admin setup djangoenv
 python env/django/manage.py enable_module dav_auth
 python env/django/manage.py enable_module dav_events
 python env/django/manage.py enable_module dav_registration
 python env/django/manage.py enable_module dav_event_office
+
+if test -n "$ROOT_URI" ; then
+	cat <<E-O-H >> djangoenv/main/settings.py
+
+STATIC_URL = '${ROOT_URI}/static/'
+
+E-O-H
+fi
diff --git a/.buildbot/deploy/03-allowed_hosts.sh b/.buildbot/deploy/03-allowed_hosts.sh
index c6ff185..b2d4dda 100644
--- a/.buildbot/deploy/03-allowed_hosts.sh
+++ b/.buildbot/deploy/03-allowed_hosts.sh
@@ -1 +1 @@
-echo "ALLOWED_HOSTS = ['*']" >> env/django/main/settings.py
+echo "ALLOWED_HOSTS = ['*']" >> djangoenv/main/settings.py
diff --git a/.buildbot/deploy/10-collectstatic.sh b/.buildbot/deploy/10-collectstatic.sh
index b931baf..b8a1cfe 100644
--- a/.buildbot/deploy/10-collectstatic.sh
+++ b/.buildbot/deploy/10-collectstatic.sh
@@ -1 +1 @@
-python env/django/manage.py collectstatic --no-input
+python djangoenv/manage.py collectstatic --no-input
diff --git a/.buildbot/deploy/99-trigger_wsgi_reload.sh b/.buildbot/deploy/99-trigger_wsgi_reload.sh
index 292460b..55dd0e3 100644
--- a/.buildbot/deploy/99-trigger_wsgi_reload.sh
+++ b/.buildbot/deploy/99-trigger_wsgi_reload.sh
@@ -1 +1 @@
-touch env/django/main/wsgi.py
+touch djangoenv/main/wsgi.py