diff --git a/cmake/mariadb_connector_c.cmake b/cmake/mariadb_connector_c.cmake
index 33062c011bd..3f4deffd593 100644
--- a/cmake/mariadb_connector_c.cmake
+++ b/cmake/mariadb_connector_c.cmake
@@ -4,11 +4,11 @@
 IF(WIN32)
   # todo: libcurl for windows
 ELSE()
-  SET(CC_LIBS ${LIBDL} ${LIBM} ${LIBPTHREAD})
+  SET(CC_LIBS ${LIBDL} ${LIBM} ${CMAKE_THREAD_LIBS_INIT})
   FIND_PACKAGE(OpenSSL)
   #FIND_PACKAGE(GnuTLS)
   IF(OPENSSL_FOUND)
-    SET(CC_LIBS ${CC_LIBS} ${OPENSSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
+    SET(CC_LIBS ${CC_LIBS} ${OPENSSL_LIBRARIES})
     SET(CC_CMAKE_OPTS "-DWITH_SSL=OPENSSL")
   ELSEIF (GNUTLS_FOUND)
     SET(CC_LIBS ${CC_LIBS} ${GNUTLS_LIBRARY})
@@ -19,9 +19,14 @@ ELSE()
   INCLUDE(${CMAKE_SOURCE_DIR}/cmake/iconv.cmake)
   IF(ICONV_FOUND)
     IF(ICONV_EXTERNAL)
-      SET(CC_LIBS ${CC_LIBS} ${ICONV_LIBRARIES})
+      IF(NOT ICONV_LIBRARIES MATCHES "libc.so")
+        SET(CC_LIBS ${CC_LIBS} ${ICONV_LIBRARIES})
+      ENDIF()
     ENDIF()
   ENDIF()
 ENDIF()
+IF(NOT TARGET zlib)
+  SET(CC_LIBS ${CC_LIBS} ${ZLIB_LIBRARY})
+ENDIF()
+SET(mysqlclient_LIB_DEPENDS ${CC_LIBS} CACHE INTERNAL "")
 MARK_AS_ADVANCED(CC_LIBS CC_CMAKE_OPTS)
-