diff --git a/python-psutil-skip-test_emulate_multi_cpu.patch b/python-psutil-skip-test_emulate_multi_cpu.patch
index 835f65f..b8a0d8c 100644
--- a/python-psutil-skip-test_emulate_multi_cpu.patch
+++ b/python-psutil-skip-test_emulate_multi_cpu.patch
@@ -1,7 +1,7 @@
 From 35d3054307a6f2e607026101e6f0b19b6c472864 Mon Sep 17 00:00:00 2001
 From: Stephen Gallagher <sgallagh@redhat.com>
 Date: Wed, 14 Feb 2024 18:14:08 -0500
-Subject: [PATCH] Skip on aarch64 and ppc64le
+Subject: [PATCH] Skip on aarch64, ppc64le and riscv64
 
 Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
 ---
@@ -20,13 +20,15 @@ index 0583e619de59931a9ee80411a95ef8eb7ef6c171..7f6cfd5431086b108c1a7fa140b407cc
  import re
  import shutil
  import socket
-@@ -888,6 +889,10 @@ class TestSystemCPUFrequency(PsutilTestCase):
+@@ -888,6 +889,12 @@ class TestSystemCPUFrequency(PsutilTestCase):
                      self.assertEqual(freq.max, 700.0)
  
      @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
 +    @unittest.skipIf(platform.machine() == "aarch64",
 +                     "https://github.com/giampaolo/psutil/issues/2373")
 +    @unittest.skipIf(platform.machine() == "ppc64le",
++                     "https://github.com/giampaolo/psutil/issues/2373")
++    @unittest.skipIf(platform.machine() == "riscv64",
 +                     "https://github.com/giampaolo/psutil/issues/2373")
      def test_emulate_multi_cpu(self):
          def open_mock(name, *args, **kwargs):
diff --git a/python-psutil.spec b/python-psutil.spec
index 3b363de..33e59e5 100644
--- a/python-psutil.spec
+++ b/python-psutil.spec
@@ -1,6 +1,6 @@
 Name:           python-psutil
 Version:        5.9.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A process and system utilities module for Python
 
 License:        BSD-3-Clause
@@ -122,6 +122,10 @@ APPVEYOR=1 %{py3_test_envvars} %{python3} psutil/tests/runner.py
 
 
 %changelog
+* Fri May 23 2025 Andrea Bolognani <abologna@redhat.com> - 5.9.8-6
+- Skip test_emulate_multi_cpu on riscv64 too
+  Resolves: RHEL-93392
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.9.8-5
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018