diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c5c0ee011b..b36af8117f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -20,6 +20,7 @@ Changelog
  * Added support for showing `non_field_errors` when validation fails in the page editor (Matt Westcott)
  * Added `WAGTAILADMIN_RECENT_EDITS_LIMIT` setting to to define the number of your most recent edits on the dashboard (Maarten Kling)
  * Creating / editing users through the Wagtail admin no longer modifies the `is_staff` flag (Matt Westcott)
+ * Added link to the full Elasticsearch setup documentation from the Performance page (Matt Westcott)
  * Fix: Marked 'Date from' / 'Date to' strings in wagtailforms for translation (Vorlif)
  * Fix: "File" field label on image edit form is now translated (Stein Strindhaug)
  * Fix: Unreliable preview is now reliable by always opening in a new window (Kjartan Sverrisson)
diff --git a/docs/advanced_topics/performance.rst b/docs/advanced_topics/performance.rst
index 4bb8d8bc93..0dc737e6f6 100644
--- a/docs/advanced_topics/performance.rst
+++ b/docs/advanced_topics/performance.rst
@@ -33,28 +33,7 @@ Search
 
 Wagtail has strong support for `Elasticsearch <http://www.elasticsearch.org/>`_ - both in the editor interface and for users of your site - but can fall back to a database search if Elasticsearch isn't present. Elasticsearch is faster and more powerful than the Django ORM for text search, so we recommend installing it or using a hosted service like `Searchly <http://www.searchly.com/>`_.
 
-Once the Elasticsearch server is installed and running. Install the ``elasticsearch`` Python module with:
-
-.. code-block:: console
-
-    $ pip install elasticsearch
-
-then add the following to your settings:
-
-.. code-block:: python
-
-    WAGTAILSEARCH_BACKENDS = {
-        'default': {
-            'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch',
-            'INDEX': '{{ project_name }}',
-        },
-    }
-
-Once Elasticsearch is configured, you can index any existing content you may have:
-
-.. code-block:: console
-
-    $ ./manage.py update_index
+For details on configuring Wagtail for Elasticsearch, see :ref:`wagtailsearch_backends_elasticsearch`.
 
 
 Database
diff --git a/docs/releases/1.10.rst b/docs/releases/1.10.rst
index 239ee6869e..ad82fd4911 100644
--- a/docs/releases/1.10.rst
+++ b/docs/releases/1.10.rst
@@ -27,6 +27,7 @@ Other features
  * User creation / edit form now enforces password validators set in ``AUTH_PASSWORD_VALIDATORS`` (Bertrand Bordage)
  * Added support for displaying ``non_field_errors`` when validation fails in the page editor (Matt Westcott)
  * Added `WAGTAILADMIN_RECENT_EDITS_LIMIT` setting to to define the number of your most recent edits on the dashboard (Maarten Kling)
+ * Added link to the full Elasticsearch setup documentation from the Performance page (Matt Westcott)
 
 
 Bug fixes