diff --git a/doc/upgrade.rst b/doc/upgrade.rst
index 6ccf12a03..f13462c34 100644
--- a/doc/upgrade.rst
+++ b/doc/upgrade.rst
@@ -130,6 +130,27 @@ Rebuild Virtual Environment
 Specific instructions
 *********************
 
+Version 2.6.0
+=============
+
+New built-in auto-configuration service.
+
+Required changes to :file:`settings.py`
+---------------------------------------
+
+- Add the following line to ``MODOBOA_APPS`` variable:
+
+  .. sourcecode:: python
+
+     'modoboa.autoconfig'
+
+- Add the following hostnames to ``ALLOWED_HOSTS`` variable:
+
+  .. sourcecode:: python
+
+     'autoconfig.<MY DOMAIN>',
+     'autodiscover.<MY DOMAIN>',
+
 Version 2.5.0
 =============
 
diff --git a/modoboa/autoconfig/tests.py b/modoboa/autoconfig/tests.py
index 6dbe76419..f10f5cf11 100644
--- a/modoboa/autoconfig/tests.py
+++ b/modoboa/autoconfig/tests.py
@@ -4,6 +4,8 @@ from django.urls import reverse
 
 class ViewsTestCase(TestCase):
 
+    databases = "__all__"
+
     def test_autoconfig(self):
         url = reverse("autoconfig:autoconfig")
 
diff --git a/modoboa/autoconfig/urls.py b/modoboa/autoconfig/urls.py
index 227fbf2fd..b53299dc1 100644
--- a/modoboa/autoconfig/urls.py
+++ b/modoboa/autoconfig/urls.py
@@ -8,7 +8,7 @@ app_name = "autoconfig"
 
 urlpatterns = [
     path(
-        ".well-known/autoconfig/mail/config-v1.1.xml",
+        "mail/config-v1.1.xml",
         views.AutoConfigView.as_view(),
         name="autoconfig",
     ),
diff --git a/modoboa/autoconfig/views.py b/modoboa/autoconfig/views.py
index 2bb99e958..630096612 100644
--- a/modoboa/autoconfig/views.py
+++ b/modoboa/autoconfig/views.py
@@ -58,7 +58,6 @@ class AutoDiscoverView(ConfigBaseMixin, generic.TemplateView):
 
 class MobileConfigView(generic.View):
 
-    databases = "__all__"
     http_method_names = ["get"]
 
     def get(self, request, *args, **kwargs):