diff --git a/README.rst b/README.rst
index 4f31fb59..c063de79 100644
--- a/README.rst
+++ b/README.rst
@@ -6,14 +6,15 @@ Mopidy is a music server which can play music from `Spotify
 <http://www.spotify.com/>`_ or from your local hard drive. To search for music
 in Spotify's vast archive, manage playlists, and play music, you can use most
 `MPD clients <http://mpd.wikia.com/>`_. MPD clients are available for most
-platforms, including Windows, Mac OS X, Linux, and iPhone and Android phones.
+platforms, including Windows, Mac OS X, Linux, Android and iOS.
 
 To install Mopidy, check out
 `the installation docs <http://www.mopidy.com/docs/master/installation/>`_.
 
-* `Documentation (latest release) <http://www.mopidy.com/docs/master/>`_
-* `Documentation (development version) <http://www.mopidy.com/docs/develop/>`_
-* `Source code <http://github.com/mopidy/mopidy>`_
-* `Issue tracker <http://github.com/mopidy/mopidy/issues>`_
-* IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_
-* `Download development snapshot <http://github.com/mopidy/mopidy/tarball/develop#egg=mopidy-dev>`_
+- `Documentation for the latest release <http://www.mopidy.com/docs/master/>`_
+- `Documentation for the development version
+  <http://www.mopidy.com/docs/develop/>`_
+- `Source code <http://github.com/mopidy/mopidy>`_
+- `Issue tracker <http://github.com/mopidy/mopidy/issues>`_
+- IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_
+- `Download development snapshot <http://github.com/mopidy/mopidy/tarball/develop#egg=mopidy-dev>`_
diff --git a/docs/index.rst b/docs/index.rst
index 09029a4f..0af45835 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,4 +1,31 @@
-.. include:: ../README.rst
+******
+Mopidy
+******
+
+Mopidy is a music server which can play music from `Spotify
+<http://www.spotify.com/>`_ or from your local hard drive. To search for music
+in Spotify's vast archive, manage playlists, and play music, you can use most
+`MPD clients <http://mpd.wikia.com/>`_. MPD clients are available for most
+platforms, including Windows, Mac OS X, Linux, Android, and iOS.
+
+To install Mopidy, start out by reading :ref:`installation`.
+
+If you get stuck, we usually hang around at ``#mopidy`` at `irc.freenode.net
+<http://freenode.net/>`_. If you stumble into a bug or got a feature request,
+please create an issue in the `issue tracker
+<http://github.com/mopidy/mopidy/issues>`_.
+
+
+Project resources
+=================
+
+- `Documentation for the latest release <http://www.mopidy.com/docs/master/>`_
+- `Documentation for the development version
+  <http://www.mopidy.com/docs/develop/>`_
+- `Source code <http://github.com/mopidy/mopidy>`_
+- `Issue tracker <http://github.com/mopidy/mopidy/issues>`_
+- IRC: ``#mopidy`` at `irc.freenode.net <http://freenode.net/>`_
+
 
 User documentation
 ==================
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index 26b50994..56f0015b 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -1,3 +1,5 @@
+.. _installation:
+
 ************
 Installation
 ************