diff --git a/paperless.conf.example b/paperless.conf.example
index 6b2a102ab..abb93eefe 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -85,3 +85,5 @@ PAPERLESS_SHARED_SECRET=""
 # the default location
 #PAPERLESS_DBDIR=/path/to/database/file
 
+# Override the default MEDIA_ROOT here.  This is where all files are stored.
+#PAPERLESS_MEDIADIR=/path/to/media
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index de25313c6..b343b3a17 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -151,7 +151,10 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
 
 STATIC_ROOT = os.path.join(BASE_DIR, "..", "static")
-MEDIA_ROOT = os.path.join(BASE_DIR, "..", "media")
+MEDIA_ROOT = os.getenv(
+                "PAPERLESS_MEDIADIR",
+                os.path.join(BASE_DIR, "..", "media")
+             )
 
 STATIC_URL = '/static/'
 MEDIA_URL = "/media/"