diff --git a/README.mysql-cnf b/README.mysql-cnf
deleted file mode 100644
index 3700c7f..0000000
--- a/README.mysql-cnf
+++ /dev/null
@@ -1,13 +0,0 @@
-This directory contains prepared configuration files with .cnf extension,
-which provide a configuration for some common MariaDB deployment scenarios.
-These configuration files do not include the default configuration of datadir,
-log-file and pid-file locations, as specified in the default my.cnf file,
-provided in this distribution.
-
-Thus, it is recommended to use these configuration files as an addition to the
-default my.cnf configuration file.
-
-Since default my.cnf contains `!includedir @INSTALL_SYSCONF2DIR@` directive, it is
-recommended to copy required configuration under @INSTALL_SYSCONF2DIR@ directory,
-so the default my.cnf specifications will be extended.
-
diff --git a/mariadb.spec b/mariadb.spec
index 694a1ee..b81a697 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -154,7 +154,7 @@
 
 Name:             mariadb
 Version:          10.5.8
-Release:          2%{?with_debug:.debug}%{?dist}
+Release:          4%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -165,7 +165,6 @@ License:          GPLv2 with exceptions and LGPLv2 and BSD
 Source0:          https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz
 Source2:          mysql_config_multilib.sh
 Source3:          my.cnf.in
-Source5:          README.mysql-cnf
 Source6:          README.mysql-docs
 Source7:          README.mysql-license
 Source10:         mysql.tmpfiles.d.in
@@ -1017,8 +1016,12 @@ mkdir -p %{buildroot}%{logrotateddir}
 mv %{buildroot}%{_datadir}/%{pkg_name}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name}
 chmod 644 %{buildroot}%{logrotateddir}/%{daemon_name}
 
+# for compatibility with upstream RPMs, create mysqld symlink in sbin
+mkdir -p %{buildroot}%{_sbindir}
+ln -s %{_libexecdir}/mysqld %{buildroot}%{_sbindir}/mysqld
+ln -s %{_libexecdir}/mariadbd %{buildroot}%{_sbindir}/mariadbd
+
 # copy additional docs into build tree so %%doc will find them
-install -p -m 0644 %{SOURCE5} %{basename:%{SOURCE5}}
 install -p -m 0644 %{SOURCE6} %{basename:%{SOURCE6}}
 install -p -m 0644 %{SOURCE7} %{basename:%{SOURCE7}}
 install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}}
@@ -1182,8 +1185,11 @@ rm %{buildroot}%{_mandir}/man1/mbstream.1*
 %if %runselftest
 # hack to let 32- and 64-bit tests run concurrently on same build machine
 export MTR_PARALLEL=1
-# builds might happen at the same host, avoid collision
-export MTR_BUILD_THREAD=%{__isa_bits}
+# Builds might happen at the same host, avoid collision
+#   The port used is calculated as 20 * MTR_BUILD_THREAD + 10000
+#   The resulting port must be between 5000 and 32767
+#   This is the same as using option "--build-thread" for the "mysql-test-run.pl"
+export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
 
 # The cmake build scripts don't provide any simple way to control the
 # options for mysql-test-run, so ignore the make target and just call it
@@ -1232,6 +1238,9 @@ export MTR_BUILD_THREAD=%{__isa_bits}
     %endif
   # blank line
   fi
+
+  # There might be a dangling symlink left from the testing, remove it to not be installed
+  rm -rf ./var
 )
 
 # NOTE: the Spider SE has 2 more hidden testsuites "oracle" and "oracle2".
@@ -1364,7 +1373,6 @@ fi
 %endif
 
 %files server
-%doc README.mysql-cnf
 
 %{_bindir}/aria_{chk,dump_log,ftdump,pack,read_log}
 %{_bindir}/mariadb-service-convert
@@ -1394,6 +1402,8 @@ fi
 %config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
 %config(noreplace) %{_sysconfdir}/my.cnf.d/spider.cnf
 
+%{_sbindir}/mysqld
+%{_sbindir}/mariadbd
 %{_libexecdir}/{mysqld,mariadbd}
 
 %{_libdir}/%{pkg_name}/INFO_SRC
@@ -1619,6 +1629,12 @@ fi
 %endif
 
 %changelog
+* Thu Jan 28 2021 Honza Horak <hhorak@redhat.com> - 3:10.5.8-4
+- For compatibility with upstream RPMs, create mysqld symlink in sbin
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3:10.5.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Fri Dec 11 2020 Lukas Javorsky <ljavorsk@redhat.com> - 10.5.8-2
 - Add tokudb-engine to obsoletes
 - Resolves: #1906559