diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index b340b57af..6b3e36806 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -195,7 +195,6 @@ Eing
 ekh
 emaillookup
 endscript
-enduml
 ENHANCEDSTATUSCODES
 enotify
 entra
@@ -383,6 +382,7 @@ libkrb
 libldap
 liblib
 liblz
+libmariadb
 libmysqlclient
 libntlm
 libotp
@@ -751,7 +751,6 @@ sqluser
 SSHA
 ssldir
 stackbuf
-startuml
 STATEDIR
 staticbuf
 staticdb
@@ -865,7 +864,6 @@ urandom
 Urg
 urlauth
 URLFETCH
-usecase
 usecs
 userdata
 userdb
diff --git a/data/settings.js b/data/settings.js
index ff138c68a..17d75d7f8 100644
--- a/data/settings.js
+++ b/data/settings.js
@@ -3997,7 +3997,7 @@ consistency.`
 		values: setting_types.NAMED_LIST_FILTER,
 		seealso: [ 'mysql_host' ],
 		text: `
-Creates a new MySQL connection. If more than one is specified, the connections
+Creates a new MySQL/MariaDB connection. If more than one is specified, the connections
 are automatically used for load balancing and for failover. The filter name
 refers to the [[setting,mysql_host]] setting.`
 	},
diff --git a/docs/core/config/auth/databases/sql.md b/docs/core/config/auth/databases/sql.md
index 3f9a58958..de7942df9 100644
--- a/docs/core/config/auth/databases/sql.md
+++ b/docs/core/config/auth/databases/sql.md
@@ -5,7 +5,7 @@ dovecotlinks:
   auth_sql: SQL authentication database
   auth_mysql:
     hash: mysql
-    text: MySQL authentication
+    text: MySQL/MariaDB authentication
   auth_postgresql:
     hash: postgresql
     text: PostgreSQL authentication
@@ -166,7 +166,7 @@ CREATE TABLE users (
 );
 ```
 
-### MySQL
+### MySQL/MariaDB
 
 Add to your `dovecot.conf` file:
 
diff --git a/docs/core/config/sql/mysql.md b/docs/core/config/sql/mysql.md
index b296327c9..16f907379 100644
--- a/docs/core/config/sql/mysql.md
+++ b/docs/core/config/sql/mysql.md
@@ -2,10 +2,10 @@
 layout: doc
 title: MySQL
 dovecotlinks:
-  sql_mysql: MySQL Configuration
+  sql_mysql: MySQL/MariaDB Configuration
 ---
 
-# SQL Driver: MySQL
+# SQL Driver: MySQL/MariaDB
 
 Driver name `mysql`.
 
diff --git a/docs/installation/installation.md b/docs/installation/installation.md
index b44608092..ed3341f1a 100644
--- a/docs/installation/installation.md
+++ b/docs/installation/installation.md
@@ -313,8 +313,8 @@ similar package)
 
 ##### `--with-mysql`
 
-Build with MySQL support (requires `mysql-devel`, `libmysqlclient-dev`
-or similar package)
+Build with MySQL or MariaDB support (requires `mysql-devel`,
+`libmysqlclient-dev`, `libmariadb-dev-compat` or similar package)
 
 ##### `--with-sqlite`