diff --git a/docs/api/frontends.rst b/docs/api/frontends.rst
index 792e4bc9..dc53cca2 100644
--- a/docs/api/frontends.rst
+++ b/docs/api/frontends.rst
@@ -28,3 +28,4 @@ Frontend implementations
* :mod:`mopidy.frontends.lastfm`
* :mod:`mopidy.frontends.mpd`
+* :mod:`mopidy.frontends.mpris`
diff --git a/docs/changes.rst b/docs/changes.rst
index f0a546af..f2211dab 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -28,6 +28,11 @@ v0.6.0 (in development)
- The MPD command ``idle`` is now supported by Mopidy for the following
subsystems: player, playlist, options, and mixer. (Fixes: :issue:`32`)
+- A new frontend :mod:`mopidy.frontends.mpris` have been added. It exposes
+ Mopidy through the `MPRIS interface `_ over D-Bus. In
+ practice, this makes it possible to control Mopidy thorugh the `Ubuntu Sound
+ Menu `_.
+
**Changes**
- Replace :attr:`mopidy.backends.base.Backend.uri_handlers` with
diff --git a/docs/modules/frontends/mpris.rst b/docs/modules/frontends/mpris.rst
new file mode 100644
index 00000000..05a6e287
--- /dev/null
+++ b/docs/modules/frontends/mpris.rst
@@ -0,0 +1,7 @@
+***********************************************
+:mod:`mopidy.frontends.mpris` -- MPRIS frontend
+***********************************************
+
+.. automodule:: mopidy.frontends.mpris
+ :synopsis: MPRIS frontend
+ :members:
diff --git a/docs/settings.rst b/docs/settings.rst
index 24d9b0bd..76eb6315 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -92,7 +92,6 @@ To make a ``tag_cache`` of your local music available for Mopidy:
.. _use_mpd_on_a_network:
-
Connecting from other machines on the network
=============================================
@@ -120,6 +119,8 @@ file::
LASTFM_PASSWORD = u'mysecret'
+.. _install_desktop_file:
+
Controlling Mopidy through the Ubuntu Sound Menu
================================================
@@ -139,10 +140,10 @@ After you have installed the file, start Mopidy in any way, and Mopidy should
appear in the Ubuntu Sound Menu. When you quit Mopidy, it will still be listed
in the Ubuntu Sound Menu, and may be restarted by selecting it there.
-The Ubuntu Sound Menu interacts with Mopidy's MPRIS frontend.
-The MPRIS frontend supports the minimum requirements of the `MPRIS
-specification `_. The ``TrackList`` and the
-``Playlists`` interfaces of the spec are not supported.
+The Ubuntu Sound Menu interacts with Mopidy's MPRIS frontend,
+:mod:`mopidy.frontends.mpris`. The MPRIS frontend supports the minimum
+requirements of the `MPRIS specification `_. The
+``TrackList`` and the ``Playlists`` interfaces of the spec are not supported.
Streaming audio through a SHOUTcast/Icecast server
diff --git a/mopidy/frontends/mpris/__init__.py b/mopidy/frontends/mpris/__init__.py
index 4e52fd79..c68d5139 100644
--- a/mopidy/frontends/mpris/__init__.py
+++ b/mopidy/frontends/mpris/__init__.py
@@ -18,18 +18,22 @@ from mopidy.listeners import BackendListener
class MprisFrontend(ThreadingActor, BackendListener):
"""
Frontend which lets you control Mopidy through the Media Player Remote
- Interfacing Specification (MPRIS) D-Bus interface.
+ Interfacing Specification (`MPRIS `_) D-Bus
+ interface.
- An example of an MPRIS client is `Ubuntu's sound menu
+ An example of an MPRIS client is the `Ubuntu Sound Menu
`_.
**Dependencies:**
- - ``dbus`` Python bindings. The package is named ``python-dbus`` in
+ - D-Bus Python bindings. The package is named ``python-dbus`` in
Ubuntu/Debian.
- ``libindicate`` Python bindings is needed to expose Mopidy in e.g. the
Ubuntu Sound Menu. The package is named ``python-indicate`` in
Ubuntu/Debian.
+ - An ``.desktop`` file for Mopidy installed at the path set in
+ :attr:`mopidy.settings.DESKTOP_FILE`. See :ref:`install_desktop_file` for
+ details.
**Testing the frontend**