diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile
index c45dfa3..c112bb4 100644
--- a/roles/home-cli/files/profile
+++ b/roles/home-cli/files/profile
@@ -316,7 +316,7 @@ usermotd () {
     # Distro name and version on Linux and macOS.
     if [ -r /etc/os-release ]
     then
-        echo "    $(. /etc/os-release; echo "$NAME" "$VERSION")"
+        echo "    $(. /etc/os-release; echo "${PRETTY_NAME:-${NAME:-${ID:-unknown}} ${VERSION:-${VERSION_ID:-??}}}")"
     fi
     if [ "$(uname -s)" = "Darwin" ]
     then