diff --git a/man/mariadbd-safe.1 b/man/mariadbd-safe.1
index ffd1d691f97..991940df57f 100644
--- a/man/mariadbd-safe.1
+++ b/man/mariadbd-safe.1
@@ -51,14 +51,14 @@ Options unknown to
 are passed to
 \fBmysqld\fR
 if they are specified on the command line, but ignored if they are specified in the
-[mysqld_safe] or [mariadb_safe]
+[mysqld_safe], [mariadbd-safe] or [mariadbd_safe]
 groups of an option file\&.
 .PP
 \fBmysqld_safe\fR
 reads all options from the
 [mysqld],
 [server],
-[mysqld_safe], and [mariadb_safe]
+[mysqld_safe], [mariadbd-safe] and [mariadbd_safe]
 sections in option files\&. For example, if you specify a
 [mysqld]
 section like this,
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 44dfe5e4935..1416e8754bb 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -595,7 +595,7 @@ fi
 # If arguments come from [mysqld_safe] section of my.cnf
 # we complain about unrecognized options
 unrecognized_handling=complain
-parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld mariadb_safe mariadbd-safe`
+parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld mariadb_safe mariadbd_safe mariadbd-safe`
 
 # We only need to pass arguments through to the server if we don't
 # handle them here.  So, we collect unrecognized options (passed on