diff --git a/beets/__main__.py b/beets/__main__.py
new file mode 100644
index 000000000..8cb407ae6
--- /dev/null
+++ b/beets/__main__.py
@@ -0,0 +1,6 @@
+"""main module."""
+import sys
+from .ui import main
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py
index ae30a9c60..907687588 100644
--- a/beets/ui/__init__.py
+++ b/beets/ui/__init__.py
@@ -946,6 +946,16 @@ class SubcommandsOptionParser(CommonOptionsParser):
 
         self.subcommands = []
 
+    def get_prog_name(self):
+        """Get program name.
+
+        Returns:
+            Program name.
+        """
+        prog_name = super(SubcommandsOptionParser, self).get_prog_name()
+        prog_name = 'beets' if prog_name == '__main__.py' else prog_name
+        return prog_name
+
     def add_subcommand(self, *cmds):
         """Adds a Subcommand object to the parser's list of commands.
         """