diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1aff1e73b2a80..df2b93e76059a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,6 +160,7 @@ INCLUDE(plugin)
 INCLUDE(install_macros)
 INCLUDE(systemd)
 INCLUDE(mysql_add_executable)
+INCLUDE(symlinks)
 INCLUDE(compile_flags)
 INCLUDE(crc32)
 
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 96346808a6222..d9a0694ad10c6 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -93,11 +93,25 @@ TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB})
 SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
 PROPERTIES HAS_CXX TRUE)
 
-
-FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
+FOREACH(t mysql mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
   mysqladmin mysqlslap async_example)
   ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
 ENDFOREACH()
 
-ADD_DEFINITIONS(-DHAVE_DLOPEN)
+# MariaDB symlinks
+CREATE_MARIADB_SYMLINK(mysql mariadb)
+CREATE_MARIADB_SYMLINK(mysqlaccess mariadb-access)
+CREATE_MARIADB_SYMLINK(mysqladmin mariadb-admin)
+CREATE_MARIADB_SYMLINK(mysqlbinlog mariadb-binlog)
+CREATE_MARIADB_SYMLINK(mysqlcheck mariadb-check)
+CREATE_MARIADB_SYMLINK(mysqldump mariadb-dump)
+CREATE_MARIADB_SYMLINK(mysql_embedded mariadb-embedded) 
+CREATE_MARIADB_SYMLINK(mysql_find_rows mariadb-find-rows)
+CREATE_MARIADB_SYMLINK(mysqlimport mariadb-import) 
+CREATE_MARIADB_SYMLINK(mysql_plugin mariadb-plugin)
+CREATE_MARIADB_SYMLINK(mysqlshow mariadb-show)
+CREATE_MARIADB_SYMLINK(mysqlslap mariadb-slap)
+CREATE_MARIADB_SYMLINK(mysqltest mariadb-test)
+CREATE_MARIADB_SYMLINK(mysql_waitpid mariadb-waitpid)
 
+ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 85965971286ea..c07118dbf6a64 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -24,12 +24,13 @@ SET(CPACK_COMPONENT_COMMON_GROUP "common")
 SET(CPACK_COMPONENT_CLIENTPLUGINS_GROUP "common")
 SET(CPACK_COMPONENT_COMPAT_GROUP "compat")
 SET(CPACK_COMPONENT_BACKUP_GROUP "backup")
+SET(CPACK_COMPONENT_SYMLINKS_GROUP "symlinks")
 
 SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts
                          SupportFiles Development ManPagesDevelopment
                          ManPagesTest Readme ManPagesClient Test 
                          Common Client SharedLibraries ClientPlugins
-                         backup
+                         backup symlinks
 )
 
 SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
@@ -135,6 +136,7 @@ SET(CPACK_RPM_compat_USER_FILELIST ${ignored})
 SET(CPACK_RPM_devel_USER_FILELIST ${ignored})
 SET(CPACK_RPM_test_USER_FILELIST ${ignored})
 SET(CPACK_RPM_backup_USER_FILELIST ${ignored})
+SET(CPACK_RPM_symlinks_USER_FILELIST ${ignored})
 
 # "set/append array" - append a set of strings, separated by a space
 MACRO(SETA var)
@@ -177,6 +179,8 @@ SETA(CPACK_RPM_server_PACKAGE_REQUIRES
   "${CPACK_RPM_PACKAGE_REQUIRES}"
   "MariaDB-client")
 
+SET(CPACK_RPM_symlinks_PACKAGE_REQUIRES "MariaDB-client")
+
 IF(WITH_WSREP)
   SETA(CPACK_RPM_server_PACKAGE_REQUIRES
     "galera-4" "rsync" "lsof" "grep" "gawk" "iproute"
diff --git a/cmake/symlinks.cmake b/cmake/symlinks.cmake
new file mode 100644
index 0000000000000..da38d2c28d5fa
--- /dev/null
+++ b/cmake/symlinks.cmake
@@ -0,0 +1,8 @@
+# Add MariaDB symlinks
+MACRO(CREATE_MARIADB_SYMLINK binaryname symlinkname)
+  IF (EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${binaryname} AND NOT WIN32)
+    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${binaryname} ${CMAKE_CURRENT_BINARY_DIR}/${symlinkname})" COMPONENT symlinks)
+    install(CODE "message(\"-- Created symlink: ${symlinkname} -> ${binaryname}\")" COMPONENT symlinks)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${symlinkname} DESTINATION ${INSTALL_BINDIR} COMPONENT symlinks)
+  ENDIF()
+ENDMACRO(CREATE_MARIADB_SYMLINK)
diff --git a/debian/mariadb-client-10.4.links b/debian/mariadb-client-10.4.links
index 4a5049692469d..b93d2d7f8fdb9 100644
--- a/debian/mariadb-client-10.4.links
+++ b/debian/mariadb-client-10.4.links
@@ -1,6 +1,44 @@
+usr/bin/mysql_find_rows usr/bin/mariadb-find-rows
+usr/bin/mysql_fix_extensions usr/bin/mariadb-fix-extenstions
+usr/bin/mysql_plugin usr/bin/mariadb-plugin
+usr/bin/mysql_waitpid usr/bin/mariadb-waitpid
+usr/bin/mysqlaccess usr/bin/mariadb-access
+usr/bin/mysqladmin usr/bin/mariadb-admin
+usr/bin/mysqlanalyze usr/bin/mariadb-analyze
+usr/bin/mysqlbinlog usr/bin/mariadb-binlog
+usr/bin/mysqlcheck usr/bin/mariadb-analyze
+usr/bin/mysqlcheck usr/bin/mariadb-optimize
+usr/bin/mysqlcheck usr/bin/mariadb-repair
 usr/bin/mysqlcheck usr/bin/mysqlanalyze
 usr/bin/mysqlcheck usr/bin/mysqloptimize
 usr/bin/mysqlcheck usr/bin/mysqlrepair
