diff --git a/docs/clients/dlna.rst b/docs/clients/dlna.rst
new file mode 100644
index 00000000..e1eeddd2
--- /dev/null
+++ b/docs/clients/dlna.rst
@@ -0,0 +1,15 @@
+.. _dlna-clients:
+
+************
+DLNA clients
+************
+
+TODO
+
+
+.. _rygel:
+
+Exposing Mopidy over DLNA using Rygel
+=====================================
+
+TODO
diff --git a/docs/clients/mpd.rst b/docs/clients/mpd.rst
index 6949e506..17282d8c 100644
--- a/docs/clients/mpd.rst
+++ b/docs/clients/mpd.rst
@@ -1,6 +1,8 @@
-************************
-MPD client compatability
-************************
+.. _mpd-clients:
+
+***********
+MPD clients
+***********
 
 This is a list of MPD clients we either know works well with Mopidy, or that we
 know won't work well. For a more exhaustive list of MPD clients, see
diff --git a/docs/clients/mpris.rst b/docs/clients/mpris.rst
new file mode 100644
index 00000000..b57cd0b9
--- /dev/null
+++ b/docs/clients/mpris.rst
@@ -0,0 +1,15 @@
+.. _mpris-clients:
+
+*************
+MPRIS clients
+*************
+
+TODO
+
+
+.. _ubuntu-sound-menu:
+
+Ubuntu Sound Menu
+=================
+
+TODO
diff --git a/docs/index.rst b/docs/index.rst
index c86c3f0d..2dc29590 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -2,17 +2,18 @@
 Mopidy
 ******
 
-Mopidy is a music server which can play music both from your local hard drive
-and from `Spotify <http://www.spotify.com/>`_. Searches returns results from
-both your local hard drive and from Spotify, and you can mix tracks from both
-sources in your play queue. Your Spotify playlists are also available for use,
-though we don't support modifying them yet.
+Mopidy is a music server which can play music both from your :ref:`local hard
+drive <local-backend>` and from :ref:`Spotify <spotify-backend>`. Searches
+returns results from both your local hard drive and from Spotify, and you can
+mix tracks from both sources in your play queue. Your Spotify playlists are
+also available for use, though we don't support modifying them yet.
 
-To control your music server, you can use the Ubuntu Sound Menu on the machine
-running Mopidy, any device on the same network which supports the DLNA media
-controller spec (with the help of Rygel in addition to Mopidy), or any `MPD
-client <http://mpd.wikia.com/>`_. MPD clients are available for most platforms,
-including Windows, Mac OS X, Linux, Android and iOS.
+To control your music server, you can use the :ref:`Ubuntu Sound Menu
+<ubuntu-sound-menu>` on the machine running Mopidy, any device on the same
+network which supports the :ref:`DLNA <dlna-clients>` media controller spec
+(with the help of :ref:`Rygel <rygel>` in addition to Mopidy), or any :ref:`MPD
+client <mpd-clients>`. MPD clients are available for most platforms, including
+Windows, Mac OS X, Linux, Android and iOS.
 
 To install Mopidy, start by reading :ref:`installation`.
 
diff --git a/docs/modules/backends/local.rst b/docs/modules/backends/local.rst
index b4ab7d49..9ac93bc8 100644
--- a/docs/modules/backends/local.rst
+++ b/docs/modules/backends/local.rst
@@ -1,3 +1,5 @@
+.. _local-backend:
+
 *********************************************
 :mod:`mopidy.backends.local` -- Local backend
 *********************************************
diff --git a/docs/modules/backends/spotify.rst b/docs/modules/backends/spotify.rst
index e724da27..b410f272 100644
--- a/docs/modules/backends/spotify.rst
+++ b/docs/modules/backends/spotify.rst
@@ -1,3 +1,5 @@
+.. _spotify-backend:
+
 *************************************************
 :mod:`mopidy.backends.spotify` -- Spotify backend
 *************************************************