diff --git a/CMakeLists.txt b/CMakeLists.txt
index aed0d85c..44cd36d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,7 @@ PROJECT (CLICKHOUSE-CLIENT)
     ENDIF ()
 
     IF (WITH_SYSTEM_CITYHASH)
-        FIND_PACKAGE(cityhash REQUIRED)
+        FIND_LIBRARY(SYSTEM_CITYHASH NAMES cityhash REQUIRED)
     ELSE ()
         INCLUDE_DIRECTORIES (contrib/cityhash/cityhash)
         SUBDIRS (contrib/cityhash/cityhash)
diff --git a/clickhouse/CMakeLists.txt b/clickhouse/CMakeLists.txt
index 67663ec5..9680c164 100644
--- a/clickhouse/CMakeLists.txt
+++ b/clickhouse/CMakeLists.txt
@@ -38,12 +38,18 @@ IF (WITH_OPENSSL)
     LIST(APPEND clickhouse-cpp-lib-src base/sslsocket.cpp)
 ENDIF ()
 
+IF (WITH_SYSTEM_CITYHASH)
+    SET (CITYHASH ${SYSTEM_CITYHASH})
+ELSE ()
+    SET (CITYHASH cityhash::cityhash)
+ENDIF ()
+
 ADD_LIBRARY (clickhouse-cpp-lib ${clickhouse-cpp-lib-src})
 SET_TARGET_PROPERTIES (clickhouse-cpp-lib PROPERTIES LINKER_LANGUAGE CXX)
 TARGET_LINK_LIBRARIES (clickhouse-cpp-lib
     absl::int128
-    cityhash::cityhash
     lz4::lz4
+    ${CITYHASH}
 )
 TARGET_INCLUDE_DIRECTORIES (clickhouse-cpp-lib
     PUBLIC ${PROJECT_SOURCE_DIR}