diff --git a/addons/djangocms-page-meta/addon.json b/addons/djangocms-page-meta/addon.json
new file mode 100644
index 0000000..24d3f15
--- /dev/null
+++ b/addons/djangocms-page-meta/addon.json
@@ -0,0 +1,7 @@
+{
+    "installed-apps": [
+        "meta",
+        "djangocms_page_meta"
+    ],
+    "package-name": "djangocms-page-meta"
+}
\ No newline at end of file
diff --git a/addons/djangocms-page-meta/aldryn_config.py b/addons/djangocms-page-meta/aldryn_config.py
new file mode 100644
index 0000000..ad3a458
--- /dev/null
+++ b/addons/djangocms-page-meta/aldryn_config.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+try:
+    from divio_cli import forms
+except ImportError:
+    from aldryn_client import forms
+
+OBJECT_TYPES = (
+    ('', '----'),
+    ('Article', 'Article'),
+    ('Website', 'Website'),
+)
+
+PROTOCOLS = (
+    ('http', 'http'),
+    ('https', 'https'),
+)
+
+
+class Form(forms.BaseForm):
+    META_SITE_PROTOCOL = forms.SelectField(
+        'Site protocol',
+        choices=PROTOCOLS,
+    )
+    META_SITE_TYPE = forms.SelectField(
+        'Site type',
+        choices=OBJECT_TYPES,
+        required=False
+    )
+    META_SITE_NAME = forms.CharField('Site name', required=False)
+    META_USE_OG_PROPERTIES = forms.CheckboxField(
+        'Render the OpenGraph properties',
+        required=False
+    )
+    META_USE_TWITTER_PROPERTIES = forms.CheckboxField(
+        'Render the Twitter properties',
+        required=False
+    )
+    META_USE_GOOGLEPLUS_PROPERTIES = forms.CheckboxField(
+        'Render the Google properties',
+        required=False
+    )
+    PAGE_META_DESCRIPTION_LENGTH = forms.CharField(
+        'Max description field length (default: 320)',
+        required=False
+    )
+    PAGE_META_TWITTER_DESCRIPTION_LENGTH = forms.CharField(
+        'Max twitter description field length (default: 280)',
+        required=False
+    )
+
+    def to_settings(self, data, settings):
+        settings['META_SITE_PROTOCOL'] = data['META_SITE_PROTOCOL']
+        settings['META_SITE_TYPE'] = data['META_SITE_TYPE']
+        settings['META_SITE_NAME'] = data['META_SITE_NAME']
+        settings['META_INCLUDE_KEYWORDS'] = []
+        settings['META_DEFAULT_KEYWORDS'] = []
+        settings['META_USE_OG_PROPERTIES'] = data['META_USE_OG_PROPERTIES']
+        settings['META_USE_TWITTER_PROPERTIES'] = data['META_USE_TWITTER_PROPERTIES']
+        settings['META_USE_GOOGLEPLUS_PROPERTIES'] = data['META_USE_GOOGLEPLUS_PROPERTIES']
+        settings[
+            'PAGE_META_TWITTER_DESCRIPTION_LENGTH'
+        ] = data['PAGE_META_TWITTER_DESCRIPTION_LENGTH']
+        settings['PAGE_META_DESCRIPTION_LENGTH'] = data['PAGE_META_DESCRIPTION_LENGTH']
+        settings['META_USE_TITLE_TAG'] = False
+        settings['META_USE_SITES'] = True
+        return settings
diff --git a/addons/djangocms-page-meta/settings.json b/addons/djangocms-page-meta/settings.json
new file mode 100644
index 0000000..fdb78cc
--- /dev/null
+++ b/addons/djangocms-page-meta/settings.json
@@ -0,0 +1,10 @@
+{
+    "META_SITE_NAME": "Tagesschule Elementa Zug",
+    "META_SITE_PROTOCOL": "https",
+    "META_SITE_TYPE": "Website",
+    "META_USE_GOOGLEPLUS_PROPERTIES": true,
+    "META_USE_OG_PROPERTIES": true,
+    "META_USE_TWITTER_PROPERTIES": true,
+    "PAGE_META_DESCRIPTION_LENGTH": "",
+    "PAGE_META_TWITTER_DESCRIPTION_LENGTH": ""
+}
\ No newline at end of file
diff --git a/requirements.in b/requirements.in
index 05a9001..79da011 100644
--- a/requirements.in
+++ b/requirements.in
@@ -7,6 +7,7 @@ https://control.divio.com/api/v1/apps/serve/aldryn-forms/4.0.1/099d84c4-390a-4c5
 https://control.divio.com/api/v1/apps/serve/aldryn-haystack/0.5.1/bf04cc01-9855-4659-843e-05379cec9ac6/aldryn-haystack-0.5.1.tar.gz#egg=aldryn-haystack==0.5.1
 https://control.divio.com/api/v1/apps/serve/djangocms-history/1.0.0/9ced0786-b47c-4df1-8794-6654d618d753/djangocms-history-1.0.0.tar.gz#egg=djangocms-history==1.0.0
 https://control.divio.com/api/v1/apps/serve/djangocms-link/2.3.1/0259f5df-efa1-4a00-87f8-c7cfbe873388/djangocms-link-2.3.1.tar.gz#egg=djangocms-link==2.3.1
+https://control.divio.com/api/v1/apps/serve/djangocms-page-meta/0.8.5/fa37542a-931b-43f3-80db-78945ad10c52/djangocms-page-meta-0.8.5.tar.gz#egg=djangocms-page-meta==0.8.5
 https://control.divio.com/api/v1/apps/serve/djangocms-picture/2.1.3/ba08d3d9-6bdb-4e48-b8c5-8b70f762685e/djangocms-picture-2.1.3.tar.gz#egg=djangocms-picture==2.1.3
 https://control.divio.com/api/v1/apps/serve/djangocms-text-ckeditor/3.7.0/a61a9c3c-a1a5-41aa-b996-8e5451701b5b/djangocms-text-ckeditor-3.7.0.tar.gz#egg=djangocms-text-ckeditor==3.7.0
 https://control.divio.com/api/v1/apps/serve/django-filer/1.4.1/e7e860ea-0af6-4fc8-95e1-ad2580ba0bac/django-filer-1.4.1.tar.gz#egg=django-filer==1.4.1
diff --git a/settings.py b/settings.py
index 4518502..affb707 100644
--- a/settings.py
+++ b/settings.py
@@ -12,6 +12,7 @@ INSTALLED_ADDONS = [
     'aldryn-haystack',
     'djangocms-history',
     'djangocms-link',
+    'djangocms-page-meta',
     'djangocms-picture',
     'djangocms-text-ckeditor',
     'django-filer',