diff --git a/buildme b/buildme
index ddb93cbcd4..2ad6715055 100755
--- a/buildme
+++ b/buildme
@@ -46,8 +46,12 @@ declare -r SYSNAME="$(uname)"
 MYTOOLCHAIN=${1:-GCC161}
 revision=$(git describe --tags $(git rev-list --tags --max-count=1))
 
+if [[ "$revision" =~ ^Clover-(.*)$ ]]; then
+    revision="${BASH_REMATCH[1]}"
+fi
+
 if [[ "$revision" =~ ^[0-9]+$ ]]; then
-  revision="r${revision}"
+    revision="r${revision}"
 fi
 lsha1="not a git repo"
 pyversion=$(echo $COL_CYAN"Current Python version: "$COL_WHITE$($(which python3) --version))
@@ -611,7 +615,7 @@ testing() {
 #clear
 echo
 echo -e $COL_GREEN" ---------------------------------------------------------------------------------"
-echo -e "                          🍀 Clover: ${revision}$COL_WHITE (SHA: $lsha1)"
+echo -e "                          🍀 Clover-${revision}$COL_WHITE (SHA: $lsha1)"
 echo -e $COL_CYAN"                                     Test Builds"
 echo -e $COL_GREEN" ---------------------------------------------------------------------------------"$COL_RESET
 echo -e "\n"
@@ -658,7 +662,7 @@ testing
 Utilities() {
 echo
 echo -e $COL_GREEN" ---------------------------------------------------------------------------------"
-echo -e "                          🍀 Clover: ${revision}$COL_WHITE (SHA: $lsha1)"
+echo -e "                          🍀 Clover-${revision}$COL_WHITE (SHA: $lsha1)"
 echo -e $COL_CYAN"                                  External Utilities "
 echo -e $COL_WHITE"                     All Files will be put on Desktop/ClovUtils"
 echo -e $COL_GREEN" ---------------------------------------------------------------------------------"$COL_RESET
@@ -755,7 +759,7 @@ echo -e $COL_GREEN" ------------------------------------------------------------
 if [[ ! -x "$(which python3)" ]]; then
 	echo -e " ${pynone}"
 fi
-echo -e "$COL_GREEN                           🍀 Clover: ${revision}$COL_WHITE (SHA: $lsha1)"
+echo -e "$COL_GREEN                           🍀 Clover-${revision}$COL_WHITE (SHA: $lsha1)"
 echo -e "$COL_WHITE                              Default TOOLCHAIN:$COL_CYAN $MYTOOLCHAIN$COL_WHITE "
 echo -e "${COL_WHITE}                     Switch to${COL_CYAN} XCODE${COL_WHITE} can be done on${COL_CYAN} Cloverbuilds"
 if [[ -x "$(which python3)" ]]; then
@@ -849,7 +853,7 @@ echo -e $COL_GREEN" ------------------------------------------------------------
 if [[ ! -x "$(which python3)" ]]; then
 	echo -e " ${pynone}"
 fi
-echo -e "$COL_GREEN                           🍀 Clover: ${revision}$COL_WHITE (SHA: $lsha1)"
+echo -e "$COL_GREEN                           🍀 Clover-${revision}$COL_WHITE (SHA: $lsha1)"
 echo -e "$COL_WHITE                              Default TOOLCHAIN:$COL_CYAN $MYTOOLCHAIN$COL_WHITE "
 echo -e "${COL_WHITE}                     Switch to${COL_CYAN} XCODE${COL_WHITE} select:${COL_CYAN} build (with XCode)"
 echo -e "${COL_WHITE}     Depending on your${COL_CYAN} XCODE version${COL_WHITE} the Toolset will be${COL_CYAN} automatically chosen"
diff --git a/xbuildme b/xbuildme
index 5db82fa3b9..2704c5e339 100755
--- a/xbuildme
+++ b/xbuildme
@@ -64,10 +64,20 @@ COL_WHITE_ITALIC=$(tput sitm; tput setaf 7)  # Italic White
 COL_RESET="\x1b[39;49;00m" 
 
 revision=$(git describe --tags $(git rev-list --tags --max-count=1))
+
+if [[ "$revision" =~ ^Clover-(.*)$ ]]; then
+  revision="${BASH_REMATCH[1]}"
+fi
+
 if [[ "$revision" =~ ^[0-9]+$ ]]; then
   revision="r${revision}"
 fi
 
+lsha1="not a git repo"
+
+if [[ -d .git ]]; then
+  lsha1=$(git rev-parse --short HEAD)
+fi
 # ====== Main Window SetUp ======
 if [[ "$2" != "ci" ]]; then
     osascript <<EOF
@@ -83,10 +93,9 @@ if [[ "$2" != "ci" ]]; then
         end tell
 EOF
 fi
-
 # ====== Display Menu ======
 echo -e "${COL_GREEN} ---------------------------------------------------------------------------------"
-echo -e "${COL_GREEN}                           🍀 Clover: ${revision} ${COL_WHITE}(SHA: 644db0b82)"
+echo -e "${COL_GREEN}                           🍀 Clover-${revision}${COL_WHITE} (SHA: $lsha1)"
 echo -e "${COL_WHITE}                              Default TOOLCHAIN: ${COL_CYAN}GCC161${COL_WHITE}"
 echo -e "${COL_WHITE}                     Switch to ${COL_CYAN}XCODE${COL_WHITE} select: ${COL_CYAN}build (with XCode)"
 echo -e "${COL_WHITE}     Depending on your ${COL_CYAN}XCODE version${COL_WHITE} the Toolset will be ${COL_CYAN}automatically chosen"
@@ -276,13 +285,13 @@ echo
 echo '------------------------------------------------------------------------'
 cd "${CLOVERROOT}"
 
-local lsha1="not a git repo"
+lsha1="not a git repo"
 
 if [[ -d .git ]]; then
   lsha1=$(git rev-parse --short HEAD)
 fi
 
-echo "buildme, Clover: ${revision} (SHA: $lsha1)"
+echo "buildme, Clover-${revision} (SHA: $lsha1)"
 echo "TOOLCHAIN: $MYTOOLCHAIN (override example: './buildme GCC53')"
 echo
 PS3='Please enter your choice: '