diff --git a/docs/debian.rst b/docs/debian.rst
deleted file mode 100644
index 25df7a4b..00000000
--- a/docs/debian.rst
+++ /dev/null
@@ -1,87 +0,0 @@
-.. _debian:
-
-***************
-Debian packages
-***************
-
-The Mopidy Debian package, ``mopidy``, is available from `apt.mopidy.com
-`__ as well as from Debian, Ubuntu and other
-Debian-based Linux distributions.
-
-Some extensions are also available from all of these sources, while others,
-like Mopidy-Spotify and its dependencies, are only available from
-apt.mopidy.com. This may either be temporary until the package is uploaded to
-Debian and with time propagates to the other distributions. It may also be more
-long term, like in the Mopidy-Spotify case where there is uncertainities around
-licensing and distribution of non-free packages.
-
-
-Installation
-============
-
-See :ref:`debian-install`.
-
-
-Running as a system service
-===========================
-
-The Debian package comes with an init script. It starts Mopidy as a system
-service running as the ``mopidy`` user. The user is created by the package.
-
-The Debian package might ask if you want to run Mopidy as a system service. If
-you don't get the question, your system is probably configured to ignore
-questions at that priority level during installs, and defaults to not enabling
-the Mopidy service.
-
-If you didn't get the question or if you've changed your mind about whether or
-not to run Mopidy as a system service, just run the following command to
-reconfigure the package::
-
- sudo dpkg-reconfigure mopidy
-
-
-Differences when running as a system service
-============================================
-
-If you want to run Mopidy using the init script, there's a few differences
-from a regular Mopidy setup you'll want to know about.
-
-- All configuration is in :file:`/etc/mopidy`, not in your user's home
- directory. The main configuration file is :file:`/etc/mopidy/mopidy.conf`.
- This is the configuration file with the highest priority, so it can override
- configs from all other config files. Thus, you can do all your changes in
- this file.
-
-- The init script runs Mopidy as the ``mopidy`` user. The ``mopidy`` user will
- need read access to any local music you want Mopidy to play.
-
-- To run Mopidy subcommands with the same user and config files as the init
- script uses, you can use ``sudo mopidyctl ``. In other words,
- where you'll usually run::
-
- mopidy config
-
- You should instead run the following to inspect the system service's
- configuration::
-
- sudo mopidyctl config
-
- The same applies to scanning your local music collection. Where you'll
- normally run::
-
- mopidy local scan
-
- You should instead run::
-
- sudo mopidyctl local scan
-
-- Mopidy is started, stopped, and restarted just like any other system
- service::
-
- sudo service mopidy start
- sudo service mopidy stop
- sudo service mopidy restart
-
-- You can check if Mopidy is currently running as a system service by running::
-
- sudo service mopidy status
diff --git a/docs/index.rst b/docs/index.rst
index 70d14a73..e6b2da98 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -81,8 +81,8 @@ announcements related to Mopidy and Mopidy extensions.
installation/index
config
running
+ service
troubleshooting
- debian
.. _ext:
diff --git a/docs/installation/debian.rst b/docs/installation/debian.rst
index 5b4bf841..728467c4 100644
--- a/docs/installation/debian.rst
+++ b/docs/installation/debian.rst
@@ -48,7 +48,7 @@ and armhf (compatible with Raspberry Pi 1 and 2).
sudo apt-get update
sudo apt-get install mopidy
-#. Before continuing, make sure you've read the :ref:`debian` section to learn
+#. Before continuing, make sure you've read the :ref:`service` section to learn
about the differences between running Mopidy as a system service and
manually as your own system user.
diff --git a/docs/running.rst b/docs/running.rst
index e329ccaa..1aa0a657 100644
--- a/docs/running.rst
+++ b/docs/running.rst
@@ -39,21 +39,8 @@ using ``pkill``::
pkill mopidy
-Init scripts
-============
+Running as a service
+====================
-- The ``mopidy`` package at `apt.mopidy.com `__ comes
- with an `sysvinit init script
- `_. For
- more details, see the :ref:`debian` section of the docs.
-
-- The ``mopidy`` package in `Arch Linux
- `__ comes with a systemd init
- script.
-
-- A blog post by Benjamin Guillet explains how to `Daemonize Mopidy and Launch
- It at Login on OS X
- `_.
-
-- Issue :issue:`266` contains a bunch of init scripts for Mopidy, including
- Upstart init scripts.
+Once you're done exploring Mopidy and want to run it as a proper service, check
+out :ref:`service`.
diff --git a/docs/service.rst b/docs/service.rst
new file mode 100644
index 00000000..a2664d77
--- /dev/null
+++ b/docs/service.rst
@@ -0,0 +1,92 @@
+.. _service:
+
+********************
+Running as a service
+********************
+
+If you want to run Mopidy as a service using either an init script or a systemd
+service, there's a few differences from running Mopidy as your own user you'll
+want to know about. The following applies to Debian, Ubuntu, Raspbian, and
+Arch. Hopefully, other distributions packaging Mopidy will make sure this works
+the same way on their distribution.
+
+
+Configuration
+=============
+
+All configuration is in :file:`/etc/mopidy`, not in your user's home directory.
+
+The main configuration file is :file:`/etc/mopidy/mopidy.conf`. If there are
+more than one configuration file, this is the configuration file with the
+highest priority, so it can override configs from all other config files.
+Thus, you can do all your changes in this file.
+
+
+mopidy User
+===========
+
+The init script runs Mopidy as the ``mopidy`` user, which is automatically
+created when you install the Mopidy package. The ``mopidy`` user will need read
+access to any local music you want Mopidy to play.
+
+
+Subcommands
+===========
+
+To run Mopidy subcommands with the same user and config files as the service
+uses, you can use ``sudo mopidyctl ``. In other words, where you'll
+usually run::
+
+ mopidy config
+
+You should instead run the following to inspect the service's configuration::
+
+ sudo mopidyctl config
+
+The same applies to scanning your local music collection. Where you'll normally
+run::
+
+ mopidy local scan
+
+You should instead run::
+
+ sudo mopidyctl local scan
+
+
+Service management with systemd
+===============================
+
+On modern systems using systemd you can enable the Mopidy service by running::
+
+ sudo systemctl enable mopidy
+
+This will make Mopidy start when the system boots.
+
+Mopidy is started, stopped, and restarted just like any other systemd service::
+
+ sudo systemctl start mopidy
+ sudo systemctl stop mopidy
+ sudo systemctl restart mopidy
+
+You can check if Mopidy is currently running as a service by running::
+
+ sudo systemctl status mopidy
+
+
+Service management on Debian
+============================
+
+On Debian systems (both those using systemd and not) you can enable the Mopidy
+service by running::
+
+ sudo dpkg-reconfigure mopidy
+
+Mopidy can be started, stopped, and restarted using the ``service`` command::
+
+ sudo service mopidy start
+ sudo service mopidy stop
+ sudo service mopidy restart
+
+You can check if Mopidy is currently running as a service by running::
+
+ sudo service mopidy status