diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 4720c5b02..1a1f37288 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -11,9 +11,9 @@ pkgver=8.0.18_9
 _boost_ver=1.70.0
 _pkgver=${pkgver/_/-}
 _myver=${pkgver/_rel*}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
-makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam' 'jemalloc' 'openssl' 'rpcsvc-proto' 'boost')
+makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam' 'jemalloc' 'openssl' 'rpcsvc-proto' 'boost' 'doxygen' 'graphviz')
 license=('GPL')
 url="https://www.percona.com/software/mysql-database/percona-server"
 source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz"
@@ -23,6 +23,7 @@ source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona
         'build-hostname.patch'
         'no-werror.patch'
         'rocksdb-systemlibs.patch'
+        'rocksdb-make.patch'
         '0001-fix-LF_PINS-padding-calculation.patch')
 sha256sums=('31b980b0f87a8d261f5bdfd353e05dc92b261997a94c3df604d7ed2526fdc2d7'
             '882b48708d211a5f48e60b0124cf5863c1534cd544ecd0664bb534a4b5d506e9'
@@ -30,6 +31,7 @@ sha256sums=('31b980b0f87a8d261f5bdfd353e05dc92b261997a94c3df604d7ed2526fdc2d7'
             '1537fdbb92dd1c135c1eb9f4d10c44fd02e652db66c933d731990a1196f1397c'
             'fe1cb2b079c56ff0f827c7dfb25d004b2190410406820c490dc6152cfe392b70'
             '1bbae30fe4c7d8198aaa771a20ca2fbeb6494de9ec4e516e4bab5f1387b3b8bd'
+            '2ff495d271f99c4d0dba89e8ccde7e6b9789a4ea6b55034de9b9217b47e32c03'
             'aa5e960625843b061f47c32b4a267fab1115667b8b7d1ce7ec952efe42eb77af')
 
 prepare() {
@@ -39,6 +41,11 @@ prepare() {
 	patch -p1 -i "$srcdir"/build-hostname.patch
 	patch -p1 -i "$srcdir"/no-werror.patch
 	patch -p1 -i "$srcdir"/rocksdb-systemlibs.patch
+	patch -p1 -i "$srcdir"/rocksdb-make.patch
+
+	echo StateDirectory=mysql mysql-files >> scripts/systemd/mysqld.service.in
+	echo StateDirectory=mysql mysql-files >> scripts/systemd/mysqld@.service.in
+
 	patch -p1 -i "$srcdir"/0001-fix-LF_PINS-padding-calculation.patch
 }
 
@@ -159,10 +166,9 @@ package_percona-server() {
 	install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf
 
 	cd "$pkgdir"
-        install -dm750 -o 89 var/lib/mysql-files
 	chmod 755 usr
 	mv usr/usr/lib/* usr/lib
-	rm -rf usr/{usr,data,run,lib/perconaserver/plugin/debug}
+	rm -rf usr/{usr,data,run,lib/perconaserver/plugin/debug,lib/tmpfiles.d/mysql.conf}
 
 	# Move documentation
 	if [ -f usr/PATENTS ]; then
diff --git a/community/percona-server/rocksdb-make.patch b/community/percona-server/rocksdb-make.patch
new file mode 100644
index 000000000..92454a7a4
--- /dev/null
+++ b/community/percona-server/rocksdb-make.patch
@@ -0,0 +1,13 @@
+diff --git a/storage/rocksdb/get_rocksdb_files.sh b/storage/rocksdb/get_rocksdb_files.sh
+index dbaab0f..c68b158 100755
+--- a/storage/rocksdb/get_rocksdb_files.sh
++++ b/storage/rocksdb/get_rocksdb_files.sh
+@@ -4,7 +4,7 @@ MKFILE=`mktemp`
+ # include rocksdb make file relative to the path of this script
+ echo "include rocksdb/src.mk
+ all:
+-	@echo \$(LIB_SOURCES)" > $MKFILE
++	@echo \"\$(LIB_SOURCES)\"" > $MKFILE
+ for f in `make --makefile $MKFILE`
+ do
+   echo ./rocksdb/$f