diff --git a/beetsplug/mpdupdate.py b/beetsplug/mpdupdate.py
index ff6e6dbe2..f8affed37 100644
--- a/beetsplug/mpdupdate.py
+++ b/beetsplug/mpdupdate.py
@@ -20,17 +20,11 @@ Put something like the following in your config.yaml to configure:
         port: 6600
         password: seekrit
 """
-from __future__ import print_function
-
 from beets.plugins import BeetsPlugin
 import os
 import socket
 from beets import config
 
-# Global variable so that mpdupdate can detect database changes and run only
-# once before beets exits.
-database_changed = False
-
 
 # No need to introduce a dependency on an MPD library for such a
 # simple use case. Here's a simple socket abstraction to make things
@@ -66,37 +60,6 @@ class BufferedSocket(object):
         self.sock.close()
 
 
-def update_mpd(host='localhost', port=6600, password=None):
-    """Sends the "update" command to the MPD server indicated,
-    possibly authenticating with a password first.
-    """
-    print('Updating MPD database...')
-
-    s = BufferedSocket(host, port)
-    resp = s.readline()
-    if 'OK MPD' not in resp:
-        print('MPD connection failed:', repr(resp))
-        return
-
-    if password:
-        s.send('password "%s"\n' % password)
-        resp = s.readline()
-        if 'OK' not in resp:
-            print('Authentication failed:', repr(resp))
-            s.send('close\n')
-            s.close()
-            return
-
-    s.send('update\n')
-    resp = s.readline()
-    if 'updating_db' not in resp:
-        print('Update failed:', repr(resp))
-
-    s.send('close\n')
-    s.close()
-    print('... updated.')
-
-
 class MPDUpdatePlugin(BeetsPlugin):
     def __init__(self):
         super(MPDUpdatePlugin, self).__init__()
@@ -112,18 +75,44 @@ class MPDUpdatePlugin(BeetsPlugin):
             if self.config[key].exists():
                 config['mpd'][key] = self.config[key].get()
 
+        self.register_listener('database_change', self.db_change)
 
-@MPDUpdatePlugin.listen('database_change')
-def handle_change(lib=None):
-    global database_changed
-    database_changed = True
+    def db_change(self, lib):
+        self.register_listener('cli_exit', self.update)
 
+    def update(self, lib):
+            self.update_mpd(
+                config['mpd']['host'].get(unicode),
+                config['mpd']['port'].get(int),
+                config['mpd']['password'].get(unicode),
+            )
 
-@MPDUpdatePlugin.listen('cli_exit')
-def update(lib=None):
-    if database_changed:
-        update_mpd(
-            config['mpd']['host'].get(unicode),
-            config['mpd']['port'].get(int),
-            config['mpd']['password'].get(unicode),
-        )
+    def update_mpd(self, host='localhost', port=6600, password=None):
+        """Sends the "update" command to the MPD server indicated,
+        possibly authenticating with a password first.
+        """
+        self._log.info('Updating MPD database...')
+
+        s = BufferedSocket(host, port)
+        resp = s.readline()
+        if 'OK MPD' not in resp:
+            self._log.warning(u'MPD connection failed: {0!r}', resp)
+            return
+
+        if password:
+            s.send('password "%s"\n' % password)
+            resp = s.readline()
+            if 'OK' not in resp:
+                self._log.warning(u'Authentication failed: {0!r}', resp)
+                s.send('close\n')
+                s.close()
+                return
+
+        s.send('update\n')
+        resp = s.readline()
+        if 'updating_db' not in resp:
+            self._log.warning(u'Update failed: {0!r}', resp)
+
+        s.send('close\n')
+        s.close()
+        self._log.info('Database updated.')