diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 1ead7aa2a9b..ef969ee5f20 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -108,6 +108,7 @@ ELSE()
   SET(WITH_ZLIB bundled CACHE STRING "")
   SET(WITH_JEMALLOC static CACHE STRING "")
   SET(PLUGIN_AUTH_SOCKET STATIC CACHE STRING "")
+  SET(WITH_STRIPPED_CLIENT ON CACHE BOOL "Strip all client binaries")
 ENDIF()
 
 IF(NOT COMPILATION_COMMENT)
diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake
index 54fdab7b17c..0c695480e12 100644
--- a/cmake/mysql_add_executable.cmake
+++ b/cmake/mysql_add_executable.cmake
@@ -79,7 +79,14 @@ FUNCTION (MYSQL_ADD_EXECUTABLE)
     IF (COMP MATCHES ${SKIP_COMPONENTS})
       RETURN()
     ENDIF()
+    IF (WITH_STRIPPED_CLIENT AND NOT target STREQUAL mysqld)
+      INSTALL(CODE "SET(CMAKE_INSTALL_DO_STRIP 1)" ${COMP})
+      SET(reset_strip ON)
+    ENDIF()
     MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP})
+    IF (reset_strip)
+      INSTALL(CODE "SET(CMAKE_INSTALL_DO_STRIP 0)" ${COMP})
+    ENDIF()
   ENDIF()
 
   # create mariadb named symlink