diff --git a/CHANGES b/CHANGES
index caba8ad..92710dc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+0.1.2 2019-03-19
+- Use MEDIAARCHIVE_UPLOAD_TO setting.
+
 0.1.1 2019-03-14
 - Don't have migrations in the package, those must be maintained in the project.
 
diff --git a/shared/media_archive/conf.py b/shared/media_archive/conf.py
index 94492e7..37353ae 100644
--- a/shared/media_archive/conf.py
+++ b/shared/media_archive/conf.py
@@ -4,3 +4,6 @@ USE_TRANSLATABLE_FIELDS = (
     getattr(settings, 'CONTENT_PLUGINS_USE_TRANSLATABLE_FIELDS', False) or
     getattr(settings, 'USE_TRANSLATABLE_FIELDS', False)
 )
+
+
+UPLOAD_TO = getattr(settings, 'MEDIARCHIVE_UPLOAD_TO', 'archive')
diff --git a/shared/media_archive/models.py b/shared/media_archive/models.py
index 1a83954..e8b56d2 100644
--- a/shared/media_archive/models.py
+++ b/shared/media_archive/models.py
@@ -11,7 +11,7 @@ from imagekit.models import ImageSpecField
 from imagekit.processors import Adjust, Thumbnail, ResizeToFit
 from shared.utils.models.slugs import DowngradingSlugField, slugify
 
-from .conf import USE_TRANSLATABLE_FIELDS
+from .conf import UPLOAD_TO, USE_TRANSLATABLE_FIELDS
 
 if USE_TRANSLATABLE_FIELDS:
     from content_plugins.fields import TranslatableCleansedRichTextField
@@ -231,7 +231,7 @@ class Image(MediaBase):
     # file = models.ImageField(_("Datei"))
     file = ImageField(
         _("image"),
-        # upload_to=UPLOAD_TO,
+        upload_to=UPLOAD_TO,
         width_field="image_width",
         height_field="image_height",
         ppoi_field="image_ppoi",
@@ -300,7 +300,8 @@ class ImageGalleryRel(models.Model):
 
 
 class Download(FileTypeMixin, MediaBase):
-    file = models.FileField(_("Datei"))
+    file = models.FileField(_("Datei"),
+        upload_to=UPLOAD_TO)
 
     class Meta:
         verbose_name = _("Download")