diff --git a/beets/player/bpd.py b/beets/player/bpd.py
index a8576bc67..68080fcf8 100755
--- a/beets/player/bpd.py
+++ b/beets/player/bpd.py
@@ -65,8 +65,7 @@ SAFE_COMMANDS = (
 
 
 # Logger.
-log = logging.getLogger('bpd')
-log.setLevel(logging.DEBUG)
+log = logging.getLogger('beets.player.bpd')
 log.addHandler(logging.StreamHandler())
 
 
@@ -388,8 +387,6 @@ class BaseServer(object):
     
     def cmd_move(self, conn, idx_from, idx_to):
         """Move a track in the playlist."""
-        print idx_from, idx_to
-        print self.current_index, [i.title for i in self.playlist]
         idx_from = cast_arg(int, idx_from)
         idx_to = cast_arg(int, idx_to)
         try:
diff --git a/beets/ui.py b/beets/ui.py
index 3d9004b3d..38e03eea2 100644
--- a/beets/ui.py
+++ b/beets/ui.py
@@ -15,6 +15,7 @@
 # along with beets.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import logging
 
 from beets import autotag
 from beets import library
@@ -288,7 +289,12 @@ def device_add(lib, query, name):
         pod.add(item)
     pod.save()
 
-def start_bpd(lib, host, port, password):
+def start_bpd(lib, host, port, password, debug):
     """Starts a BPD server."""
     from beets.player.bpd import Server
+    log = logging.getLogger('beets.player.bpd')
+    if debug:
+        log.setLevel(logging.DEBUG)
+    else:
+        log.setLevel(logging.WARNING)
     Server(lib, host, port, password).run()
diff --git a/bts b/bts
index e8c82dbf5..7bd6c24f7 100755
--- a/bts
+++ b/bts
@@ -146,6 +146,8 @@ class BeetsApp(cmdln.Cmdln):
         ui.remove_items(self.lib, make_query(criteria),
                         opts.album, opts.delete)
 
+    @cmdln.option('-d', '--debug', action='store_true',
+                  help='dump all MPD traffic to stdout')
     def do_bpd(self, subcmd, opts, host=None, port=None):
         """${cmd_name}: run an MPD-compatible music player server
         
@@ -155,7 +157,8 @@ class BeetsApp(cmdln.Cmdln):
         host = host or self._cfg_get('bpd', 'host')
         port = port or self._cfg_get('bpd', 'port')
         password = self._cfg_get('bpd', 'password')
-        ui.start_bpd(self.lib, host, int(port), password)
+        debug = opts.debug or False
+        ui.start_bpd(self.lib, host, int(port), password, debug)
 
     def do_dadd(self, subcmd, opts, name, *criteria):
         """${cmd_name}: add files to a device