diff --git a/src/pretix/settings.py b/src/pretix/settings.py
index a59994b25..b90ecfeeb 100644
--- a/src/pretix/settings.py
+++ b/src/pretix/settings.py
@@ -159,7 +159,8 @@ TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
-            os.path.join(BASE_DIR, 'templates')
+            os.path.join(DATA_DIR, 'templates'),
+            os.path.join(BASE_DIR, 'templates'),
         ],
         'OPTIONS': {
             'context_processors': [
@@ -185,6 +186,11 @@ STATICFILES_FINDERS = (
     'compressor.finders.CompressorFinder',
 )
 
+STATICFILES_DIRS = (
+    os.path.join(DATA_DIR, 'static'),
+    os.path.join(BASE_DIR, 'static'),
+)
+
 COMPRESS_PRECOMPILERS = (
     ('text/less', 'pretix.helpers.lessabsolutefilter.LessFilter'),
 )