diff --git a/neofetch b/neofetch
index 1d7a049c..7a7b7f79 100755
--- a/neofetch
+++ b/neofetch
@@ -1556,7 +1556,8 @@ getbattery () {
 
                 # Create an array of battery usage from each battery.
                 batteries=($(cat /sys/class/power_supply/BAT${battery_num}/capacity))
-
+                # Get the power status
+                battery_status=($(cat /sys/class/power_supply/BAT${battery_num}/status))
                 # Get the subtitle and reassign it so it doesn't change.
                 title="$subtitle"
 
@@ -1584,7 +1585,11 @@ getbattery () {
                         return
                     fi
 
-                    battery="${batteries[0]}%"
+		    if [ "$battery_status" == "Charging" ]; then
+			battery="${batteries[0]}% Charging"
+		    else
+			battery="${batteries[0]}%"
+		    fi
                 fi
             else
                 battery="None"
@@ -1594,7 +1599,13 @@ getbattery () {
         "BSD")
             case "$distro" in
                 "FreeBSD"*)
-                    battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}')
+            	    battery_status=$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}')
+
+            	    if [ "$battery_status" == "charging" ]; then
+		        battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') Charging"
+		    else
+		        battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}')
+                    fi
                 ;;
 
                 "NetBSD"*)
@@ -1616,6 +1627,9 @@ getbattery () {
 
         "Mac OS X")
             battery="$(pmset -g batt | grep -o '[0-9]*%')"
+            battery_status="$(pmset -g batt | awk 'NR==2 {print $3}')"
+            [ "$battery_status" == "charging;" ] && \
+                battery="${battery} Charging"
         ;;
 
         "Windows")