diff --git a/.gitignore b/.gitignore
index b324f38..edea5bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,4 @@ jdav_web/*/migrations
 # django database migrations
 */*/migrations/*
 static/
+media/
diff --git a/jdav_web/jdav_web/settings.py b/jdav_web/jdav_web/settings.py
index 79bfe28..2638402 100644
--- a/jdav_web/jdav_web/settings.py
+++ b/jdav_web/jdav_web/settings.py
@@ -28,7 +28,7 @@ DEBUG = True
 ALLOWED_HOSTS = []
 
 # Define media paths e.g. for image storage
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+MEDIA_ROOT = os.path.join((os.path.join(BASE_DIR, os.pardir)), "media")
 MEDIA_URL = '/media/'
 
 # Application definition
diff --git a/jdav_web/media/memberlists/dav_logo.png b/media/memberlists/dav_logo.png
similarity index 100%
rename from jdav_web/media/memberlists/dav_logo.png
rename to media/memberlists/dav_logo.png
diff --git a/jdav_web/media/memberlists/memberlist_template.tex b/media/memberlists/memberlist_template.tex
similarity index 100%
rename from jdav_web/media/memberlists/memberlist_template.tex
rename to media/memberlists/memberlist_template.tex
diff --git a/jdav_web/media/memberlists/membernote_template.tex b/media/memberlists/membernote_template.tex
similarity index 100%
rename from jdav_web/media/memberlists/membernote_template.tex
rename to media/memberlists/membernote_template.tex