diff --git a/bases/overlay-feature-motd/etc/update-motd.d/50-scw b/bases/overlay-feature-motd/etc/update-motd.d/50-scw
index 042ab8a..811befa 100755
--- a/bases/overlay-feature-motd/etc/update-motd.d/50-scw
+++ b/bases/overlay-feature-motd/etc/update-motd.d/50-scw
@@ -12,8 +12,8 @@ fi
 date=`date`
 load=`cat /proc/loadavg | awk '{print $1}'`
 root_usage=`df -h / | awk '/\// {print $(NF-1)}'`
-memory_usage=`free -m | awk '/Mem:/ { total=$2 } /buffers\/cache/ { used=$3 } END { printf("%3.1f%%", used/total*100)}'`
-swap_usage=`free -m | awk '/Swap/ { printf("%3.1f%%", "exit !$2;$3/$2*100") }'`
+memory_usage=`free -m | awk '/Mem:/ { total=$2; available=$7; printf("%3.1f%%", (1-available/total)*100)}'`
+swap_usage=`free -m | awk '/Swap/ { printf("%3.1f%%", $2?$3/$2*100:0) }'`
 users=`users | wc -w`
 time=`uptime | grep -ohe 'up .*' | sed 's/,/\ hours/g' | awk '{ printf $2" "$3 }'`
 processes=`ps aux | wc -l`