diff --git a/debian/changelog b/debian/changelog
index 5454bd1f..57a4c96a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 byobu (5.105) unreleased; urgency=medium
 
+  [ Dustin Kirkland ]
   * usr/share/man/man1/byobu.1:
     - update examples
   * debian/control:
@@ -12,6 +13,10 @@ byobu (5.105) unreleased; urgency=medium
   * usr/share/byobu/profiles/bashrc:
     - fix color comment
 
+  [ Mark King ]
+  * usr/lib/byobu/battery:
+    - Use `POWER_SUPPLY_CAPACITY` for battery if available
+
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 28 Feb 2016 23:46:26 -0600
 
 byobu (5.104-0ubuntu1) xenial; urgency=medium
diff --git a/usr/lib/byobu/battery b/usr/lib/byobu/battery
index b76c5289..20f89255 100755
--- a/usr/lib/byobu/battery
+++ b/usr/lib/byobu/battery
@@ -41,11 +41,11 @@ __battery() {
 					case "$POWER_SUPPLY_NAME" in AC|ac|Ac|aC) continue ;; esac
 					present="$POWER_SUPPLY_PRESENT"
 					# Some use "CHARGE", others use "ENERGY", still others "CAPACITY"
-					#[ -n "$POWER_SUPPLY_CAPACITY" ] && rem="$POWER_SUPPLY_CAPACITY" && full="100"
 					[ -n "$POWER_SUPPLY_CHARGE_FULL" ] && full=$((POWER_SUPPLY_CHARGE_FULL+full))
 					[ -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"
 					[ "$POWER_SUPPLY_STATUS" != "Unknown" ] && state="$POWER_SUPPLY_STATUS"
 				fi
 			;;