diff --git a/docs/mpd/handler.rst b/docs/api/mpd/handler.rst
similarity index 100%
rename from docs/mpd/handler.rst
rename to docs/api/mpd/handler.rst
diff --git a/docs/development.rst b/docs/development.rst
index 29d2d9ce..5c838f86 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -12,8 +12,7 @@ API documentation
 .. toctree::
     :glob:
 
-    api/*
-
+    api/**
 
 Scope
 =====
@@ -96,22 +95,6 @@ Then, to generate docs::
     make html   # To generate HTML docs
 
 
-Music Player Daemon (MPD)
-=========================
-
-The `MPD protocol documentation <http://www.musicpd.org/doc/protocol/>`_ is a
-useful resource. It is rather incomplete with regards to data formats, both for
-requests and responses. Thus we have to talk a great deal with the the original
-`MPD server <http://mpd.wikia.com/>`_ using telnet to get the details we need
-to implement our own MPD server which is compatible with the numerous existing
-`MPD clients <http://mpd.wikia.com/wiki/Clients>`_.
-
-.. toctree::
-    :glob:
-
-    mpd/*
-
-
 spytify
 =======
 
diff --git a/mopidy/mpd/handler.py b/mopidy/mpd/handler.py
index 83453489..17d11aef 100644
--- a/mopidy/mpd/handler.py
+++ b/mopidy/mpd/handler.py
@@ -1,3 +1,15 @@
+"""
+Our MPD protocol implementation
+
+This is partly based upon the `MPD protocol documentation
+<http://www.musicpd.org/doc/protocol/>`_, which is a useful resource, but it is
+rather incomplete with regards to data formats, both for requests and
+responses. Thus, we have had to talk a great deal with the the original `MPD
+server <http://mpd.wikia.com/>`_ using telnet to get the details we need to
+implement our own MPD server which is compatible with the numerous existing
+`MPD clients <http://mpd.wikia.com/wiki/Clients>`_.
+"""
+
 import logging
 import re
 import sys