diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/disable_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/disable_command.ex
index 2efe6c5942..ad3f193523 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/disable_command.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/disable_command.ex
@@ -24,15 +24,20 @@ defmodule RabbitMQ.CLI.Plugins.Commands.DisableCommand do
   def formatter(), do: RabbitMQ.CLI.Formatters.Plugins
 
   def merge_defaults(args, opts) do
-    {args, Map.merge(%{online: false, offline: false}, opts)}
+    {args, Map.merge(%{online: false, offline: false, all: false}, opts)}
   end
 
   def switches(), do: [online: :boolean,
-                       offline: :boolean]
+                       offline: :boolean,
+                       all: :boolean]
 
-  def validate([], _) do
+  def validate([], %{all: false}) do
     {:validation_failure, :not_enough_arguments}
   end
+  def validate([_ | _], %{all: true}) do
+    {:validation_failure,
+      {:bad_argument, "Cannot set both --all and a list of plugins"}}
+  end
   def validate(_, %{online: true, offline: true}) do
     {:validation_failure, {:bad_argument, "Cannot set both online and offline"}}
   end
@@ -54,15 +59,21 @@ defmodule RabbitMQ.CLI.Plugins.Commands.DisableCommand do
     {:validation_failure, err}
   end
 
-  def usage, do: "disable [<plugin>] [--offline] [--online]"
+  def usage, do: "disable <plugin>|--all [--offline] [--online]"
 
+  def banner([], %{all: true, node: node_name}) do
+    "Disabling ALL plugins on node #{node_name}"
+  end
   def banner(plugins, %{node: node_name}) do
     ["Disabling plugins on node #{node_name}:" | plugins]
   end
 
 
-  def run(plugin_names, %{node: node_name} = opts) do
-    plugins = for s <- plugin_names, do: String.to_atom(s)
+  def run(plugin_names, %{all: all_flag, node: node_name} = opts) do
+    plugins = case all_flag do
+      false -> for s <- plugin_names, do: String.to_atom(s);
+      true  -> PluginHelpers.plugin_names(PluginHelpers.list(opts))
+    end
     %{online: online, offline: offline} = opts
 
     enabled = PluginHelpers.read_enabled(opts)
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/enable_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/enable_command.ex
index 8a5a6b4b50..ff047a46e6 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/enable_command.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/enable_command.ex
@@ -24,15 +24,20 @@ defmodule RabbitMQ.CLI.Plugins.Commands.EnableCommand do
   def formatter(), do: RabbitMQ.CLI.Formatters.Plugins
 
   def merge_defaults(args, opts) do
-    {args, Map.merge(%{online: false, offline: false}, opts)}
+    {args, Map.merge(%{online: false, offline: false, all: false}, opts)}
   end
 
   def switches(), do: [online: :boolean,
-                       offline: :boolean]
+                       offline: :boolean,
+                       all: :boolean]
 
-  def validate([], _) do
+  def validate([], %{all: false}) do
     {:validation_failure, :not_enough_arguments}
   end
+  def validate([_ | _], %{all: true}) do
+    {:validation_failure,
+      {:bad_argument, "Cannot set both --all and a list of plugins"}}
+  end
   def validate(_, %{online: true, offline: true}) do
     {:validation_failure, {:bad_argument, "Cannot set both online and offline"}}
   end
@@ -54,15 +59,21 @@ defmodule RabbitMQ.CLI.Plugins.Commands.EnableCommand do
     {:validation_failure, err}
   end
 
-  def usage, do: "enable [<plugin>] [--offline] [--online]"
+  def usage, do: "enable <plugin>|--all [--offline] [--online]"
 
+  def banner([], %{all: true, node: node_name}) do
+    "Enabling ALL plugins on node #{node_name}"
+  end
   def banner(plugins, %{node: node_name}) do
     ["Enabling plugins on node #{node_name}:" | plugins]
   end
 
 
-  def run(plugin_names, %{node: node_name} = opts) do
-    plugins = for s <- plugin_names, do: String.to_atom(s)
+  def run(plugin_names, %{all: all_flag, node: node_name} = opts) do
+    plugins = case all_flag do
+      false -> for s <- plugin_names, do: String.to_atom(s);
+      true  -> PluginHelpers.plugin_names(PluginHelpers.list(opts))
+    end
     %{online: online, offline: offline} = opts
 
     enabled = PluginHelpers.read_enabled(opts)