+usr/bin/mysqldump usr/bin/mariadb-dump
+usr/bin/mysqldumpslow usr/bin/mariadb-dump-slow
+usr/bin/mysqlimport usr/bin/mariadb-import
+usr/bin/mysqloptimize usr/bin/mariadb-optimize
+usr/bin/mysqlrepair usr/bin/mariadb-repair
+usr/bin/mysqlreport usr/bin/mariadb-report
+usr/bin/mysqlslap usr/bin/mariadb-slap
+usr/bin/mysqltest usr/bin/mariadb-test
+usr/share/man/man1/mysql_find_rows.1.gz usr/share/man/man1/mariadb-find-rows.1.gz
+usr/share/man/man1/mysql_fix_extensions.1.gz usr/share/man/man1/mariadb-fix-extensions.1.gz
+usr/share/man/man1/mysql_plugin.1.gz usr/share/man/man1/mariadb-plugin.1.gz
+usr/share/man/man1/mysql_waitpid.1.gz usr/share/man/man1/mariadb-waitpid.1.gz
+usr/share/man/man1/mysqlaccess.1.gz usr/share/man/man1/mariadb-access.1.gz
+usr/share/man/man1/mysqladmin.1.gz usr/share/man/man1/mariadb-admin.1.gz
+usr/share/man/man1/mysqlanalyze.1.gz usr/share/man/man1/mariadb-analyze.1.gz
+usr/share/man/man1/mysqlbinlog.1.gz usr/share/man/man1/mariadb-binlog.1.gz
+usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-analyze.1.gz
+usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-optimize.1.gz
+usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-repair.1.gz
 usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlanalyze.1.gz
 usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqloptimize.1.gz
 usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz
+usr/share/man/man1/mysqldump.1.gz usr/share/man/man1/mariadb-dump.1.gz
+usr/share/man/man1/mysqldumpslow.1.gz usr/share/man/man1/mariadb-dump-slow.1.gz
+usr/share/man/man1/mysqlimport.1.gz usr/share/man/man1/mariadb-import.1.gz
+usr/share/man/man1/mysqloptimize.1.gz usr/share/man/man1/mariadb-optimize.1.gz
+usr/share/man/man1/mysqlrepair.1.gz usr/share/man/man1/mariadb-repair.1.gz
+usr/share/man/man1/mysqlreport.1.gz usr/share/man/man1/mariadb-report.1.gz
+usr/share/man/man1/mysqlslap.1.gz usr/share/man/man1/mariadb-slap.1.gz
+usr/share/man/man1/mysqltest.1.gz usr/share/man/man1/mariadb-test.1.gz
diff --git a/debian/mariadb-client-core-10.4.links b/debian/mariadb-client-core-10.4.links
new file mode 100644
index 0000000000000..4c5ff23b38b0e
--- /dev/null
+++ b/debian/mariadb-client-core-10.4.links
@@ -0,0 +1,4 @@
+usr/bin/mysql usr/bin/mariadb
+usr/bin/mysqlcheck usr/bin/mariadb-check
+usr/share/man/man1/mysql.1.gz usr/share/man/man1/mariadb.1.gz
+usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-check.1.gz
diff --git a/debian/mariadb-server-10.4.install b/debian/mariadb-server-10.4.install
index a9cbbfc8a99eb..8b4db99a4218b 100644
--- a/debian/mariadb-server-10.4.install
+++ b/debian/mariadb-server-10.4.install
@@ -87,9 +87,9 @@ usr/share/man/man1/replace.1
 usr/share/man/man1/resolve_stack_dump.1
 usr/share/man/man1/resolveip.1
 usr/share/man/man1/wsrep_sst_common.1
