diff --git a/src/Common/config_version.h.in b/src/Common/config_version.h.in
index 880824f8ad0..09f1e5500ad 100644
--- a/src/Common/config_version.h.in
+++ b/src/Common/config_version.h.in
@@ -15,6 +15,7 @@
 #cmakedefine VERSION_DESCRIBE "@VERSION_DESCRIBE@"
 #cmakedefine VERSION_GITHASH "@VERSION_GITHASH@"
 #cmakedefine VERSION_INTEGER @VERSION_INTEGER@
+#cmakedefine VERSION_DATE @VERSION_DATE@
 
 #if defined(VERSION_MAJOR)
 #define DBMS_VERSION_MAJOR VERSION_MAJOR
diff --git a/src/Storages/System/CMakeLists.txt b/src/Storages/System/CMakeLists.txt
index a1eb525dceb..74cb0d01243 100644
--- a/src/Storages/System/CMakeLists.txt
+++ b/src/Storages/System/CMakeLists.txt
@@ -8,7 +8,6 @@ get_property (BUILD_INCLUDE_DIRECTORIES DIRECTORY ${ClickHouse_SOURCE_DIR} PROPE
 
 get_property(TZDATA_VERSION GLOBAL PROPERTY TZDATA_VERSION_PROP)
 
-string (TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
 configure_file (StorageSystemBuildOptions.generated.cpp.in ${CONFIG_BUILD})
 
 include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
diff --git a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
index 8ece4219d0c..4c1de8b53f5 100644
--- a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
+++ b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
@@ -1,22 +1,15 @@
 // .cpp autogenerated by cmake
 
-#cmakedefine01 BUILD_DETERMINISTIC
-
 const char * auto_config_build[]
 {
     "VERSION_FULL", "@VERSION_FULL@",
     "VERSION_DESCRIBE", "@VERSION_DESCRIBE@",
     "VERSION_INTEGER", "@VERSION_INTEGER@",
-
-#if BUILD_DETERMINISTIC
     "SYSTEM", "@CMAKE_SYSTEM_NAME@",
-#else
     "VERSION_GITHASH", "@VERSION_GITHASH@",
     "VERSION_REVISION", "@VERSION_REVISION@",
-    "BUILD_DATE", "@BUILD_DATE@",
+    "VERSION_DATE", "@VERSION_DATE@",
     "SYSTEM", "@CMAKE_SYSTEM@",
-#endif
-
     "BUILD_TYPE", "@CMAKE_BUILD_TYPE@",
     "SYSTEM_PROCESSOR", "@CMAKE_SYSTEM_PROCESSOR@",
     "LIBRARY_ARCHITECTURE", "@CMAKE_LIBRARY_ARCHITECTURE@",
diff --git a/tests/queries/0_stateless/00417_system_build_options.reference b/tests/queries/0_stateless/00417_system_build_options.reference
index 2b2c8f1df33..5decd8ca4ec 100644
--- a/tests/queries/0_stateless/00417_system_build_options.reference
+++ b/tests/queries/0_stateless/00417_system_build_options.reference
@@ -1,4 +1,3 @@
-BUILD_DATE
 BUILD_TYPE
 CXX_COMPILER
 CXX_FLAGS
diff --git a/tests/queries/0_stateless/00417_system_build_options.sh b/tests/queries/0_stateless/00417_system_build_options.sh
index bfdfa7d14ce..36c9e9d3885 100755
--- a/tests/queries/0_stateless/00417_system_build_options.sh
+++ b/tests/queries/0_stateless/00417_system_build_options.sh
@@ -4,4 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM system.build_options" | perl -lnE 'print $1 if /(BUILD_DATE|BUILD_TYPE|CXX_COMPILER)\s+\S+/ || /(CXX_FLAGS|LINK_FLAGS|TZDATA_VERSION)/';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM system.build_options" | perl -lnE 'print $1 if /(BUILD_TYPE|CXX_COMPILER)\s+\S+/ || /(CXX_FLAGS|LINK_FLAGS|TZDATA_VERSION)/';
diff --git a/utils/release/release_lib.sh b/utils/release/release_lib.sh
index 896fa7f08a0..efa41ae22ad 100644
--- a/utils/release/release_lib.sh
+++ b/utils/release/release_lib.sh
@@ -91,9 +91,12 @@ function gen_revision_author {
 
             git_describe=`git describe`
             git_hash=`git rev-parse HEAD`
+            VERSION_DATE=`git show -s --format=%cs $git_hash`
+
             sed -i -e "s/SET(VERSION_REVISION [^) ]*/SET(VERSION_REVISION $VERSION_REVISION/g;" \
                 -e "s/SET(VERSION_DESCRIBE [^) ]*/SET(VERSION_DESCRIBE $git_describe/g;" \
                 -e "s/SET(VERSION_GITHASH [^) ]*/SET(VERSION_GITHASH $git_hash/g;" \
+                -e "s/SET(VERSION_DATE [^) ]*/SET(VERSION_DATE $VERSION_DATE/g;" \
                 -e "s/SET(VERSION_MAJOR [^) ]*/SET(VERSION_MAJOR $VERSION_MAJOR/g;" \
                 -e "s/SET(VERSION_MINOR [^) ]*/SET(VERSION_MINOR $VERSION_MINOR/g;" \
                 -e "s/SET(VERSION_PATCH [^) ]*/SET(VERSION_PATCH $VERSION_PATCH/g;" \