diff --git a/docs/ext/backends.rst b/docs/ext/backends.rst
index e30d2153..7ab7a5c1 100644
--- a/docs/ext/backends.rst
+++ b/docs/ext/backends.rst
@@ -10,9 +10,6 @@ additional music sources by implementing the :ref:`backend-api`.
 This list is moderated and updated on a regular basis. If you want your package
 to show up here, follow the :ref:`guide on creating extensions <extensiondev>`.
 
-Mopidy also bundles the backend extensions :ref:`ext-local` and
-:ref:`ext-stream`.
-
 
 Mopidy-Beets
 ============
@@ -50,6 +47,12 @@ Extension for playing music and audio from the `Internet Archive
 <https://archive.org/>`_.
 
 
+Mopidy-Local
+============
+
+Bundled with Mopidy. See :ref:`ext-local`.
+
+
 Mopidy-Podcast
 ==============
 
@@ -123,6 +126,12 @@ Extension for providing the browse feature of `Spotify
 releases.
 
 
+Mopidy-Stream
+=============
+
+Bundled with Mopidy. See :ref:`ext-stream`.
+
+
 Mopidy-Subsonic
 ===============
 
diff --git a/docs/ext/frontends.rst b/docs/ext/frontends.rst
index 5614b1f0..481ac510 100644
--- a/docs/ext/frontends.rst
+++ b/docs/ext/frontends.rst
@@ -11,7 +11,17 @@ additional frontends, which includes just about anything that use the
 This list is moderated and updated on a regular basis. If you want your package
 to show up here, follow the :ref:`guide on creating extensions <extensiondev>`.
 
-Mopidy bundles the frontend extensions :ref:`ext-mpd` and :ref:`ext-http`.
+
+Mopidy-HTTP
+===========
+
+Bundled with Mopidy. See :ref:`ext-http`.
+
+
+Mopidy-MPD
+==========
+
+Bundled with Mopidy. See :ref:`ext-mpd`.
 
 
 Mopidy-MPRIS
diff --git a/docs/ext/mixers.rst b/docs/ext/mixers.rst
index 2044035e..f934efce 100644
--- a/docs/ext/mixers.rst
+++ b/docs/ext/mixers.rst
@@ -11,8 +11,6 @@ in Mopidy 0.19.
 This list is moderated and updated on a regular basis. If you want your package
 to show up here, follow the :ref:`guide on creating extensions <extensiondev>`.
 
-Mopidy also bundles the mixer extension :ref:`ext-softwaremixer`.
-
 
 Mopidy-ALSAMixer
 ================
@@ -40,6 +38,12 @@ Extension for controlling volume using an external NAD amplifier. Developed
 and tested with a NAD C355BEE.
 
 
+Mopidy-SoftwareMixer
+====================
+
+Bundled with Mopidy. See :ref:`ext-softwaremixer`.
+
+
 Mopidy-Yamaha
 =============