diff --git a/src/modules/armbian/filesystem/root/etc/update-motd.d/10-mainsailos b/src/modules/armbian/filesystem/root/etc/update-motd.d/10-mainsailos
index 127314f74..7e8c49f63 100755
--- a/src/modules/armbian/filesystem/root/etc/update-motd.d/10-mainsailos
+++ b/src/modules/armbian/filesystem/root/etc/update-motd.d/10-mainsailos
@@ -16,7 +16,7 @@
 # shellcheck enable=require-variable-braces
 
 # shellcheck disable=SC1091
-[[ -f /etc/armbian-release-info.txt ]] && . /etc/armbian-release-info.txt
+[[ -f /etc/armbian-release ]] && . /etc/armbian-release
 
 if [[ -f /etc/armbian-distribution-status ]]; then
     . /etc/armbian-distribution-status
@@ -40,6 +40,6 @@ ODROID_EXCEPTION="$(tr -d '\000' < /proc/device-tree/model | grep ODROID | grep
 
 echo -e "\e[31m$(toilet -f big MainsailOS)\e[0m"
 echo -e "Version $(cut -d ' ' -f3 /etc/mainsailos-release), based on \
-\e[34mArmbian ${VERSION} ${DISTRIBUTION_CODENAME^}\e[0m $([[ ${BRANCH} == edge ]])"
+\e[34mArmbian ${VERSION/-trunk/} ${DISTRIBUTION_CODENAME^}\e[0m $([[ ${BRANCH} == edge ]])"
 echo -e "Running on \e[34m$(echo "${BOARD_NAME}" | sed 's/Orange Pi/OPi/' | \
 sed 's/NanoPi/NPi/' | sed 's/Banana Pi/BPi/')\e[0m with \e[34mLinux ${KERNELID}\e[0m\n"
diff --git a/src/modules/orangepi/filesystem/root/etc/update-motd.d/10-mainsailos b/src/modules/orangepi/filesystem/root/etc/update-motd.d/10-mainsailos
index 6d062fcd0..6c4beb2af 100755
--- a/src/modules/orangepi/filesystem/root/etc/update-motd.d/10-mainsailos
+++ b/src/modules/orangepi/filesystem/root/etc/update-motd.d/10-mainsailos
@@ -16,7 +16,7 @@
 # shellcheck enable=require-variable-braces
 
 # shellcheck disable=SC1091
-[[ -f /etc/orangepi-release-info.txt ]] && . /etc/orangepi-release-info.txt
+[[ -f /etc/orangepi-release ]] && . /etc/orangepi-release
 
 if [[ -f /etc/orangepi-distribution-status ]]; then
     . /etc/orangepi-distribution-status