diff --git a/debian/changelog b/debian/changelog
index 62fd8c43..eb797d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ byobu (5.108) unreleased; urgency=medium
 
   * usr/lib/byobu/updates_available:
     - remove trailing whitespace
+  * usr/lib/byobu/battery:
+    - only use POWER_SUPPLY_CAPACITY if neither POWER_SUPPLY_ENERGY_NOW nor
+      POWER_SUPPLY_CHARGE_NOW are available; important for summing
+      multiple batteries
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 09 May 2016 18:26:22 -0500
 
diff --git a/usr/lib/byobu/battery b/usr/lib/byobu/battery
index c831c829..067871c9 100755
--- a/usr/lib/byobu/battery
+++ b/usr/lib/byobu/battery
@@ -45,7 +45,9 @@ __battery() {
 					[ -n "$POWER_SUPPLY_ENERGY_FULL" ] && full=$((POWER_SUPPLY_ENERGY_FULL+full))
 					[ -n "$POWER_SUPPLY_CHARGE_NOW" ] && rem=$((POWER_SUPPLY_CHARGE_NOW+rem))
 					[ -n "$POWER_SUPPLY_ENERGY_NOW" ] && rem=$((POWER_SUPPLY_ENERGY_NOW+rem))
-					[ -n "$POWER_SUPPLY_CAPACITY" ] && rem="$POWER_SUPPLY_CAPACITY" && full="100"
+					if [ -n "$POWER_SUPPLY_CAPACITY" ] && [ ! -n "$POWER_SUPPLY_ENERGY_NOW" ] && [ ! -n "$POWER_SUPPLY_CHARGE_NOW" ]; then
+						rem="$POWER_SUPPLY_CAPACITY" && full="100"
+					fi
 					[ "$POWER_SUPPLY_STATUS" != "Unknown" ] && state="$POWER_SUPPLY_STATUS"
 				fi
 			;;