diff --git a/bin/mopidy-scan b/bin/mopidy-scan
new file mode 100755
index 00000000..73af29fb
--- /dev/null
+++ b/bin/mopidy-scan
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+
+if __name__ == '__main__':
+    import sys
+
+    from mopidy import settings
+    from mopidy.scanner import Scanner, translator
+    from mopidy.frontends.mpd.translator import tracks_to_tag_cache_format
+
+    tracks = []
+
+    def store(data):
+        track = translator(data)
+        tracks.append(track)
+        print >> sys.stderr, 'Added %s' % track.uri
+
+    def debug(uri, error):
+        print >> sys.stderr, 'Failed %s: %s' % (uri, error)
+
+    print >> sys.stderr, 'Scanning %s' % settings.LOCAL_MUSIC_FOLDER
+
+    scanner = Scanner(settings.LOCAL_MUSIC_FOLDER, store, debug)
+    scanner.start()
+
+    print >> sys.stderr, 'Done'
+
+    for a in tracks_to_tag_cache_format(tracks):
+        if len(a) == 1:
+            print a[0]
+        else:
+            print u': '.join([unicode(b) for b in a])