diff --git a/docs/plugins/echonest_tempo.rst b/docs/plugins/echonest_tempo.rst
index 13fbe9339..5517654c4 100644
--- a/docs/plugins/echonest_tempo.rst
+++ b/docs/plugins/echonest_tempo.rst
@@ -1,8 +1,8 @@
 EchoNest Tempo Plugin
 =====================
 
-*Note*:  A new plugin :doc:`echonest` is available, that in addition to
-``tempo`` also fetches `Acoustic Attributes`_ from the EchoNest.
+*Note*:  A new :doc:`echonest` is available, that in addition to ``tempo``
+also fetches `Acoustic Attributes`_ from the EchoNest.
 
 The ``echonest_tempo`` plugin fetches and stores a track's tempo (the "bpm"
 field) from the `EchoNest API`_
diff --git a/docs/plugins/index.rst b/docs/plugins/index.rst
index 2ee0fcd15..a71bcae6f 100644
--- a/docs/plugins/index.rst
+++ b/docs/plugins/index.rst
@@ -69,8 +69,8 @@ Metadata
 
 * :doc:`lyrics`: Automatically fetch song lyrics.
 * :doc:`echonest_tempo`: Automatically fetch song tempos (bpm).
-* :doc:`echonest`: Automatically fetch metadata from EchoNest (energy,
-  danceability, ...).
+* :doc:`echonest`: Automatically fetch `Acoustic Attributes`_ from
+  `the Echo Nest`_ (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.
@@ -81,6 +81,9 @@ Metadata
 * :doc:`ftintitle`: Move "featured" artists from the artist field to the title
   field.
 
+.. _Acoustic Attributes: http://developer.echonest.com/acoustic-attributes.html
+.. _the Echo Nest: http://www.echonest.com
+
 Path Formats
 ------------