diff --git a/cmake/cmake.define b/cmake/cmake.define
index ff582261b3..1b277a1f3a 100644
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@@ -6,12 +6,14 @@ set(TD_BUILD_KEEPER_INTERNAL FALSE)
 # set output directory
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib)
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/bin)
+SET(SHARE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/share)
 SET(TD_TESTS_OUTPUT_DIR ${PROJECT_BINARY_DIR}/test)
 
 MESSAGE(STATUS "Project source directory: " ${PROJECT_SOURCE_DIR})
 MESSAGE(STATUS "Project binary files output path: " ${PROJECT_BINARY_DIR})
 MESSAGE(STATUS "Project executable files output path: " ${EXECUTABLE_OUTPUT_PATH})
 MESSAGE(STATUS "Project library files output path: " ${LIBRARY_OUTPUT_PATH})
+MESSAGE(STATUS "Project share files output path: " ${SHARE_OUTPUT_PATH})
 
 IF(NOT DEFINED TD_GRANT)
     SET(TD_GRANT FALSE)
diff --git a/cmake/tz_CMakeLists.txt.in b/cmake/tz_CMakeLists.txt.in
new file mode 100644
index 0000000000..a2e3636d9a
--- /dev/null
+++ b/cmake/tz_CMakeLists.txt.in
@@ -0,0 +1,15 @@
+# timezone
+ExternalProject_Add(tz
+        GIT_REPOSITORY https://github.com/eggert/tz.git
+        GIT_TAG main
+        SOURCE_DIR "${TD_CONTRIB_DIR}/tz"
+        BINARY_DIR ""
+        CONFIGURE_COMMAND ""
+        #BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+        GIT_SHALLOW true
+        GIT_PROGRESS true
+        BUILD_COMMAND ""
+)
+
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index eae697560b..e52a5b4120 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -106,6 +106,8 @@ cat("${TD_SUPPORT_DIR}/zlib_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 # cJson
 cat("${TD_SUPPORT_DIR}/cjson_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 
+cat("${TD_SUPPORT_DIR}/tz_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+
 # xz
 # cat("${TD_SUPPORT_DIR}/xz_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 
@@ -632,6 +634,11 @@ if(${TD_LINUX} AND ${BUILD_WITH_S3})
     add_subdirectory(azure-cmake EXCLUDE_FROM_ALL)
 endif()
 
+execute_process(
+        COMMAND make TZDIR=${SHARE_OUTPUT_PATH}/timezone all posix_only
+        WORKING_DIRECTORY "${TD_CONTRIB_DIR}/tz"
+)
+
 # ================================================================================================
 # Build test
 # ================================================================================================
diff --git a/packaging/tools/make_install.bat b/packaging/tools/make_install.bat
index 04d342ea06..ed4fc982b4 100644
--- a/packaging/tools/make_install.bat
+++ b/packaging/tools/make_install.bat
@@ -43,6 +43,9 @@ if not exist %target_dir%\\cfg (
 if not exist %target_dir%\\include (
     mkdir %target_dir%\\include
 )
+if not exist %target_dir%\\share (
+    mkdir %target_dir%\\share
+)
 if not exist %target_dir%\\driver (
     mkdir %target_dir%\\driver
 )
@@ -67,6 +70,7 @@ copy %binary_dir%\\build\\lib\\taos.lib %target_dir%\\driver > nul
 copy %binary_dir%\\build\\lib\\taos_static.lib %target_dir%\\driver > nul
 copy %binary_dir%\\build\\lib\\taos.dll %target_dir%\\driver > nul
 copy %binary_dir%\\build\\bin\\taos.exe %target_dir% > nul
+xcopy %binary_dir%\\build\\share\\* %target_dir%\\share > nul
 if exist %binary_dir%\\build\\bin\\taosBenchmark.exe (
     copy %binary_dir%\\build\\bin\\taosBenchmark.exe %target_dir% > nul
 )
diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index 1b8fa2fb70..ee13f97f3e 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -52,6 +52,8 @@ else
     installDir="/usr/local/taos"
   fi
 fi
+
+timezone_dir="/usr/local/share/timezone"
 install_main_dir=${installDir}
 bin_dir="${installDir}/bin"
 cfg_dir="${installDir}/cfg"
@@ -378,6 +380,11 @@ function install_header() {
   ${csudo}chmod 644 ${install_main_dir}/include/*
 }
 
+function install_timezone(){
+  ${csudo}mkdir -p ${timezone_dir}
+  ${csudo}cp -rf ${binary_dir}/build/share/timezone/* ${timezone_dir} && ${csudo}chmod 644 ${timezone_dir}/*
+}
+
 function install_config() {
   if [ ! -f ${cfg_install_dir}/${configFile} ]; then
     ${csudo}mkdir -p ${cfg_install_dir}
@@ -634,6 +641,7 @@ function update_TDengine() {
   install_log
   install_header
   install_lib
+  install_timezone
   #  install_connector
   install_examples
   install_bin
@@ -699,6 +707,7 @@ function install_TDengine() {
   install_log
   install_header
   install_lib
+  install_timezone
   #  install_connector
   install_examples
   install_bin