diff --git a/contrib/abseil-cpp-cmake/CMakeLists.txt b/contrib/abseil-cpp-cmake/CMakeLists.txt
index 4c31ecfc599..d64b6036611 100644
--- a/contrib/abseil-cpp-cmake/CMakeLists.txt
+++ b/contrib/abseil-cpp-cmake/CMakeLists.txt
@@ -17,3 +17,17 @@ get_target_property(FLAT_HASH_SET_INCLUDE_DIR absl::flat_hash_set INTERFACE_INCL
 target_include_directories (_abseil_swiss_tables SYSTEM BEFORE INTERFACE ${FLAT_HASH_SET_INCLUDE_DIR})
 
 add_library(ch_contrib::abseil_swiss_tables ALIAS _abseil_swiss_tables)
+
+set(ABSL_FORMAT_SRC
+    ${ABSL_ROOT_DIR}/absl/strings/internal/str_format/arg.cc
+    ${ABSL_ROOT_DIR}/absl/strings/internal/str_format/bind.cc
+    ${ABSL_ROOT_DIR}/absl/strings/internal/str_format/extension.cc
+    ${ABSL_ROOT_DIR}/absl/strings/internal/str_format/float_conversion.cc
+    ${ABSL_ROOT_DIR}/absl/strings/internal/str_format/output.cc
+    ${ABSL_ROOT_DIR}/absl/strings/internal/str_format/parser.cc
+)
+
+add_library(_abseil_str_format ${ABSL_FORMAT_SRC})
+target_include_directories(_abseil_str_format PUBLIC ${ABSL_ROOT_DIR})
+
+add_library(ch_contrib::abseil_str_format ALIAS _abseil_str_format)
diff --git a/contrib/re2-cmake/CMakeLists.txt b/contrib/re2-cmake/CMakeLists.txt
index a081f92bc94..305c2400c77 100644
--- a/contrib/re2-cmake/CMakeLists.txt
+++ b/contrib/re2-cmake/CMakeLists.txt
@@ -12,6 +12,7 @@ endif()
 set(SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/re2")
 
 set(RE2_SOURCES
+    ${SRC_DIR}/re2/bitmap256.cc
     ${SRC_DIR}/re2/bitstate.cc
     ${SRC_DIR}/re2/compile.cc
     ${SRC_DIR}/re2/dfa.cc
@@ -31,11 +32,13 @@ set(RE2_SOURCES
     ${SRC_DIR}/re2/tostring.cc
     ${SRC_DIR}/re2/unicode_casefold.cc
     ${SRC_DIR}/re2/unicode_groups.cc
+    ${SRC_DIR}/util/pcre.cc
     ${SRC_DIR}/util/rune.cc
     ${SRC_DIR}/util/strutil.cc
 )
 add_library(re2 ${RE2_SOURCES})
 target_include_directories(re2 PUBLIC "${SRC_DIR}")
+target_link_libraries(re2 ch_contrib::abseil_str_format)
 
 # Building re2 which is thread-safe and re2_st which is not.
 # re2 changes its state during matching of regular expression, e.g. creates temporary DFA.
@@ -47,6 +50,7 @@ target_compile_definitions (re2_st PRIVATE NDEBUG NO_THREADS re2=re2_st)
 target_include_directories (re2_st PRIVATE .)
 target_include_directories (re2_st SYSTEM PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 target_include_directories (re2_st SYSTEM BEFORE PUBLIC ${SRC_DIR})
+target_link_libraries (re2_st ch_contrib::abseil_str_format)
 
 file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/re2_st)
 foreach (FILENAME filtered_re2.h re2.h set.h stringpiece.h)
@@ -59,17 +63,6 @@ foreach (FILENAME filtered_re2.h re2.h set.h stringpiece.h)
     add_dependencies (re2_st transform_${FILENAME})
 endforeach ()
 
-file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/util)
-foreach (FILENAME mutex.h)
-    add_custom_command (OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/util/${FILENAME}"
-        COMMAND ${CMAKE_COMMAND} -DSOURCE_FILENAME="${SRC_DIR}/util/${FILENAME}"
-            -DTARGET_FILENAME="${CMAKE_CURRENT_BINARY_DIR}/util/${FILENAME}"
-            -P "${CMAKE_CURRENT_SOURCE_DIR}/re2_transform.cmake"
-        COMMENT "Creating ${FILENAME} for re2_st library.")
-    add_custom_target (transform_${FILENAME} DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/util/${FILENAME}")
-    add_dependencies (re2_st transform_${FILENAME})
-endforeach ()
-
 # NOTE: you should not change name of library here, since it is used to generate required header (see above)
 add_library(ch_contrib::re2 ALIAS re2)
 add_library(ch_contrib::re2_st ALIAS re2_st)