diff --git a/addons/djangocms-file/addon.json b/addons/djangocms-file/addon.json
new file mode 100644
index 0000000..0f6d75b
--- /dev/null
+++ b/addons/djangocms-file/addon.json
@@ -0,0 +1,6 @@
+{
+    "installed-apps": [
+        "djangocms_file"
+    ], 
+    "package-name": "djangocms-file"
+}
\ No newline at end of file
diff --git a/addons/djangocms-file/aldryn_config.py b/addons/djangocms-file/aldryn_config.py
new file mode 100644
index 0000000..959a6f2
--- /dev/null
+++ b/addons/djangocms-file/aldryn_config.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from aldryn_client import forms
+
+
+def split_and_strip(string):
+    return [item.strip() for item in string.split(',') if item]
+
+
+class Form(forms.BaseForm):
+    templates = forms.CharField(
+        'List of additional templates (comma separated)',
+        required=False,
+    )
+
+    def clean(self):
+        data = super(Form, self).clean()
+
+        # prettify
+        data['templates'] = ', '.join(split_and_strip(data['templates']))
+        return data
+
+    def to_settings(self, data, settings):
+        if data['templates']:
+            settings['DJANGOCMS_FILE_TEMPLATES'] = [
+                (item, item)
+                for item in split_and_strip(data['templates'])
+            ]
+
+        return settings
diff --git a/addons/djangocms-file/settings.json b/addons/djangocms-file/settings.json
new file mode 100644
index 0000000..d9f69d2
--- /dev/null
+++ b/addons/djangocms-file/settings.json
@@ -0,0 +1,3 @@
+{
+    "templates": null
+}
\ No newline at end of file
diff --git a/requirements.in b/requirements.in
index 333e50a..94706fd 100644
--- a/requirements.in
+++ b/requirements.in
@@ -2,6 +2,7 @@
 https://control.divio.com/api/v1/apps/serve/aldryn-addons/1.0.2/24f5d1c8-66fe-43b2-a540-17d61045a72b/aldryn-addons-1.0.2.tar.gz#egg=aldryn-addons==1.0.2
 https://control.divio.com/api/v1/apps/serve/aldryn-django/1.8.19.1/5dfa4420-e075-4377-a4b7-9feeaa3f5efb/aldryn-django-1.8.19.1.tar.gz#egg=aldryn-django==1.8.19.1
 https://control.divio.com/api/v1/apps/serve/aldryn-sso/1.1.16/dbe0c45a-c981-4beb-8624-b0d2c4196aa0/aldryn-sso-1.1.16.tar.gz#egg=aldryn-sso==1.1.16
+https://control.divio.com/api/v1/apps/serve/djangocms-file/2.0.2/f0e22a3c-8890-4013-93bc-02f0e937a570/djangocms-file-2.0.2.tar.gz#egg=djangocms-file==2.0.2
 https://control.divio.com/api/v1/apps/serve/djangocms-googlemap/1.1.0/829bcfeb-0edc-4074-9483-88c27410d154/djangocms-googlemap-1.1.0.tar.gz#egg=djangocms-googlemap==1.1.0
 https://control.divio.com/api/v1/apps/serve/djangocms-link/2.1.2/35b986c1-fafb-46ee-b665-aa36603f233a/djangocms-link-2.1.2.tar.gz#egg=djangocms-link==2.1.2
 https://control.divio.com/api/v1/apps/serve/djangocms-snippet/2.0.0/03734ae6-5d3e-44aa-8641-8f764dbced64/djangocms-snippet-2.0.0.tar.gz#egg=djangocms-snippet==2.0.0
diff --git a/settings.py b/settings.py
index 705653d..8e8fc1c 100644
--- a/settings.py
+++ b/settings.py
@@ -5,6 +5,7 @@ INSTALLED_ADDONS = [
     'aldryn-addons',
     'aldryn-django',
     'aldryn-sso',
+    'djangocms-file',
     'djangocms-googlemap',
     'djangocms-link',
     'djangocms-snippet',