+usr/share/man/man1/wsrep_sst_mariabackup.1
 usr/share/man/man1/wsrep_sst_mysqldump.1
 usr/share/man/man1/wsrep_sst_rsync.1
-usr/share/man/man1/wsrep_sst_mariabackup.1
 usr/share/mysql/errmsg-utf8.txt
 usr/share/mysql/fill_help_tables.sql
 usr/share/mysql/maria_add_gis_sp_bootstrap.sql
diff --git a/debian/mariadb-server-10.4.links b/debian/mariadb-server-10.4.links
new file mode 100644
index 0000000000000..65e0a6650d5de
--- /dev/null
+++ b/debian/mariadb-server-10.4.links
@@ -0,0 +1,18 @@
+usr/bin/mysql_convert_table_format usr/bin/mariadb-convert-table-format
+usr/bin/mysql_secure_installation usr/bin/mariadb-secure-installation
+usr/bin/mysql_setpermission usr/bin/mariadb-setpermission
+usr/bin/mysql_tzinfo_to_sql usr/bin/mariadb-tzinfo-to-sql
+usr/bin/mysqld_multi usr/bin/mariadb-multi
+usr/bin/mysqld_safe usr/bin/mariadb-safe
+usr/bin/mysqld_safe_helper usr/bin/mariadb-safe-helper
+usr/bin/mysqlhotcopy usr/bin/mariadb-hotcopy
+usr/bin/mysqlshow usr/bin/mariadb-show
+usr/share/man/man1/mysql_convert_table_format.1.gz usr/share/man/man1/mariadb-convert-table-format.1.gz
+usr/share/man/man1/mysql_secure_installation.1.gz usr/share/man/man1/mariadb-secure-installation.1.gz
+usr/share/man/man1/mysql_setpermission.1.gz usr/share/man/man1/mariadb-setpermission.1.gz
+usr/share/man/man1/mysql_tzinfo_to_sql.1.gz usr/share/man/man1/mariadb-tzinfo-to-sql.1.gz
+usr/share/man/man1/mysqld_multi.1.gz usr/share/man/man1/mariadb-multi.1.gz
+usr/share/man/man1/mysqld_safe.1.gz usr/share/man/man1/mariadb-safe.1.gz
+usr/share/man/man1/mysqld_safe_helper.1.gz usr/share/man/man1/mariadb-safe-helper.1.gz
+usr/share/man/man1/mysqlhotcopy.1.gz usr/share/man/man1/mariadb-hotcopy.1.gz
+usr/share/man/man1/mysqlshow.1.gz usr/share/man/man1/mariadb-show.1.gz
diff --git a/debian/mariadb-server-core-10.4.links b/debian/mariadb-server-core-10.4.links
new file mode 100644
index 0000000000000..90ed9ee01cfa9
--- /dev/null
+++ b/debian/mariadb-server-core-10.4.links
@@ -0,0 +1,4 @@
+usr/bin/mysql_install_db usr/bin/mariadb-install-db
+usr/bin/mysql_upgrade usr/bin/mariadb-upgrade
+usr/share/man/man1/mysql_install_db.1.gz usr/share/man/man1/mariadb-install-db.1.gz
+usr/share/man/man1/mysql_upgrade.1.gz usr/share/man/man1/mariadb-upgrade-db.1.gz
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 3d31cda4ceba8..32f8fbfcc782c 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -332,6 +332,17 @@ ELSE()
       COMPONENT ${${file}_COMPONENT}
      )
   ENDFOREACH()
+
+  # MariaDB symlinks
+  CREATE_MARIADB_SYMLINK(mysql_config mariadb-config)
+  CREATE_MARIADB_SYMLINK(mysql_setpermission mariadb-setpermission)
+  CREATE_MARIADB_SYMLINK(mysql_secure_installation mariadb-secure-installation)
+  CREATE_MARIADB_SYMLINK(mysqlaccess mariadb-access)
+  CREATE_MARIADB_SYMLINK(mysql_convert_table_format mariadb-convert-table-format)
+  CREATE_MARIADB_SYMLINK(mysql_find_rows mariadb-find-rows)
+  CREATE_MARIADB_SYMLINK(mytop mariadb-top)
+  CREATE_MARIADB_SYMLINK(mysqlhotcopy mariadb-hotcopy)
+
   SET (wsrep_sst_rsync_wan ${CMAKE_CURRENT_BINARY_DIR}/wsrep_sst_rsync_wan)
   ADD_CUSTOM_COMMAND(
     OUTPUT ${wsrep_sst_rsync_wan}