diff --git a/docs/plugins/echonest.rst b/docs/plugins/echonest.rst
index f9d44c86e..361657dbe 100644
--- a/docs/plugins/echonest.rst
+++ b/docs/plugins/echonest.rst
@@ -1,5 +1,5 @@
-Echonest Plugin
-===============
+Echo Nest Plugin
+================
 
 The ``echonest`` plugin fetches `acoustic attributes`_ from `the Echo Nest`_.
 It automatically fills in the following attributes:
@@ -85,4 +85,4 @@ Echoprint or ENMFP codegen binary. Use the ``codegen`` key under the
     echonest:
         codegen: /usr/bin/echoprint-codegen
 
-.. _apply for your own: http://developer.echonest.com/account/register
\ No newline at end of file
+.. _apply for your own: http://developer.echonest.com/account/register
diff --git a/docs/plugins/echonest_tempo.rst b/docs/plugins/echonest_tempo.rst
index 5517654c4..2436044ab 100644
--- a/docs/plugins/echonest_tempo.rst
+++ b/docs/plugins/echonest_tempo.rst
@@ -1,14 +1,17 @@
 EchoNest Tempo Plugin
 =====================
 
-*Note*:  A new :doc:`echonest` is available, that in addition to ``tempo``
-also fetches `Acoustic Attributes`_ from the EchoNest.
+.. note::
+
+  A newer :doc:`echonest` is available that supersedes this plugin. In
+  addition to the tempo, the new plugin can fetch the Echo Nest's full
+  complement of acoustic attributes. This older tempo-specific plugin is
+  **deprecated**.
 
 The ``echonest_tempo`` plugin fetches and stores a track's tempo (the "bpm"
-field) from the `EchoNest API`_
+field) from the `Echo Nest API`_.
 
-.. _EchoNest API: http://developer.echonest.com/
-.. _Acoustic Attributes: http://developer.echonest.com/acoustic-attributes.html
+.. _Echo Nest API: http://developer.echonest.com/
 
 Installing Dependencies
 -----------------------
diff --git a/docs/plugins/index.rst b/docs/plugins/index.rst
index c0061789f..217a36e0b 100644
--- a/docs/plugins/index.rst
+++ b/docs/plugins/index.rst
@@ -58,7 +58,6 @@ Autotagger Extensions
 * :doc:`chroma`: Use acoustic fingerprinting to identify audio files with
   missing or incorrect metadata.
 * :doc:`discogs`: Search for releases in the `Discogs`_ database.
-* :doc:`beatport`: Search for tracks and releases in the `Beatport`_ database.
 * :doc:`fromfilename`: Guess metadata for untagged tracks from their
   filenames.
 
@@ -69,9 +68,8 @@ Metadata
 --------
 
 * :doc:`lyrics`: Automatically fetch song lyrics.
-* :doc:`echonest_tempo`: Automatically fetch song tempos (bpm).
-* :doc:`echonest`: Automatically fetch `Acoustic Attributes`_ from
-  `the Echo Nest`_ (energy, danceability, ...).
+* :doc:`echonest`: Automatically fetch `acoustic attributes`_ from
+  `the Echo Nest`_ (tempo, energy, danceability, ...).
 * :doc:`lastgenre`: Fetch genres based on Last.fm tags.
 * :doc:`mbsync`: Fetch updated metadata from MusicBrainz
 * :doc:`fetchart`: Fetch album cover art from various sources.