diff --git a/mopidy/frontends/mpd/__init__.py b/mopidy/frontends/mpd/__init__.py
index 02e3ab5f..2361d2bf 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.process import MpdProcess
+from mopidy.frontends.mpd.thread import MpdThread
 
 class MpdFrontend(object):
     """
@@ -7,7 +7,7 @@ class MpdFrontend(object):
     """
 
     def __init__(self):
-        self.process = None
+        self.thred = None
         self.dispatcher = None
 
     def start_server(self, core_queue):
@@ -17,8 +17,8 @@ class MpdFrontend(object):
         :param core_queue: the core queue
         :type core_queue: :class:`multiprocessing.Queue`
         """
-        self.process = MpdProcess(core_queue)
-        self.process.start()
+        self.thread = MpdThread(core_queue)
+        self.thread.start()
 
     def create_dispatcher(self, backend):
         """
diff --git a/mopidy/frontends/mpd/process.py b/mopidy/frontends/mpd/process.py
deleted file mode 100644
index 7bd95900..00000000
--- a/mopidy/frontends/mpd/process.py
+++ /dev/null
@@ -1,18 +0,0 @@
-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__(name='MpdProcess')
-        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()
diff --git a/mopidy/frontends/mpd/thread.py b/mopidy/frontends/mpd/thread.py
new file mode 100644
index 00000000..0fb048ec
--- /dev/null
+++ b/mopidy/frontends/mpd/thread.py
@@ -0,0 +1,20 @@
+import asyncore
+import logging
+
+from mopidy.frontends.mpd.server import MpdServer
+from mopidy.utils.process import BaseThread
+
+logger = logging.getLogger('mopidy.frontends.mpd.thread')
+
+class MpdThread(BaseThread):
+    def __init__(self, core_queue):
+        super(MpdThread, self).__init__()
+        self.name = u'MpdThread'
+        self.daemon = True
+        self.core_queue = core_queue
+
+    def run_inside_try(self):
+        logger.debug(u'Starting MPD server thread')
+        server = MpdServer(self.core_queue)
+        server.start()
+        asyncore.loop()