diff --git a/extra/percona-server/.SRCINFO b/extra/percona-server/.SRCINFO
index fe4b738fa..11437bb30 100644
--- a/extra/percona-server/.SRCINFO
+++ b/extra/percona-server/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = percona-server
-	pkgver = 8.3.0_1
-	pkgrel = 3
+	pkgver = 8.4.0_1
+	pkgrel = 1
 	url = https://www.percona.com/software/mysql-database/percona-server
 	arch = x86_64
 	license = GPL
@@ -19,14 +19,12 @@ pkgbase = percona-server
 	makedepends = graphviz
 	makedepends = libevent
 	makedepends = libfido2
-	source = https://www.percona.com/downloads/Percona-Server-8.3/Percona-Server-8.3.0-1/source/tarball/percona-server-8.3.0-1.tar.gz
-	source = https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.gz
+	source = https://www.percona.com/downloads/Percona-Server-8.4/Percona-Server-8.4.0-1/source/tarball/percona-server-8.4.0-1.tar.gz
 	source = gcc-14.patch
 	source = my.cnf
 	source = mysql-user.conf
 	source = mysqlrouter-user.conf
-	sha256sums = 19eba27f3a82912b666f8a986bcd78ed7047bcca206307ec9f41721dd3b85848
-	sha256sums = 5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131
+	sha256sums = efa3d75ea4cd055b03ed15f6be1a7b472112885a492f4874cc6f6e70d7f2dee4
 	sha256sums = eeb9c6c8f70dd5eb05f735df0cdfc294365b393e5819f26029320e38714069a6
 	sha256sums = b467b04d6d06152b2abc33f2a6de63fef0fc922dd5119d2ee1d07d3c1a489731
 	sha256sums = 5d7710fe88ec6d298175a309c0b776142397b119c468830b2865980292ed5da6
@@ -49,8 +47,8 @@ pkgname = percona-server-clients
 	depends = openssl
 	depends = jemalloc
 	depends = readline
-	provides = mysql-clients=8.3.0_1
-	provides = mariadb-clients=8.3.0_1
+	provides = mysql-clients=8.4.0_1
+	provides = mariadb-clients=8.4.0_1
 	conflicts = mysql-clients
 
 pkgname = percona-server
@@ -68,8 +66,8 @@ pkgname = percona-server
 	depends = libevent
 	depends = icu
 	optdepends = perl-dbd-mysql
-	provides = mysql=8.3.0_1
-	provides = mariadb=8.3.0_1
+	provides = mysql=8.4.0_1
+	provides = mariadb=8.4.0_1
 	conflicts = mysql
 	options = emptydirs
 	backup = etc/mysql/my.cnf
diff --git a/extra/percona-server/PKGBUILD b/extra/percona-server/PKGBUILD
index 2fb1784cb..ec5e55ffe 100644
--- a/extra/percona-server/PKGBUILD
+++ b/extra/percona-server/PKGBUILD
@@ -6,25 +6,22 @@
 
 pkgbase=percona-server
 pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server')
-pkgver=8.3.0_1
-_boost_ver=1.77.0
+pkgver=8.4.0_1
 _pkgver=${pkgver/_/-}
 _myver=${pkgver/_rel*}
-pkgrel=3
+pkgrel=1
 arch=('x86_64')
 makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam' 'numactl' 'jemalloc' 'openssl'
              'rpcsvc-proto' 'doxygen' 'graphviz' 'libevent' 'libfido2') # 'boost'
 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"
-        "https://boostorg.jfrog.io/artifactory/main/release/$_boost_ver/source/boost_${_boost_ver//./_}.tar.gz"
         'gcc-14.patch'
         'my.cnf'
         'mysql-user.conf'
         'mysqlrouter-user.conf'
         '0001-fix-LF_PINS-padding-calculation.patch')
