diff --git a/API/CMakeLists.txt b/API/CMakeLists.txt
index fbeba11734e4e3b72d7edaa1481f0e025b31d451..650a7cbb68ff3fbc6da7a9f1c62e56a3d848d14c 100644
--- a/API/CMakeLists.txt
+++ b/API/CMakeLists.txt
@@ -10,8 +10,8 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 
 set(CODE_NAME "High-End")   # Code name of
 set(CODE_BUILD "RC")         # Build: ALPHA|BETA|RC|RELEASE
-set(CODE_RELEASE 2)
-set(PUBLISH 1)
+set(CODE_RELEASE "3")
+set(PUBLISH "0")
 
 execute_process(
     COMMAND date +%Y%m%dT%H%M
diff --git a/API/src/version.cpp b/API/src/version.cpp
index b4be8deea1c975bd90dfe73b827cf69b301c473e..966941dd24e3572ec9cfd36400010b2eb010f6cb 100644
--- a/API/src/version.cpp
+++ b/API/src/version.cpp
@@ -8,6 +8,10 @@
 using namespace web;
 using namespace std;
 
+#ifndef GIT_BRANCH
+  #define GIT_BRANCH "unknown-branch"
+#endif
+
 /// @brief Short version string
 std::string buildShortVersion()
 {
@@ -43,14 +47,18 @@ std::string buildLongVersion()
     << "     build: " <<  snakeoil_api_VERSION_MAJOR << '.'
                       << snakeoil_api_VERSION_MINOR << '.'
                       << snakeoil_api_VERSION_PATCH;
-#ifdef CODE_RELEASE
-  if (CODE_RELEASE >= 0) {
-    o << '.' << CODE_RELEASE;
+
+  string const code_build(CODE_BUILD);
+  bool const is_not_release = "RELEASE" != code_build;
+
+  if (is_not_release) {
+    if (CODE_RELEASE >= 0) {
+      o << "-" CODE_BUILD "-" << CODE_RELEASE;
+    }
   }
-#endif
 
   o << " (" << CODE_NAME;
-  if (CODE_BUILD[0] != 'R') {
+  if (is_not_release) {
     o << ' ' << CODE_BUILD;
     if (CODE_RELEASE > 0) {
       o << '-' << CODE_RELEASE;
diff --git a/API/version.h.in b/API/version.h.in
index 821426ed5e60de899d96a4469ce471b78c064983..8edfe40b016d97f22d3fa0b67f15dde2603992f8 100644
--- a/API/version.h.in
+++ b/API/version.h.in
@@ -5,8 +5,8 @@
 #cmakedefine CODE_NAME    "@CODE_NAME@"
 #cmakedefine CODE_BUILD   "@CODE_BUILD@"
 #cmakedefine TIME_STAMP   "@TIME_STAMP@"
-#cmakedefine GIT_BRANCH   "@GIT_BRANCH@"
+#cmakedefine GIT_BRANCH   "${GIT_BRANCH}"
 #cmakedefine GIT_HASH     "@GIT_HASH@"
-#cmakedefine01 CODE_RELEASE
+#cmakedefine CODE_RELEASE ${CODE_RELEASE}
 #cmakedefine01 PUBLISH