diff --git a/docs/api/settings.rst b/docs/api/settings.rst
index a8ff6446..12d2833f 100644
--- a/docs/api/settings.rst
+++ b/docs/api/settings.rst
@@ -13,7 +13,7 @@ there.
 
 A complete ``~/.mopidy/settings.py`` may look like this::
 
-    SERVER_HOSTNAME = u'0.0.0.0'
+    MPD_SERVER_HOSTNAME = u'0.0.0.0'
     SPOTIFY_USERNAME = u'alice'
     SPOTIFY_PASSWORD = u'mysecret'
 
diff --git a/docs/changes.rst b/docs/changes.rst
index c805b595..e2c62725 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -17,6 +17,8 @@ Another great release.
 - Include Sphinx scripts for building docs, pylintrc, tests and test data in
   the packages created by ``setup.py`` for i.e. PyPI.
 - Rename :mod:`mopidy.backends.gstreamer` to :mod:`mopidy.backends.local`.
+- Changed ``SERVER_HOSTNAME`` and ``SERVER_PORT`` settings to
+  ``MPD_SERVER_HOSTNAME`` and ``MPD_SERVER_PORT``
 - MPD frontend:
 
   - Relocate from :mod:`mopidy.mpd` to :mod:`mopidy.frontends.mpd`.
diff --git a/mopidy/frontends/mpd/server.py b/mopidy/frontends/mpd/server.py
index 57b6211f..5a124d19 100644
--- a/mopidy/frontends/mpd/server.py
+++ b/mopidy/frontends/mpd/server.py
@@ -29,14 +29,14 @@ class MpdServer(asyncore.dispatcher):
             else:
                 self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
             self.set_reuse_addr()
-            hostname = self._format_hostname(settings.SERVER_HOSTNAME)
-            port = settings.SERVER_PORT
+            hostname = self._format_hostname(settings.MPD_SERVER_HOSTNAME)
+            port = settings.MPD_SERVER_PORT
             logger.debug(u'Binding to [%s]:%s', hostname, port)
             self.bind((hostname, port))
             self.listen(1)
             logger.info(u'MPD server running at [%s]:%s',
-                self._format_hostname(settings.SERVER_HOSTNAME),
-                settings.SERVER_PORT)
+                self._format_hostname(settings.MPD_SERVER_HOSTNAME),
+                settings.MPD_SERVER_PORT)
         except IOError, e:
             sys.exit('MPD server startup failed: %s' % e)
 
diff --git a/mopidy/settings.py b/mopidy/settings.py
index 1192c28d..96b95575 100644
--- a/mopidy/settings.py
+++ b/mopidy/settings.py
@@ -120,10 +120,10 @@ SERVER = u'mopidy.frontends.mpd.server.MpdServer'
 #:     Listens on all IPv4 interfaces.
 #: ``::``
 #:     Listens on all interfaces, both IPv4 and IPv6.
-SERVER_HOSTNAME = u'127.0.0.1'
+MPD_SERVER_HOSTNAME = u'127.0.0.1'
 
 #: Which TCP port Mopidy should listen to. Default: 6600
-SERVER_PORT = 6600
+MPD_SERVER_PORT = 6600
 
 #: Your Spotify Premium username. Used by all Spotify backends.
 SPOTIFY_USERNAME = u''