-sha256sums=('19eba27f3a82912b666f8a986bcd78ed7047bcca206307ec9f41721dd3b85848'
-            '5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131'
+sha256sums=('efa3d75ea4cd055b03ed15f6be1a7b472112885a492f4874cc6f6e70d7f2dee4'
             'eeb9c6c8f70dd5eb05f735df0cdfc294365b393e5819f26029320e38714069a6'
             'b467b04d6d06152b2abc33f2a6de63fef0fc922dd5119d2ee1d07d3c1a489731'
             '5d7710fe88ec6d298175a309c0b776142397b119c468830b2865980292ed5da6'
@@ -41,13 +38,13 @@ prepare() {
 
 	for svcfile in mysqld{,@}.service.in; do
 		sed '/^PrivateTmp=/ a StateDirectory=mysql mysql-files\nRuntimeDirectory=mysqld' \
-			-i scripts/systemd/$svcfile
+		    -i scripts/systemd/$svcfile
 	done
 
 	sed '/^PrivateTmp=/ a StateDirectory=mysqlrouter\nRuntimeDirectory=mysqlrouter' \
 		-i scripts/systemd/mysqlrouter.service.in
 
-        patch -p1 -i ../gcc-14.patch # Fix build with GCC 14
+	patch -p1 -i ../gcc-14.patch # Fix build with GCC 14
 
 	patch -p1 -i "$srcdir"/0001-fix-LF_PINS-padding-calculation.patch
 }
@@ -92,14 +89,11 @@ build() {
 		-DWITH_ZSTD=system \
 		-DWITH_SSL=system \
 		-DWITH_ICU=system \
-		-DWITH_LIBEVENT=system \
 		-DWITH_FIDO=system \
 		-DWITH_ENCRYPTION_UDF=ON \
-		-DWITH_KEYRING_VAULT=ON \
 		-DWITH_LIBWRAP=OFF \
 		-DWITH_MECAB=OFF \
 		-DWITH_PAM=ON \
-		-DWITH_INNODB_MEMCACHED=ON \
 		-DWITH_ARCHIVE_STORAGE_ENGINE=ON \
 		-DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
 		-DWITH_FEDERATED_STORAGE_ENGINE=ON \
@@ -112,9 +106,7 @@ build() {
 		-DWITH_UNIT_TESTS=OFF \
 		-DWITH_SYSTEMD=1 \
 		-DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
-		-DWITH_NUMA=ON \
-		-DWITH_BOOST="../boost_${_boost_ver//./_}"
-		# -DWITH_BOOST=system
+		-DWITH_NUMA=ON
 
 	make
 }
@@ -150,19 +142,19 @@ package_percona-server-clients() {
 
 	# install man pages
 	install -d "$pkgdir"/usr/share/man/man1
-	for man in mysql{,admin,check,dump,import,show,slap,pump,binlog,_upgrade}; do
+	for man in mysql{,admin,check,dump,import,show,slap,binlog}; do
 		install -m644 "$srcdir/$pkgbase-$_pkgver/man/$man.1" "$pkgdir"/usr/share/man/man1/$man.1
 	done
 
 	# provided by percona-server
-	rm "$pkgdir"/usr/bin/mysql{_config_editor,_secure_installation,_ssl_rsa_setup}
+	rm "$pkgdir"/usr/bin/mysql{_config_editor,_secure_installation}
 }
 
 package_percona-server() {
 	pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and MyRocks storage engine'
 	backup=('etc/mysql/my.cnf' 'etc/mysqlrouter/mysqlrouter.conf')
 	depends=('libaio' 'systemd-tools' 'pam' 'jemalloc' 'numactl' 'lz4' 'zstd' 'openssl' 'libtirpc' 'curl'
-	         'libevent' 'icu') # 'boost-libs'
+	         'libevent' 'icu')
 	optdepends=('perl-dbd-mysql')
 	conflicts=('mysql')
 	provides=("mysql=$_myver" "mariadb=$_myver")
@@ -199,9 +191,9 @@ package_percona-server() {
 	rm -r usr/share/aclocal usr/lib/pkgconfig
 
 	# provided by percona-server-clients
-	rm usr/bin/mysql{,admin,check,dump,import,show,slap,pump,binlog,test,_upgrade,_migrate_keyring}
+	rm usr/bin/mysql{,admin,check,dump,import,show,slap,binlog,test,_migrate_keyring}
 	rm usr/lib/perconaserver/plugin/authentication_*_client.so
-	rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump,binlog,_upgrade}.1
+	rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,binlog}.1
 
 	# not needed
 	rm -r usr/share/mysql-test