diff --git a/docs/api/core.rst b/docs/api/core.rst
index de85557c..0fd3e0c8 100644
--- a/docs/api/core.rst
+++ b/docs/api/core.rst
@@ -7,11 +7,13 @@ Core API
 .. module:: mopidy.core
     :synopsis: Core API for use by frontends
 
-
 The core API is the interface that is used by frontends like
 :mod:`mopidy.frontends.mpd`. The core layer is inbetween the frontends and the
 backends.
 
+.. autoclass:: mopidy.core.Core
+    :members:
+
 
 Playback controller
 ===================
diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py
index 3cba20db..b7eca93c 100644
--- a/mopidy/core/actor.py
+++ b/mopidy/core/actor.py
@@ -16,21 +16,21 @@ from .tracklist import TracklistController
 
 
 class Core(pykka.ThreadingActor, AudioListener, BackendListener):
-    #: The library controller. An instance of
-    # :class:`mopidy.core.LibraryController`.
     library = None
+    """The library controller. An instance of
+    :class:`mopidy.core.LibraryController`."""
 
-    #: The playback controller. An instance of
-    #: :class:`mopidy.core.PlaybackController`.
     playback = None
+    """The playback controller. An instance of
+    :class:`mopidy.core.PlaybackController`."""
 
-    #: The playlists controller. An instance of
-    #: :class:`mopidy.core.PlaylistsController`.
     playlists = None
+    """The playlists controller. An instance of
+    :class:`mopidy.core.PlaylistsController`."""
 
-    #: The tracklist controller. An instance of
-    #: :class:`mopidy.core.TracklistController`.
     tracklist = None
+    """The tracklist controller. An instance of
+    :class:`mopidy.core.TracklistController`."""
 
     def __init__(self, audio=None, backends=None):
         super(Core, self).__init__()