diff --git a/CMake/Build.cpp.in b/CMake/Build.cpp.in
index 10feab5a..44f5b833 100644
--- a/CMake/Build.cpp.in
+++ b/CMake/Build.cpp.in
@@ -17,12 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/core/SemanticVersion.h>
-#include <boost/preprocessor/stringize.hpp>
-#include <algorithm>
 #include <main/Build.h>
-#include <optional>
-#include <stdexcept>
 
 namespace Build {
 static constexpr char versionString[] = "@VERSION@";
@@ -30,13 +25,7 @@ static constexpr char versionString[] = "@VERSION@";
 std::string const&
 getClioVersionString()
 {
-    static std::string const value = [] {
-        std::string const s = versionString;
-        beast::SemanticVersion v;
-        if (!v.parse(s) || v.print() != s)
-            throw std::runtime_error(s + ": Bad server version string");
-        return s;
-    }();
+    static std::string const value = versionString;
     return value;
 }
 
diff --git a/CMake/ClioVersion.cmake b/CMake/ClioVersion.cmake
index c94c3559..177ed33e 100644
--- a/CMake/ClioVersion.cmake
+++ b/CMake/ClioVersion.cmake
@@ -4,18 +4,23 @@
 
 find_package(Git REQUIRED)
 
-execute_process(COMMAND ${GIT_EXECUTABLE} branch --show-current OUTPUT_VARIABLE BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+set(GIT_COMMAND rev-parse --short HEAD)
+execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} OUTPUT_VARIABLE REV OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-set(GIT_COMMAND describe --tags)
+set(GIT_COMMAND branch --show-current)
+execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} OUTPUT_VARIABLE BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} OUTPUT_VARIABLE VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(BRANCH STREQUAL "")
+  set(BRANCH "dev")
+endif()
 
-set(VERSION "${VERSION}")
-
-if(NOT (BRANCH MATCHES master OR BRANCH MATCHES release/*)) # for develop and any other branch name YYYYMMDDHMS-<git-ref>
-  set(GIT_COMMAND rev-parse --short HEAD)
+if(NOT (BRANCH MATCHES master OR BRANCH MATCHES release/*)) # for develop and any other branch name YYYYMMDDHMS-<branch>-<git-ref>
   execute_process(COMMAND date +%Y%m%d%H%M%S OUTPUT_VARIABLE DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set(VERSION "${VERSION}-${DATE}")
+  set(VERSION "${DATE}-${BRANCH}-${REV}")
+else()
+  set(GIT_COMMAND describe --tags)
+  execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} OUTPUT_VARIABLE TAG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set(VERSION "${TAG_VERSION}-${REV}")
 endif()
 
 if(CMAKE_BUILD_TYPE MATCHES Debug)