diff --git a/src/pretix/control/static/pretixcontrol/less/auth.less b/src/pretix/control/static/pretixcontrol/less/auth.less
index 232d631fae..adfc5e2ac4 100644
--- a/src/pretix/control/static/pretixcontrol/less/auth.less
+++ b/src/pretix/control/static/pretixcontrol/less/auth.less
@@ -1,4 +1,4 @@
-@import "../../../../base/static/bootstrap/less/bootstrap.less";
+@import "../../bootstrap/less/bootstrap.less";
 
 body {
 	background: #eee;
diff --git a/src/pretix/control/static/pretixcontrol/less/main.less b/src/pretix/control/static/pretixcontrol/less/main.less
index f5f766bbc6..4094d2cc4d 100644
--- a/src/pretix/control/static/pretixcontrol/less/main.less
+++ b/src/pretix/control/static/pretixcontrol/less/main.less
@@ -1,5 +1,5 @@
-@import "../../../../base/static/bootstrap/less/bootstrap.less";
-@import "../../../../base/static/fontawesome/less/font-awesome.less";
+@import "../../bootstrap/less/bootstrap.less";
+@import "../../fontawesome/less/font-awesome.less";
 @fa-font-path: "../../fontawesome/fonts";
 @import (inline) "metisMenu.min.css";
 @import "variables.less";
diff --git a/src/pretix/presale/static/pretixpresale/less/main.less b/src/pretix/presale/static/pretixpresale/less/main.less
index d4e2d9d3be..bfb9fe379e 100644
--- a/src/pretix/presale/static/pretixpresale/less/main.less
+++ b/src/pretix/presale/static/pretixpresale/less/main.less
@@ -1,5 +1,5 @@
-@import "../../../../base/static/bootstrap/less/bootstrap.less";
-@import "../../../../base/static/fontawesome/less/font-awesome.less";
+@import "../../bootstrap/less/bootstrap.less";
+@import "../../fontawesome/less/font-awesome.less";
 @fa-font-path: "../../fontawesome/fonts";
 
 @import "event.less";
diff --git a/src/pretix/settings.py b/src/pretix/settings.py
index 0691b0efdc..2b950625f8 100644
--- a/src/pretix/settings.py
+++ b/src/pretix/settings.py
@@ -128,8 +128,9 @@ LOGIN_URL_CONTROL = '/control/login'
 # https://docs.djangoproject.com/en/dev/howto/static-files/
 
 STATIC_URL = '/static/'
-
 STATIC_ROOT = '_static'
+MEDIA_ROOT = 'media'
+MEDIA_URL = '/media/'
 
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
@@ -141,6 +142,8 @@ COMPRESS_PRECOMPILERS = (
     ('text/less', 'pretix.helpers.lessabsolutefilter.LessFilter'),
 )
 
+COMPRESS_OFFLINE = not DEBUG
+
 COMPRESS_CSS_FILTERS = (
     'compressor.filters.css_default.CssAbsoluteFilter',
     'compressor.filters.cssmin.CSSMinFilter',
diff --git a/src/pretix/wsgi.py b/src/pretix/wsgi.py
index 2bd1d7ea46..3376c34ea8 100644
--- a/src/pretix/wsgi.py
+++ b/src/pretix/wsgi.py
@@ -8,7 +8,13 @@ https://docs.djangoproject.com/en/dev/howto/deployment/wsgi/
 """
 
 import os
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings")
 
 from django.core.wsgi import get_wsgi_application  # NOQA
-application = get_wsgi_application()
+
+try:
+    from dj_static import Cling, MediaCling
+    application = Cling(MediaCling(get_wsgi_application()))
+except ImportError:
+    application = get_wsgi_application()
diff --git a/src/requirements/production.txt b/src/requirements/production.txt
index dc3ffb4bf7..dc61324746 100644
--- a/src/requirements/production.txt
+++ b/src/requirements/production.txt
@@ -14,3 +14,4 @@ BeautifulSoup4
 html5lib
 slimit
 lxml
+dj-static
diff --git a/src/setup.cfg b/src/setup.cfg
index 36ecef69b9..1ad6acf53f 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -1,5 +1,5 @@
 [flake8]
 ignore = N802,W503
 max-line-length = 160
-exclude = migrations,.ropeproject,static,mt940.py
+exclude = migrations,.ropeproject,static,mt940.py,_static
 max-complexity = 12