diff --git a/addons/aldryn-haystack/addon.json b/addons/aldryn-haystack/addon.json
new file mode 100644
index 0000000..b008cb9
--- /dev/null
+++ b/addons/aldryn-haystack/addon.json
@@ -0,0 +1,4 @@
+{
+    "installed-apps": [], 
+    "package-name": "aldryn-haystack"
+}
\ No newline at end of file
diff --git a/addons/aldryn-haystack/aldryn_config.py b/addons/aldryn-haystack/aldryn_config.py
new file mode 100644
index 0000000..85f7ce6
--- /dev/null
+++ b/addons/aldryn-haystack/aldryn_config.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+from functools import partial
+from aldryn_client import forms
+
+
+class Form(forms.BaseForm):
+
+    def to_settings(self, data, settings):
+        from aldryn_addons.utils import djsenv, boolean_ish
+        from aldryn_haystack import haystack_url
+        s = settings
+        env = partial(djsenv, settings=settings)
+
+        s['DEFAULT_HAYSTACK_URL'] = env('DEFAULT_HAYSTACK_URL')
+
+        if env('DJANGO_MODE') == 'build':
+            s['HAYSTACK_CONNECTIONS'] = {
+                'default': {
+                    'ENGINE': 'haystack.backends.simple_backend.SimpleEngine',
+                }
+            }
+            return s
+
+        if not s['DEFAULT_HAYSTACK_URL']:
+            return s
+
+        s['ALDRYN_HAYSTACK_DEBUG'] = boolean_ish(
+            env('ALDRYN_HAYSTACK_DEBUG', False))
+
+        s['DEFAULT_HAYSTACK_URL'] = env('DEFAULT_HAYSTACK_URL')
+        s.setdefault('HAYSTACK_CONNECTIONS', {})
+        s['HAYSTACK_CONNECTIONS']['default'] = haystack_url.parse(
+            url=s['DEFAULT_HAYSTACK_URL']
+        )
+
+        s['INSTALLED_APPS'].append('haystack')
+
+        if s['ALDRYN_HAYSTACK_DEBUG']:
+            s['LOGGING']['loggers']['elasticsearch.trace'] = {
+                'handlers': ['console'],
+                'level': 'INFO',
+            }
+        return s
diff --git a/addons/aldryn-haystack/settings.json b/addons/aldryn-haystack/settings.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/addons/aldryn-haystack/settings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/requirements.in b/requirements.in
index 9dcbebb..4697357 100644
--- a/requirements.in
+++ b/requirements.in
@@ -5,6 +5,7 @@ https://control.divio.com/api/v1/apps/serve/aldryn-sso/1.1.16/dbe0c45a-c981-4beb
 https://control.divio.com/api/v1/apps/serve/aldryn-django-cms/3.5.2.2/88bf7991-90a3-4c98-acf5-42c3fa14e2a4/aldryn-django-cms-3.5.2.2.tar.gz#egg=aldryn-django-cms==3.5.2.2
 https://control.divio.com/api/v1/apps/serve/aldryn-forms/3.0.3/d6a05ca0-134c-495f-98c0-0faaf3bdfd3b/aldryn-forms-3.0.3.tar.gz#egg=aldryn-forms==3.0.3
 https://control.divio.com/api/v1/apps/serve/aldryn-google-analytics/1.0.1/9fa37058-cd43-418c-9e06-b81c17b6bdfb/aldryn-google-analytics-1.0.1.tar.gz#egg=aldryn-google-analytics==1.0.1
+https://control.divio.com/api/v1/apps/serve/aldryn-haystack/0.4/e44307e9-b2bd-43c2-8e1b-6b88d9b7e492/aldryn-haystack-0.4.tar.gz#egg=aldryn-haystack==0.4
 https://control.divio.com/api/v1/apps/serve/djangocms-history/0.5.3/05803675-6e8d-4637-b14b-1bb8d18b24b3/djangocms-history-0.5.3.tar.gz#egg=djangocms-history==0.5.3
 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-picture/2.0.6/005e8663-d1cc-4667-936c-30709edad076/djangocms-picture-2.0.6.tar.gz#egg=djangocms-picture==2.0.6
diff --git a/settings.py b/settings.py
index 83f6dcc..2bbf8a8 100644
--- a/settings.py
+++ b/settings.py
@@ -10,6 +10,7 @@ INSTALLED_ADDONS = [
     'aldryn-django-cms',
     'aldryn-forms',
     'aldryn-google-analytics',
+    'aldryn-haystack',
     'djangocms-history',
     'djangocms-link',
     'djangocms-picture',