diff --git a/mysql8.4.spec b/mysql8.4.spec
index 623c634..2a4e71c 100644
--- a/mysql8.4.spec
+++ b/mysql8.4.spec
@@ -2,7 +2,7 @@ ExcludeArch: %{ix86}
 
 # Name of the package without any prefixes
 %global majorname mysql
-%global package_version 8.4.8
+%global package_version 8.4.9
 %global majorversion %(echo %{package_version} | cut -d'.' -f1-2 )
 %global pkgnamepatch mysql
 
@@ -21,7 +21,7 @@ ExcludeArch: %{ix86}
 # The last version on which the full testsuite has been run
 # In case of further rebuilds of that version, don't require full testsuite to be run
 # run only "main" suite
-%global last_tested_version 8.4.8
+%global last_tested_version 8.4.9
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -104,7 +104,7 @@ ExcludeArch: %{ix86}
 
 Name:             %{majorname}%{majorversion}
 Version:          %{package_version}
-Release:          2%{?with_debug:.debug}%{?dist}.alma.1
+Release:          1%{?with_debug:.debug}%{?dist}.alma.1
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
 
@@ -1073,6 +1073,8 @@ popd
 %{_libdir}/mysql/plugin/component_test_sensitive_system_variables.so
 %{_libdir}/mysql/plugin/component_test_server_telemetry_metrics.so
 %{_libdir}/mysql/plugin/component_test_server_telemetry_traces.so
+%{_libdir}/mysql/plugin/component_test_server_telemetry_logs_client.so
+%{_libdir}/mysql/plugin/component_test_server_telemetry_logs_export.so
 %{_libdir}/mysql/plugin/component_test_status_var_reader.so
 %{_libdir}/mysql/plugin/component_test_status_var_service_int.so
 %{_libdir}/mysql/plugin/component_test_status_var_service_reg_only.so
@@ -1144,9 +1146,12 @@ popd
 %endif
 
 %changelog
-* Wed Mar 04 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4.8-2.alma.1
+* Tue May 19 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4.9-1.alma.1
 - Add riscv64 support
 
+* Wed May 06 2026 Michal Schorm <mschorm@redhat.com> - 8.4.9-1
+- Rebase to 8.4.9
+
 * Tue Feb 24 2026 Lukas Javorsky <ljavorsk@redhat.com> - 8.4.8-2
 - Revert to soft static allocation of MariaDB and MySQL sysusers.d files
 
diff --git a/rh-skipped-tests-list-base.list b/rh-skipped-tests-list-base.list
index 296305a..6ae0360 100644
--- a/rh-skipped-tests-list-base.list
+++ b/rh-skipped-tests-list-base.list
@@ -37,3 +37,12 @@ rpl_gtid.rpl_perfschema_applier_status_by_worker_gtid_skipped_transaction_mts  :
 main.basedir                               : BUG#0
 main.grant_user_lock                       : BUG#0
 main.loaddata_special                      : BUG#0
+
+# Failing since 8.4.9 on RHEL 10 Konflux but passing in C10S
+auth_sec.atomic_rename_user                : BUG#0
+connection_control.performance_schema_processlist  : BUG#0
+perfschema.threads_innodb                  : BUG#0
+perfschema.system_events_component         : BUG#0
+perfschema.system_events_plugin            : BUG#0
+perfschema.threads_innodb                  : BUG#0
+sys_vars.myisam_data_pointer_size_func     : BUG#0
diff --git a/rh-skipped-tests-list-s390.list b/rh-skipped-tests-list-s390.list
index 3c01fef..b1469da 100644
--- a/rh-skipped-tests-list-s390.list
+++ b/rh-skipped-tests-list-s390.list
@@ -11,3 +11,25 @@ test_services.test_event_tracking_consumer  : BUG#0
 
 # Fails since MySQL 8.4.4
 perfschema.threads_innodb : BUG#0
+
+# Fails since 8.0.46 / 8.4.9 / 9.7.0 on s390x
+# Bug#39129182 tightened InnoDB row size estimation in get_field_max_size().
+# Combined with zlib-ng DFLTCC compressBound() overhead on s390x,
+# compressed tables with small KEY_BLOCK_SIZE exceed row size limits.
+innodb.zlob_geom                            : BUG#0
+innodb_zip.4k                               : BUG#0
+innodb_zip.8k                               : BUG#0
+innodb_zip.bug52745                         : BUG#0
+innodb_zip.index_large_prefix               : BUG#0
+innodb_zip.index_large_prefix_4k            : BUG#0
+innodb_zip.index_large_prefix_8k            : BUG#0
+innodb_zip.prefix_index_liftedlimit         : BUG#0
+
+# Failing on both C10S and RHEL 10 Konflux since 8.4.9
+perfschema.error_log                        : BUG#0
+
+# Failing since 8.4.9 on RHEL 10 Konflux but passing in C10S
+innodb_fts.optimize_big                     : BUG#0
+rpl.rpl_parallel_ddl_innodb                 : BUG#0
+rpl.rpl_parallel_ddl_myisam                 : BUG#0
+rpl.rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config  : BUG#0
diff --git a/sources b/sources
index 2b136f6..b723d98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-8.4.8.tar.gz) = 4e95db1a1c2bf99240d846e690784616b15fb3137b4512072ad71a40911c5bb72c0b0354cc588aab7cd5d396e1d1c709a63d9cd09ae664d8fe6ed0f7683e4cf6
+SHA512 (mysql-8.4.9.tar.gz) = bae8aba6ba921f96799063f6c10f9f02030276f802e74a8b80f2df34e56b0d4501a1c9a9f818529cb70ec700a8f11aedf7fa645fa5db8550f51291759e6a25ad