diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 642b699c6a5..87a84a1361b 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -71,7 +71,7 @@ It was originally forked from Percona XtraBackup 2.3.8.")
 # Packages with default description
 SET(CPACK_RPM_client_PACKAGE_SUMMARY "MariaDB database client binaries")
 SET(CPACK_RPM_client_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
-SET(CPACK_RPM_common_PACKAGE_SUMMARY "MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)")
+SET(CPACK_RPM_common_PACKAGE_SUMMARY "MariaDB database common configuration files (e.g. /etc/mysql/conf.d/mariadb.cnf)")
 SET(CPACK_RPM_common_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
 SET(CPACK_RPM_compat_PACKAGE_SUMMARY "MariaDB database client library MySQL compat package")
 SET(CPACK_RPM_compat_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
diff --git a/debian/control b/debian/control
index c14a6f7dd93..f927ba0c5ea 100644
--- a/debian/control
+++ b/debian/control
@@ -103,9 +103,9 @@ Description: MariaDB database development files
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
  .
- This package includes development libraries and header files. To allow sources
+ This package includes development libraries and header files to allow sources
  expecting the MariaDB Connector/C to build. Sources that expect the MySQL
- Client libraries should use files from the libmariadb-dev-compat package.
+ client libraries should use files from the libmariadb-dev-compat package.
 
 Package: libmariadb-dev-compat
 Architecture: any
@@ -198,19 +198,19 @@ Depends: libmariadb-dev (= ${binary:Version}),
 Breaks: libmysqld-dev,
         libmariadbd-dev (<= 10.2)
 Replaces: libmysqld-dev
-Description: MariaDB embedded database, development files
+Description: MariaDB embedded database, development files package
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
  .
- This package includes the embedded server library development and header files.
+ This package includes the MariaDB embedded server library development and header files.
 
 Package: mysql-common
 Architecture: all
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
+Description: MariaDB client common configuration files package (e.g. /etc/mysql/my.cnf)
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
@@ -224,7 +224,7 @@ Architecture: all
 Depends: mysql-common,
          ${misc:Depends},
          ${shlibs:Depends}
-Description: MariaDB database common files (e.g. /etc/mysql/mariadb.conf.d/)
+Description: MariaDB client common configuration files package (e.g. /etc/mysql/mariadb.conf.d/)
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
@@ -507,7 +507,7 @@ Package: mariadb-server
 Architecture: all
 Depends: mariadb-server-10.4 (>= ${source:Version}),
          ${misc:Depends}
-Description: MariaDB database server (metapackage depending on the latest version)
+Description: MariaDB database server binaries (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mariadb-server (currently mariadb-server-10.4), as determined by the MariaDB
  maintainers. Install this package if in doubt about which MariaDB
@@ -523,11 +523,16 @@ Package: mariadb-client
 Architecture: all
 Depends: mariadb-client-10.4 (>= ${source:Version}),
          ${misc:Depends}
-Description: MariaDB database client (metapackage depending on the latest version)
+Description: MariaDB database client binaries (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mariadb-client (currently mariadb-client-10.4), as determined by the MariaDB
  maintainers.  Install this package if in doubt about which MariaDB version
  you want, as this is the one considered to be in the best shape.
+ .
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
 
 Package: mariadb-backup
 Architecture: any
@@ -539,8 +544,8 @@ Depends: mariadb-client-core-10.4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Backup tool for MariaDB server
- This backup tool is guaranteed to be compatible with MariaDB.
- Based on Xtrabackup, but improved to work with MariaDB.
+ Based on Xtrabackup, but improved to work with MariaDB server.
+ This backup tool is guaranteed to be compatible with MariaDB server.
  .
  Plese refer to the MariaDB Knowledge Base on more information on
  how to use this tool.
@@ -559,11 +564,11 @@ Breaks: mariadb-connect-engine-10.1,
 Replaces: mariadb-connect-engine-10.1,
           mariadb-connect-engine-10.2,
           mariadb-connect-engine-10.3
-Description: Connect storage engine for MariaDB
+Description: Connect storage engine for MariaDB server
  Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
  connections to ODBC tables and remote MySQL tables, as well as a number of
  other interesting features.
- This package contains the Connect plugin for MariaDB.
+ This package contains the Connect plugin for MariaDB server.
 
 Package: mariadb-plugin-rocksdb
 Architecture: amd64 arm64 mips64el ppc64el
@@ -575,10 +580,10 @@ Breaks: mariadb-rocksdb-engine-10.2,
 Replaces: mariadb-rocksdb-engine-10.2,
           mariadb-rocksdb-engine-10.3
 Recommends: python-mysqldb
-Description: RocksDB storage engine for MariaDB
+Description: RocksDB storage engine for MariaDB server
  The RocksDB storage engine is a high performance storage engine, aimed
  at maximising storage efficiency while maintaining InnoDB-like performance.
- This package contains the RocksDB plugin for MariaDB.
+ This package contains the RocksDB plugin for MariaDB server.
 
 Package: mariadb-plugin-oqgraph
 Architecture: any
@@ -592,10 +597,10 @@ Breaks: mariadb-oqgraph-engine-10.1,
 Replaces: mariadb-oqgraph-engine-10.1,
           mariadb-oqgraph-engine-10.2,
           mariadb-oqgraph-engine-10.3
-Description: OQGraph storage engine for MariaDB
+Description: OQGraph storage engine for MariaDB server
  The OQGraph engine is a computation engine plugin for handling hierarchies
  (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.
- This package contains the OQGraph plugin for MariaDB.
+ This package contains the OQGraph plugin for MariaDB server.
 
 Package: mariadb-plugin-tokudb
 Architecture: amd64
@@ -611,11 +616,11 @@ Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
           mariadb-server-10.3
-Description: TokuDB storage engine for MariaDB
+Description: TokuDB storage engine for MariaDB server
  The TokuDB storage engine is for use in high-performance and write-intensive
  environments, offering increased compression and better performance based
  on fractal indexes.
- This package contains the TokuDB plugin for MariaDB.
+ This package contains the TokuDB plugin for MariaDB server.
 
 Package: mariadb-plugin-mroonga
 Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx
@@ -630,10 +635,10 @@ Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
           mariadb-server-10.3
-Description: Mroonga storage engine for MariaDB
+Description: Mroonga storage engine for MariaDB server
  Mroonga (formerly named Groonga Storage Engine) is a storage engine that
  provides fast CJK-ready full text searching using column store.
- This package contains the Mroonga plugin for MariaDB.
+ This package contains the Mroonga plugin for MariaDB server.
 
 Package: mariadb-plugin-spider
 Architecture: any
@@ -648,9 +653,9 @@ Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
           mariadb-server-10.3
-Description: Spider storage engine for MariaDB
+Description: Spider storage engine for MariaDB server
  The Spider storage engine with built-in sharding features. It supports
- partitioning and xa transactions, and allows tables of different MariaDB
+ partitioning and xa transactions, and allows tables of different MariaDB server
  instances to be handled as if they were on the same insctance. It refers to one
  possible implementation of ISO/IEC 9075-9:2008 SQL/MED.
 
@@ -667,12 +672,12 @@ Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
           mariadb-server-10.3
-Description: Cassandra storage engine for MariaDB
- The Cassandra Storage Engine allows access to data in a Cassandra cluster from
- MariaDB, combining the best of SQL and no-SQL worlds. Cassandra SE (storage
- engine) makes Cassandra's column family appear as a table in MariaDB that you
+Description: Cassandra storage engine for MariaDB server
+ The Cassandra storage engine allows access to data in a Cassandra cluster from
+ MariaDB server, combining the best of SQL and no-SQL worlds. Cassandra SE (storage
+ engine) makes Cassandra's column family appear as a table in MariaDB server that you
  can insert to, update, and select from. You can write joins against this table,
- it is possible to join data that's stored in MariaDB with data that's stored in
+ it is possible to join data that's stored in MariaDB server with data that's stored in
  Cassandra.
 
 Package: mariadb-plugin-gssapi-server
@@ -717,11 +722,11 @@ Depends: libcrack2 (>= 2.9.0),
          mariadb-server-10.4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Description: CrackLib Password Validation Plugin for MariaDB
+Description: CrackLib Password Validation Plugin for MariaDB server
  This password validation plugin uses cracklib to allow only
- sufficiently secure (as defined by cracklib) user passwords in MariaDB.
+ sufficiently secure (as defined by cracklib) user passwords in MariaDB server.
  .
- Install and configure this to enforce stronger passwords for MariaDB users.
+ Install and configure this to enforce stronger passwords for MariaDB server users.
 
 Package: mariadb-test
 Architecture: any
diff --git a/plugin/cracklib_password_check/CMakeLists.txt b/plugin/cracklib_password_check/CMakeLists.txt
index 620234ccd3f..5d5466fb84e 100644
--- a/plugin/cracklib_password_check/CMakeLists.txt
+++ b/plugin/cracklib_password_check/CMakeLists.txt
@@ -1,9 +1,9 @@
 INCLUDE (CheckIncludeFiles)
 INCLUDE (CheckLibraryExists)
 
-SET(CPACK_RPM_cracklib-password-check_PACKAGE_SUMMARY "CrackLib Password Validation Plugin for MariaDB" PARENT_SCOPE)
+SET(CPACK_RPM_cracklib-password-check_PACKAGE_SUMMARY "CrackLib Password Validation Plugin for MariaDB server" PARENT_SCOPE)
 SET(CPACK_RPM_cracklib-password-check_PACKAGE_DESCRIPTION "This password validation plugin uses cracklib to allow only
-sufficiently secure (as defined by cracklib) user passwords in MariaDB." PARENT_SCOPE)
+sufficiently secure (as defined by cracklib) user passwords in MariaDB server." PARENT_SCOPE)
 
 CHECK_LIBRARY_EXISTS(crack FascistCheckUser "" HAVE_LIBCRACK)
 
diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt
index fe32f69c10b..1e696bcb1e9 100644
--- a/storage/cassandra/CMakeLists.txt
+++ b/storage/cassandra/CMakeLists.txt
@@ -1,10 +1,10 @@
 
-SET(CPACK_RPM_cassandra-engine_PACKAGE_SUMMARY "Cassandra storage engine for MariaDB" PARENT_SCOPE)
-SET(CPACK_RPM_cassandra-engine_PACKAGE_DESCRIPTION "The Cassandra Storage Engine allows access to data in a Cassandra cluster from
-MariaDB, combining the best of SQL and no-SQL worlds. Cassandra SE (storage
-engine) makes Cassandra's column family appear as a table in MariaDB that you
+SET(CPACK_RPM_cassandra-engine_PACKAGE_SUMMARY "Cassandra storage engine for MariaDB server" PARENT_SCOPE)
+SET(CPACK_RPM_cassandra-engine_PACKAGE_DESCRIPTION "The Cassandra storage engine allows access to data in a Cassandra cluster from
+MariaDB server, combining the best of SQL and no-SQL worlds. Cassandra SE (storage
+engine) makes Cassandra's column family appear as a table in MariaDB server that you
 can insert to, update, and select from. You can write joins against this table,
-it is possible to join data that's stored in MariaDB with data that's stored in
+it is possible to join data that's stored in MariaDB server with data that's stored in
 Cassandra." PARENT_SCOPE)
 
 # use the first path that has Thrift.h included, if found
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index 20cd4ad3ee1..1bef8f122f0 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -17,7 +17,7 @@ IF(WITHOUT_DYNAMIC_PLUGINS OR WITH_NONE OR ("${PLUGIN_CONNECT}" STREQUAL "NO"))
   RETURN()
 ENDIF()
 
-SET(CPACK_RPM_connect-engine_PACKAGE_SUMMARY "Connect storage engine for MariaDB" PARENT_SCOPE)
+SET(CPACK_RPM_connect-engine_PACKAGE_SUMMARY "Connect storage engine for MariaDB server" PARENT_SCOPE)
 SET(CPACK_RPM_connect-engine_PACKAGE_DESCRIPTION "Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
 connections to ODBC tables and remote MySQL tables, as well as a number of
 other interesting features." PARENT_SCOPE)
diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt
index e725f9712ea..2cb02727a64 100644
--- a/storage/oqgraph/CMakeLists.txt
+++ b/storage/oqgraph/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-SET(CPACK_RPM_oqgraph-engine_PACKAGE_SUMMARY "OQGraph storage engine for MariaDB" PARENT_SCOPE)
+SET(CPACK_RPM_oqgraph-engine_PACKAGE_SUMMARY "OQGraph storage engine for MariaDB server" PARENT_SCOPE)
 SET(CPACK_RPM_oqgraph-engine_PACKAGE_DESCRIPTION "The Open Query GRAPH computation engine, or OQGRAPH as the engine itself is called,
 allows you to handle hierarchies (tree structures) and complex graphs
 (nodes having many connections in several directions).
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
index 71259703e5a..cf8a821a3e4 100644
--- a/storage/rocksdb/CMakeLists.txt
+++ b/storage/rocksdb/CMakeLists.txt
@@ -1,6 +1,6 @@
 # TODO: Copyrights
 
-SET(CPACK_RPM_rocksdb-engine_PACKAGE_SUMMARY "RocksDB storage engine for MariaDB" PARENT_SCOPE)
+SET(CPACK_RPM_rocksdb-engine_PACKAGE_SUMMARY "RocksDB storage engine for MariaDB server" PARENT_SCOPE)
 SET(CPACK_RPM_rocksdb-engine_PACKAGE_DESCRIPTION "The RocksDB storage engine is a high performance storage engine, aimed
 at maximising storage efficiency while maintaining InnoDB-like performance." PARENT_SCOPE)
 
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt
index 65110f7d8bd..78e7fd88d7f 100644
--- a/storage/tokudb/CMakeLists.txt
+++ b/storage/tokudb/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(CPACK_RPM_tokudb-engine_PACKAGE_SUMMARY "TokuDB storage engine for MariaDB" PARENT_SCOPE)
+SET(CPACK_RPM_tokudb-engine_PACKAGE_SUMMARY "TokuDB storage engine for MariaDB server" PARENT_SCOPE)
 SET(CPACK_RPM_tokudb-engine_PACKAGE_DESCRIPTION "The TokuDB storage engine is for use in high-performance and write-intensive
 environments, offering increased compression and better performance based
 on fractal indexes." PARENT_SCOPE)