diff --git a/cmake/columnstore_version.cmake b/cmake/columnstore_version.cmake
index fe373a82d..1551293d1 100644
--- a/cmake/columnstore_version.cmake
+++ b/cmake/columnstore_version.cmake
@@ -33,14 +33,14 @@ IF(NOT "${CS_MAJOR_VERSION}" MATCHES "[0-9]+" OR
     MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.")
   ENDIF()
 
-  SET(VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}")
+  SET(VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}.${CS_RELEASE_VERSION}")
   MESSAGE("== MariaDB-Columnstore ${VERSION}")
   IF (NOT INSTALL_LAYOUT)
       SET(CPACK_PACKAGE_VERSION_MAJOR ${CS_MAJOR_VERSION})
       SET(CPACK_PACKAGE_VERSION_MINOR ${CS_MINOR_VERSION})
       SET(CPACK_PACKAGE_VERSION_PATCH ${CS_PATCH_VERSION}${CS_EXTRA_VERSION})
   ENDIF ()
-  SET(PACKAGE_VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}")
+  SET(PACKAGE_VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}.${CS_RELEASE_VERSION}")
   SET(PACKAGE_RELEASE "${CS_RELEASE_VERSION}")
   if (${CS_MINOR_VERSION} LESS 10)
       SET(MCSVERSIONHEX "0x0${CS_MAJOR_VERSION}0${CS_MINOR_VERSION}")
diff --git a/dbcon/mysql/ha_mcs.cpp b/dbcon/mysql/ha_mcs.cpp
index 50b14dd26..0035b8b55 100644
--- a/dbcon/mysql/ha_mcs.cpp
+++ b/dbcon/mysql/ha_mcs.cpp
@@ -139,7 +139,7 @@ static int columnstore_init_func(void* p)
             tm.tm_year % 100, tm.tm_mon + 1, tm.tm_mday,
             tm.tm_hour, tm.tm_min, tm.tm_sec);
 
-    fprintf(stderr, "Columnstore: Started; Version: %s-%s\n", columnstore_version.c_str(), columnstore_release.c_str());
+    fprintf(stderr, "Columnstore: Started; Version: %s\n", columnstore_version.c_str());
 
     strncpy(cs_version, columnstore_version.c_str(), sizeof(cs_version));
     cs_version[sizeof(cs_version) - 1] = 0;