diff --git a/beetsplug/mpdupdate.py b/beetsplug/mpdupdate.py
index 6ecc92131..72a98af0e 100644
--- a/beetsplug/mpdupdate.py
+++ b/beetsplug/mpdupdate.py
@@ -69,7 +69,7 @@ class MPDUpdatePlugin(BeetsPlugin):
         super(MPDUpdatePlugin, self).__init__()
         config['mpd'].add({
             'host':     os.environ.get('MPD_HOST', u'localhost'),
-            'port':     6600,
+            'port':     int(os.environ.get('MPD_PORT', 6600)),
             'password': u'',
         })
         config['mpd']['password'].redact = True
diff --git a/docs/plugins/mpdupdate.rst b/docs/plugins/mpdupdate.rst
index c846b917f..7ac647536 100644
--- a/docs/plugins/mpdupdate.rst
+++ b/docs/plugins/mpdupdate.rst
@@ -33,6 +33,7 @@ The available options under the ``mpd:`` section are:
 - **host**: The MPD server name.
   Default: The ``$MPD_HOST`` environment variable if set, falling back to ``localhost`` otherwise.
 - **port**: The MPD server port.
-  Default: 6600.
+  Default: The ``$MPD_PORT`` environment variable if set, falling back to 6600
+  otherwise.
 - **password**: The MPD server password.
   Default: None.