diff --git a/data/zsh-completion/_upower b/data/zsh-completion/_upower
index 230a055..e300f60 100644
--- a/data/zsh-completion/_upower
+++ b/data/zsh-completion/_upower
@@ -11,6 +11,7 @@ _enumerate_objects() {
 }
 
 _arguments \
+	"(--battery -b)"{--battery,-b}"[Dump all parameters for battery objects]" \
 	"(--enumerate -e)"{--enumerate,-e}"[Enumerate objects paths for devices]" \
 	"(--dump -d)"{--dump,-d}"[Dump all parameters for all objects]" \
 	"(--monitor -m)"{--monitor,-m}"[Monitor activity from the power daemon]" \
diff --git a/doc/man/upower.xml b/doc/man/upower.xml
index fbe3559..fdf8f51 100644
--- a/doc/man/upower.xml
+++ b/doc/man/upower.xml
@@ -19,6 +19,7 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>upower</command>
+      <arg><option>--battery</option></arg>
       <arg><option>--dump</option></arg>
       <arg><option>--enumerate</option></arg>
       <arg><option>--monitor-detail</option></arg>
@@ -42,6 +43,14 @@
   <refsect1>
     <title>OPTIONS</title>
     <variablelist>
+      <varlistentry>
+        <term><option>-b</option>, <option>--battery</option></term>
+        <listitem>
+          <para>
+            Dump all parameters for battery devices.
+          </para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term><option>-d</option>, <option>--dump</option></term>
         <listitem>
diff --git a/tools/up-tool.c b/tools/up-tool.c
index 6cea4a9..b66902e 100644
--- a/tools/up-tool.c
+++ b/tools/up-tool.c
@@ -272,6 +272,7 @@ int
 main (int argc, char **argv)
 {
 	GOptionContext *context;
+	gboolean opt_battery = FALSE;
 	gboolean opt_dump = FALSE;
 	gboolean opt_enumerate = FALSE;
 	gboolean opt_monitor = FALSE;
@@ -287,6 +288,7 @@ main (int argc, char **argv)
 	UpDevice *device;
 
 	const GOptionEntry entries[] = {
+		{ "battery", 'b', 0, G_OPTION_ARG_NONE, &opt_battery, _("Dump all parameters for battery objects"), NULL },
 		{ "dump", 'd', 0, G_OPTION_ARG_NONE, &opt_dump, _("Dump all parameters for all objects"), NULL },
 		{ "enumerate", 'e', 0, G_OPTION_ARG_NONE, &opt_enumerate, _("Enumerate objects paths for devices"), NULL },
 		{ "monitor", 'm', 0, G_OPTION_ARG_NONE, &opt_monitor, _("Monitor activity from the power daemon"), NULL },
@@ -333,6 +335,11 @@ main (int argc, char **argv)
 	if (opt_enumerate)
 		return up_tool_output_enumerate (client);
 
+	if (opt_battery) {
+		device_filter = g_list_append (device_filter, GINT_TO_POINTER (UP_DEVICE_KIND_BATTERY));
+		opt_dump = TRUE;
+	}
+
 	if (opt_dump) {
 		retval = up_tool_output_device_dump (client, device_filter);
 		g_list_free (device_filter);