--- a/src/iconolab_mcc/settings/__init__.py	Wed May 23 12:42:37 2018 +0200
+++ b/src/iconolab_mcc/settings/__init__.py	Tue Jun 05 11:34:52 2018 +0200
@@ -54,7 +54,7 @@
     'django.contrib.humanize',
     'django_comments',
     'django_comments_xtd',
-    'haystack',
+    'django_elasticsearch_dsl',
     'sorl.thumbnail',
     'notifications',
 ]

--- a/src/iconolab_mcc/settings/dev.py.tmpl	Wed May 23 12:42:37 2018 +0200
+++ b/src/iconolab_mcc/settings/dev.py.tmpl	Tue Jun 05 11:34:52 2018 +0200
@@ -171,21 +171,12 @@
     }
 }
 
-# Haystack configuration
-
-# Haystack only supports ElasticSearch 1.x
-# http://django-haystack.readthedocs.io/en/v2.5.1/installing_search_engines.html#elasticsearch
-
-HAYSTACK_CONNECTIONS = {
+ELASTICSEARCH_DSL={
     'default': {
-        'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',
-        'URL': 'http://127.0.0.1:9200/',
-        'INDEX_NAME': 'haystack',
+        'hosts': 'localhost:9200'
     },
 }
 
-# HAYSTACK_SIGNAL_PROCESSOR = 'iconolab.search_indexes.signals.RevisionSignalProcessor'
-
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',

--- a/src/requirements/base.txt	Wed May 23 12:42:37 2018 +0200
+++ b/src/requirements/base.txt	Tue Jun 05 11:34:52 2018 +0200
@@ -1,7 +1,9 @@
-Django==2.0.5
+Django==2.0.6
+django-appconf==1.0.2
 django-comments-xtd==2.1.0
 django-contrib-comments==1.8.0
-django-haystack==2.8.1
+elasticsearch-dsl==6.1.0
+django-elasticsearch-dsl==0.5.0
 #django-notifications-hq==1.4.0a0
 git+https://github.com/django-notifications/django-notifications.git#egg=django-notifications-hq
 djangorestframework==3.8.2