diff --git a/README.rst b/README.rst
index b572cdab..f667b7db 100644
--- a/README.rst
+++ b/README.rst
@@ -2,18 +2,16 @@
 Mopidy
 ******
 
-.. image:: https://secure.travis-ci.org/mopidy/mopidy.png?branch=develop
+Mopidy is a music server which can play music both from multiple sources, like
+your local hard drive, radio streams, and from Spotify and SoundCloud. Searches
+combines results from all music sources, and you can mix tracks from all
+sources in your play queue. Your playlists from Spotify or SoundCloud are also
+available for use.
 
-Mopidy is a music server which can play music both from your local hard drive
-and from Spotify. 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 can control UPnP
-MediaRenderers, or any MPD client. MPD clients are available for most
-platforms, including Windows, Mac OS X, Linux, Android and iOS.
+To control your Mopidy music server, you can use one of Mopidy's web clients,
+the Ubuntu Sound Menu, any device on the same network which can control UPnP
+MediaRenderers, or any MPD client. MPD clients are available for many
+platforms, including Windows, OS X, Linux, Android and iOS.
 
 To get started with Mopidy, check out `the docs <http://docs.mopidy.com/>`_.
 
@@ -21,6 +19,10 @@ To get started with Mopidy, check out `the docs <http://docs.mopidy.com/>`_.
 - `Source code <https://github.com/mopidy/mopidy>`_
 - `Issue tracker <https://github.com/mopidy/mopidy/issues>`_
 - `CI server <https://travis-ci.org/mopidy/mopidy>`_
+- `Download development snapshot <https://github.com/mopidy/mopidy/tarball/develop#egg=mopidy-dev>`_
+
 - IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_
 - Mailing list: `mopidy@googlegroups.com <https://groups.google.com/forum/?fromgroups=#!forum/mopidy>`_
-- `Download development snapshot <https://github.com/mopidy/mopidy/tarball/develop#egg=mopidy-dev>`_
+- Twitter: `@mopidy <https://twitter.com/mopidy/>`_
+
+.. image:: https://secure.travis-ci.org/mopidy/mopidy.png?branch=develop
diff --git a/docs/index.rst b/docs/index.rst
index 6b883b8e..5485f33f 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 :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.
+Mopidy is a music server which can play music both from multiple sources, like
+your :ref:`local hard drive <local-backend>`, :ref:`radio streams
+<stream-backend>`, and from :ref:`Spotify <spotify-backend>` and SoundCloud.
+Searches combines results from all music sources, and you can mix tracks from
+all sources in your play queue. Your playlists from Spotify or SoundCloud are
+also available for use.
 
-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 can control UPnP MediaRenderers (see :ref:`upnp-clients`), or any
-:ref:`MPD client <mpd-clients>`. MPD clients are available for most platforms,
-including Windows, Mac OS X, Linux, Android, and iOS.
+To control your Mopidy music server, you can use one of Mopidy's :ref:`web
+clients <http-clients>`, the :ref:`Ubuntu Sound Menu <ubuntu-sound-menu>`, any
+device on the same network which can control :ref:`UPnP MediaRenderers
+<upnp-clients>`, or any :ref:`MPD client <mpd-clients>`. MPD clients are
+available for many platforms, including Windows, OS X, Linux, Android and iOS.
 
 To get started with Mopidy, start by reading :ref:`installation`.
 
@@ -21,7 +22,9 @@ If you get stuck, we usually hang around at ``#mopidy`` at `irc.freenode.net
 <https://groups.google.com/forum/?fromgroups=#!forum/mopidy>`_. If you stumble
 into a bug or got a feature request, please create an issue in the `issue
 tracker <https://github.com/mopidy/mopidy/issues>`_. The `source code
-<https://github.com/mopidy/mopidy>`_ may also be of help.
+<https://github.com/mopidy/mopidy>`_ may also be of help. If you want to stay
+up to date on Mopidy developments, you can follow `@mopidy
+<https://twitter.com/mopidy/>`_ on Twitter.
 
 
 Introduction
diff --git a/docs/modules/backends/stream.rst b/docs/modules/backends/stream.rst
index 73e53048..2843a7e9 100644
--- a/docs/modules/backends/stream.rst
+++ b/docs/modules/backends/stream.rst
@@ -1,3 +1,5 @@
+.. _stream-backend:
+
 ***********************************************
 :mod:`mopidy.backends.stream` -- Stream backend
 ***********************************************