diff --git a/Formula/c/clickhouse-cpp.rb b/Formula/c/clickhouse-cpp.rb
index 2a2cd2c410f1f..4e74788033cfb 100644
--- a/Formula/c/clickhouse-cpp.rb
+++ b/Formula/c/clickhouse-cpp.rb
@@ -1,31 +1,25 @@
 class ClickhouseCpp < Formula
   desc "C++ client library for ClickHouse"
   homepage "https://github.com/ClickHouse/clickhouse-cpp"
-  url "https://github.com/ClickHouse/clickhouse-cpp/archive/refs/tags/v2.5.1.tar.gz"
-  sha256 "8942fc702eca1f656e59c680c7e464205bffea038b62c1a0ad1f794ee01e7266"
+  url "https://github.com/ClickHouse/clickhouse-cpp/archive/refs/tags/v2.6.0.tar.gz"
+  sha256 "f694395ab49e7c2380297710761a40718278cefd86f4f692d3f8ce4293e1335f"
   license "Apache-2.0"
+  head "https://github.com/ClickHouse/clickhouse-cpp.git", branch: "master"
 
   bottle do
-    rebuild 1
-    sha256 cellar: :any_skip_relocation, arm64_tahoe:   "0654e0226efe59eb3660e155e851b6aa8cb522e5457a60d44008838f936114e2"
-    sha256 cellar: :any_skip_relocation, arm64_sequoia: "99586f86f929be3f524a69be3e1ad4fd4bec9f25fcb3f55d3f7401753cd068d3"
-    sha256 cellar: :any_skip_relocation, arm64_sonoma:  "10b3d4147d44d1850c64c5593e57113b6ee0f646217bf73098ac0c63a254378b"
-    sha256 cellar: :any_skip_relocation, arm64_ventura: "dc32dffac451b190139c200241b37b0b6d7e0835efdbb74156552451b8b57377"
-    sha256 cellar: :any_skip_relocation, sonoma:        "4809344e248635dfc707f436f5e3b55cf4ea0e9bc792347687d8e65f1c492a52"
-    sha256 cellar: :any_skip_relocation, ventura:       "0af47d43ff24d655e84ed146acbc08ddc3fbe58e4ad428aa77ebe4d955ed5a37"
-    sha256 cellar: :any_skip_relocation, arm64_linux:   "4cd7ba2866a45d7db1dd11dd76a254d9decb177d0463b96aef556902e5c9620f"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:  "632c681d02c3b5261da20562567ec7e0bfcce88e6abde92d13b24fad35662498"
-  end
-
-  head do
-    url "https://github.com/ClickHouse/clickhouse-cpp.git", branch: "master"
-    depends_on "zstd"
+    sha256 cellar: :any_skip_relocation, arm64_tahoe:   "f6e3824acd6cbc7fb6eb0fca264341b71ce231bb8bcf9c49a8d2068233963616"
+    sha256 cellar: :any_skip_relocation, arm64_sequoia: "0f2fe3c51ac226cc47312483cf41ae089775ba3352d0c9165d4d2fc31f737992"
+    sha256 cellar: :any_skip_relocation, arm64_sonoma:  "44b493b2c517dbcf968bc3573dfdf9c0dd45573095272fc3a53922aca7ce51af"
+    sha256 cellar: :any_skip_relocation, sonoma:        "1e34322b12d40a1c6a31a8a17448aed7c6ded46057340afe14bf3fe0be89acdc"
+    sha256 cellar: :any_skip_relocation, arm64_linux:   "13b147b1c1087b24fb84ca2dc42691de39e60f24e12f774af1c1c701073646c7"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "c1f392feecc378fec9d916616f84fc2ba97d96fb6910098cf5ceeb4b22e026bd"
   end
 
   depends_on "cmake" => :build
   depends_on "abseil"
   depends_on "lz4"
   depends_on "openssl@3"
+  depends_on "zstd"
 
   def install
     # We use the vendored version (1.0.2) of `cityhash` because newer versions
@@ -37,21 +31,13 @@ def install
       -DOPENSSL_ROOT_DIR=#{Formula["openssl@3"].opt_prefix}
       -DWITH_SYSTEM_ABSEIL=ON
       -DWITH_SYSTEM_CITYHASH=OFF
-      -DWITH_SYSTEM_LZ4=ON
+      -DWITH_SYSTEM_LZ4=O
+      -DWITH_SYSTEM_ZSTD=ON
     ]
     # Upstream only allows building static libs on macOS
     # See: https://github.com/ClickHouse/clickhouse-cpp/pull/219#issuecomment-1362928064
     args << "-DBUILD_SHARED_LIBS=ON" unless OS.mac?
 
-    if build.stable?
-      # Workaround for CMake 4 until next release with:
-      # https://github.com/ClickHouse/clickhouse-cpp/commit/56155829273bf428aebd9c501c2ff898058fafea
-      odie "Remove CMake 4 workaround!" if version > "2.5.1"
-      ENV["CMAKE_POLICY_VERSION_MINIMUM"] = "3.5.2"
-    else
-      args << "-DWITH_SYSTEM_ZSTD=ON"
-    end
-
     system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
     system "cmake", "--build", "build"
     system "cmake", "--install", "build"
@@ -101,14 +87,10 @@ def install
     CPP
 
     args = %W[
-      -std=c++17
-      -I#{include}
-      -L#{lib}
-      -lclickhouse-cpp-lib
-      -L#{Formula["openssl@3"].opt_lib}
-      -lcrypto -lssl
-      -L#{Formula["lz4"].opt_lib}
-      -llz4
+      -std=c++17 -I#{include} -L#{lib} -lclickhouse-cpp-lib
+      -L#{Formula["openssl@3"].opt_lib} -lcrypto -lssl
+      -L#{Formula["lz4"].opt_lib} -llz4
+      -L#{Formula["zstd"].opt_lib} -lzstd
     ]
     args += %W[-L#{libexec}/lib -lcityhash] if OS.mac?
     system ENV.cxx, "main.cpp", *args, "-o", "test-client"