diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py
index 2740c5f69..acc1a7fc3 100644
--- a/beets/ui/__init__.py
+++ b/beets/ui/__init__.py
@@ -1131,7 +1131,7 @@ def _load_plugins(options, config):
     # Exclude any plugins that were specified on the command line
     if options.exclude is not None:
         plugin_list = [p for p in plugin_list
-                      if p not in options.exclude.split(',')]
+                        if p not in options.exclude.split(',')]
 
     plugins.load_plugins(plugin_list)
     return plugins
@@ -1266,7 +1266,7 @@ def _raw_main(args, lib=None):
                       help='path to configuration file')
     parser.add_option('-p', '--plugins', dest='plugins',
                       help='a comma-separated list of plugins to load')
-    parser.add_option('-P', '--disable-plugin', dest='exclude',
+    parser.add_option('-P', '--disable-plugins', dest='exclude',
                       help='a comma-separated list of plugins to disable')
     parser.add_option('-h', '--help', dest='help', action='store_true',
                       help='show this help message and exit')
diff --git a/docs/changelog.rst b/docs/changelog.rst
index ef9f550ff..53d859f4b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -20,7 +20,7 @@ New features:
 * :doc:`/plugins/convert`: Add a new `auto_keep` option that automatically
   converts files but keeps the *originals* in the library.
   :bug:`1840` :bug:`4302`
-* Added a ``-P`` (or ``--disable-plugin``) flag to specify one/multiple plugin(s) to be 
+* Added a ``-P`` (or ``--disable-plugins``) flag to specify one/multiple plugin(s) to be 
   disabled at startup.
 
 Bug fixes:
diff --git a/docs/reference/cli.rst b/docs/reference/cli.rst
index 319a7897d..a5f44f91f 100644
--- a/docs/reference/cli.rst
+++ b/docs/reference/cli.rst
@@ -445,9 +445,8 @@ import ...``.
   specified, the plugin list in your configuration is ignored. The long form
   of this argument also allows specifying no plugins, effectively disabling
   all plugins: ``--plugins=``.
-* ``-P EXCLUDE``: specify a comma-separated list of plugins to disable in a
-  specific beets run. If specified, it will exclude plugins from your configuration
-  and/or plugins specified using the ``-p`` flag. To disable ALL plugins, use
+* ``-P plugins``: specify a comma-separated list of plugins to disable in a
+  specific beets run. This will overwrite ``-p`` if used with it . To disable all plugins, use
   ``--plugins=`` instead.
 
 Beets also uses the ``BEETSDIR`` environment variable to look for