diff --git a/beetsplug/mpdstats.py b/beetsplug/mpdstats.py
index d7c3a2ae5..178b9f204 100644
--- a/beetsplug/mpdstats.py
+++ b/beetsplug/mpdstats.py
@@ -52,16 +52,29 @@ class MPDClient(MPDClient):
         return None
 
 class Client(object):
-    def __init__(self, library, config):
+    def __init__(self, library):
         self.lib = library
-        self.config = config
-        self.music_directory = self.config['music_directory'].get()
-        self.host = self.config['host'].get()
-        self.port = self.config['port'].get()
-        self.password = self.config['password'].get()
-        self.user = self.config['user'].get()
-        self.do_rating = self.config['rating'].get(bool)
-        self.rating_mix = self.config['rating_mix'].get(float)
+        # defaults
+        self.mpd_config = {
+                'host'          :       u'localhost',
+                'port'          :       6600,
+                'password'      :       u''
+        }
+        # from global 'mpd' section
+        if 'mpd' in config.keys():
+            for opt in ('host', 'port', 'password'):
+                if opt in config['mpd'].keys():
+                    self.mpd_config[opt] = config['mpd'][opt].get()
+
+        # plugin specific / optargs
+        for opt in ('host', 'port', 'password'):
+            if config['mpdstats'][opt].get() is not None:
+                self.mpd_config[opt] = config['mpdstats'][opt].get()
+
+        self.music_directory = config['mpdstats']['music_directory'].get()
+        self.user = config['mpdstats']['user'].get()
+        self.do_rating = config['mpdstats']['rating'].get(bool)
+        self.rating_mix = config['mpdstats']['rating_mix'].get(float)
 
         self.client = MPDClient()
 
@@ -69,13 +82,17 @@ class Client(object):
         """Connect to the MPD.
         """
         try:
-            self.client.connect(host=self.host, port=self.port)
+            log.info(u'mpdstats(connecting): MPD@{0}:{1}'
+                    .format(self.mpd_config['host'],
+                    self.mpd_config['port']))
+            self.client.connect(host=self.mpd_config['host'],
+                port=self.mpd_config['port'])
         except SocketError, e:
             log.error(e)
             return
-        if not self.password == u'':
+        if not self.mpd_config['password'] == u'':
             try:
-                self.client.password(self.password)
+                self.client.password(self.mpd_config['password'])
             except CommandError, e:
                 log.error(e)
                 return
@@ -319,10 +336,10 @@ class MPDStatsPlugin(plugins.BeetsPlugin):
     def __init__(self):
         super(MPDStatsPlugin, self).__init__()
         self.config.add({
-            'host'              : u'127.0.0.1',
-            'port'              : 6600,
-            'password'          : u'',
-            'music_directory'   : u'',
+            'host'              : None,
+            'port'              : None,
+            'password'          : None,
+            'music_directory'   : config['directory'].get(unicode),
             'user'              : u'',
             'rating'            : True,
             'rating_mix'        : 0.75,
@@ -346,7 +363,7 @@ class MPDStatsPlugin(plugins.BeetsPlugin):
 
         def func(lib, opts, args):
             self.config.set_args(opts)
-            Client(lib, self.config).run()
+            Client(lib).run()
 
         cmd.func = func
         return [cmd]
diff --git a/beetsplug/mpdupdate.py b/beetsplug/mpdupdate.py
index e21b8e158..25358530b 100644
--- a/beetsplug/mpdupdate.py
+++ b/beetsplug/mpdupdate.py
@@ -15,7 +15,7 @@
 """Updates an MPD index whenever the library is changed.
 
 Put something like the following in your config.yaml to configure:
-    mpdupdate:
+    mpd:
         host: localhost
         port: 6600
         password: seekrit
@@ -98,9 +98,9 @@ class MPDUpdatePlugin(BeetsPlugin):
     def __init__(self):
         super(MPDUpdatePlugin, self).__init__()
         self.config.add({
-            'host': u'localhost',
-            'port': 6600,
-            'password': u'',
+            'host': None,
+            'port': None,
+            'password': None,
         })
 
 
@@ -113,8 +113,22 @@ def handle_change(lib=None):
 @MPDUpdatePlugin.listen('cli_exit')
 def update(lib=None):
     if database_changed:
+        mpd_config = {
+                'host'          :       u'localhost',
+                'port'          :       6600,
+                'password'      :       u''
+        }
+        # try to get global mpd config
+        if 'mpd' in config.keys():
+            for opt in ('host', 'port', 'password'):
+                if opt in config['mpd'].keys():
+                    mpd_config[opt] = config['mpd'][opt].get()
+        # overwrite with plugin specific
+        for opt in ('host', 'port', 'password'):
+            if config['mpdupdate'][opt].get() is not None:
+                mpd_config[opt] = config['mpdupdate'][opt].get()
         update_mpd(
-            config['mpdupdate']['host'].get(unicode),
-            config['mpdupdate']['port'].get(int),
-            config['mpdupdate']['password'].get(unicode),
+            mpd_config['host'],
+            mpd_config['port'],
+            mpd_config['password']
         )