diff --git a/docs/changes.rst b/docs/changes.rst
index 7c2ce19d..4fdc8c1f 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -39,8 +39,6 @@ greatly improved MPD client support.
   the packages created by ``setup.py`` for i.e. PyPI.
 - MPD frontend:
 
-  - Relocate from :mod:`mopidy.mpd` to :mod:`mopidy.frontends.mpd`.
-  - Split gigantic protocol implementation into eleven modules.
   - Search improvements, including support for multi-word search.
   - Fixed ``play "-1"`` and ``playid "-1"`` behaviour when playlist is empty
     or when a current track is set.
@@ -56,11 +54,14 @@ greatly improved MPD client support.
   - Fix ``load`` so that one can append a playlist to the current playlist, and
     make it return the correct error message if the playlist is not found.
   - Support for single track repeat added. (Fixes: :issue:`4`)
+  - Relocate from :mod:`mopidy.mpd` to :mod:`mopidy.frontends.mpd`.
+  - Split gigantic protocol implementation into eleven modules.
   - Rename ``mopidy.frontends.mpd.{serializer => translator}`` to match naming
     in backends.
   - Remove setting :attr:`mopidy.settings.SERVER` and
     :attr:`mopidy.settings.FRONTEND` in favour of the new
     :attr:`mopidy.settings.FRONTENDS`.
+  - Run MPD server in its own process.
 
 - Backends:
 
diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index ac090f16..247c68b3 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -30,7 +30,8 @@ def main():
     frontend.start_server(core_queue)
     core = CoreProcess(core_queue, output_class, backend_class, frontend)
     core.start()
-    asyncore.loop()
+    #asyncore.loop()
+    logger.debug('Main done')
 
 def _parse_options():
     parser = optparse.OptionParser(version='Mopidy %s' % get_version())
diff --git a/mopidy/frontends/mpd/__init__.py b/mopidy/frontends/mpd/__init__.py
index 53f2003f..048f5748 100644
--- a/mopidy/frontends/mpd/__init__.py
+++ b/mopidy/frontends/mpd/__init__.py
@@ -1,5 +1,5 @@
 from mopidy.frontends.mpd.dispatcher import MpdDispatcher
-from mopidy.frontends.mpd.server import MpdServer
+from mopidy.frontends.mpd.process import MpdProcess
 
 class MpdFrontend(object):
     """
@@ -17,8 +17,8 @@ class MpdFrontend(object):
         :param core_queue: the core queue
         :type core_queue: :class:`multiprocessing.Queue`
         """
-        self.server = MpdServer(core_queue)
-        self.server.start()
+        self.process = MpdProcess(core_queue)
+        self.process.start()
 
     def create_dispatcher(self, backend):
         """
@@ -28,6 +28,5 @@ class MpdFrontend(object):
         :type backend: :class:`mopidy.backends.base.BaseBackend`
         :rtype: :class:`mopidy.frontends.mpd.dispatcher.MpdDispatcher`
         """
-
         self.dispatcher = MpdDispatcher(backend)
         return self.dispatcher
diff --git a/mopidy/frontends/mpd/process.py b/mopidy/frontends/mpd/process.py
new file mode 100644
index 00000000..95ae855f
--- /dev/null
+++ b/mopidy/frontends/mpd/process.py
@@ -0,0 +1,18 @@
+import asyncore
+import logging
+
+from mopidy.frontends.mpd.server import MpdServer
+from mopidy.utils.process import BaseProcess
+
+logger = logging.getLogger('mopidy.frontends.mpd.process')
+
+class MpdProcess(BaseProcess):
+    def __init__(self, core_queue):
+        super(MpdProcess, self).__init__()
+        self.core_queue = core_queue
+
+    def run_inside_try(self):
+        logger.debug(u'Starting MPD server process')
+        server = MpdServer(self.core_queue)
+        server.start()
+        asyncore.loop()