diff --git a/docs/api/backends.rst b/docs/api/backends.rst
index e099fbf8..0db463f5 100644
--- a/docs/api/backends.rst
+++ b/docs/api/backends.rst
@@ -62,8 +62,10 @@ Other backends
     :members:
 
 
-GStreamer backend
------------------
+:mod:`mopidy.backends.gstreamer` -- GStreamer backend
+-----------------------------------------------------
 
-``GstreamerBackend`` is pending merge from `adamcik/mopidy/gstreamer
-<http://github.com/adamcik/mopidy/tree/gstreamer>`_.
+.. automodule:: mopidy.backends.gstreamer
+    :synopsis: Backend for playing music from a local music archive using the
+        GStreamer library.
+    :members:
diff --git a/docs/changes.rst b/docs/changes.rst
index 54cd8b1f..f0953d7a 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -7,7 +7,10 @@ This change log is used to track all major changes to Mopidy.
 0.1.0a1 (unreleased)
 ====================
 
-- Changed backend API for get/filter/find_exact/search.
+- Merged the ``gstreamer`` branch from Thomas Adamcik, bringing more than a
+  hundred new tests, several bugfixes and a new backend for playing music from
+  a local music archive.
+- **[WIP]** Changed backend API for get/filter/find_exact/search.
 
 
 0.1.0a0 (2010-03-27)
diff --git a/docs/development/roadmap.rst b/docs/development/roadmap.rst
index b9a5cc02..ee074eee 100644
--- a/docs/development/roadmap.rst
+++ b/docs/development/roadmap.rst
@@ -24,9 +24,8 @@ Stuff we really want to do, but just not right now
 - Replace libspotify with `openspotify
   <http://github.com/noahwilliamsson/openspotify>`_ for the
   ``LibspotifyBackend``.
-- A backend for playback from local disk. Quite a bit of work on a `gstreamer
-  <http://gstreamer.freedesktop.org/>`_ backend has already been done by Thomas
-  Adamcik.
+- **[WIP]** A backend for playback from local disk. Quite a bit of work on
+  :mod:`mopidy.backends.gstreamer` has already been done by Thomas Adamcik.
 - Support multiple backends at the same time. It would be really nice to have
   tracks from local disk and Spotify tracks in the same playlist.
 - **[Done]** Package Mopidy as a `Python package
diff --git a/mopidy/backends/gstreamer.py b/mopidy/backends/gstreamer.py
index 1e84af57..25c6cca7 100644
--- a/mopidy/backends/gstreamer.py
+++ b/mopidy/backends/gstreamer.py
@@ -21,6 +21,12 @@ GStreamerMessages().start()
 
 
 class GStreamerBackend(BaseBackend):
+    """
+    A backend for playing music from a local music archive.
+
+    Uses the `GStreamer <http://gstreamer.freedesktop.org/>`_ library.
+    """
+
     def __init__(self, *args, **kwargs):
         super(GStreamerBackend, self).__init__(*args, **kwargs)
 
@@ -93,6 +99,7 @@ class GStreamerPlaybackController(BasePlaybackController):
         bus.remove_signal_watch()
         bin.get_state()
         bin.set_state(gst.STATE_NULL)
+        bus.set_flushing(True)
 
         del bus
         del bin