diff --git a/akonadi-23.04.3.tar.xz b/akonadi-23.04.3.tar.xz
deleted file mode 100644
index ca2c2c0..0000000
Binary files a/akonadi-23.04.3.tar.xz and /dev/null differ
diff --git a/akonadi-23.08.4.tar.xz b/akonadi-23.08.4.tar.xz
new file mode 100644
index 0000000..d34d40a
Binary files /dev/null and b/akonadi-23.08.4.tar.xz differ
diff --git a/kf5-akonadi-server.spec b/kf5-akonadi-server.spec
index d53e711..cfa4a6f 100644
--- a/kf5-akonadi-server.spec
+++ b/kf5-akonadi-server.spec
@@ -4,15 +4,15 @@
 # uncomment to enable bootstrap mode
 # global bootstrap 1
 %if !0%{?bootstrap}
-# skip slow(er) archs, for now -- rex
-%ifnarch %{arm} s390x
+# skip slow(er) archs
+%ifnarch %{arm} s390x riscv64
 %global tests 0
 %endif
 %endif
 
 Name:           kf5-%{framework}
 Summary:        PIM Storage Service
-Version:        23.04.3
+Version:        23.08.4
 Release:        1
 License:        LGPLv2+
 URL:            https://invent.kde.org/frameworks/%{framework}
@@ -62,13 +62,9 @@ BuildRequires:  kaccounts-integration-devel
 BuildRequires:  qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
 
-# backends, used at buildtime to query known locations of server binaries
-# FIXME/TODO: set these via cmake directives, avoids needless buildroot items
-BuildRequires:  mariadb-server
-BuildRequires:  postgresql-server
-
 %if 0%{?tests}
 BuildRequires:  dbus-x11
+BuildRequires:  mariadb-server
 BuildRequires:  xorg-x11-server-Xvfb
 %endif
 
@@ -136,7 +132,10 @@ pushd %{_target_platform}
 %{cmake_kf5} .. \
   %{?database_backend:-DDATABASE_BACKEND=%{database_backend}} \
   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} \
-  -DINSTALL_APPARMOR:BOOL=OFF
+  -DINSTALL_APPARMOR:BOOL=OFF \
+  -DMYSQLD_EXECUTABLE:FILEPATH=%{_libexecdir}/mysqld \
+  -DMYSQLD_SCRIPTS_PATH:FILEPATH=%{_bindir}/mysql_install_db \
+  -DPOSTGRES_PATH:FILEPATH=%{_bindir}/pg_ctl
 popd
 %make_build  -C %{_target_platform}
 
@@ -216,7 +215,6 @@ fi
 %{_kf5_datadir}/kf5/akonadi/
 %{_kf5_qtplugindir}/designer/akonadi5widgets.so
 %{_kf5_qtplugindir}/designer/akonadi5widgets.so
-%{_kf5_qtplugindir}/sqldrivers/libqsqlite3.so
 %{_kf5_libdir}/libKPim5AkonadiAgentBase.so.5*
 %{_kf5_libdir}/libKPim5AkonadiCore.so.5*
 %{_kf5_libdir}/libKPim5AkonadiPrivate.so.5*
@@ -269,6 +267,10 @@ fi
 %config(noreplace) %{_sysconfdir}/xdg/akonadi/mysql-local.conf
 
 %changelog
+* Mon Jan 15 2024 misaka00251 <liuxin@iscas.ac.cn> - 23.08.4-1
+- Upgrade to 23.08.4
+- Skip riscv64 tests
+
 * Fri Aug 04 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 23.04.3-1
 - Update package to version 23.04.3