diff --git a/disable-unreliable-tests-arch.patch b/disable-unreliable-tests-arch.patch
index b4c4a29..138c179 100644
--- a/disable-unreliable-tests-arch.patch
+++ b/disable-unreliable-tests-arch.patch
@@ -1,8 +1,8 @@
-Index: vim-8.2.3204/src/testdir/Make_all.mak
+Index: vim-8.2.3318/src/testdir/Make_all.mak
 ===================================================================
---- vim-8.2.3204.orig/src/testdir/Make_all.mak
-+++ vim-8.2.3204/src/testdir/Make_all.mak
-@@ -30,21 +30,17 @@ SCRIPTS_TINY_OUT = \
+--- vim-8.2.3318.orig/src/testdir/Make_all.mak
++++ vim-8.2.3318/src/testdir/Make_all.mak
+@@ -30,23 +30,17 @@ SCRIPTS_TINY_OUT = \
  
  # Tests for Vim9 script.
  TEST_VIM9 = \
@@ -12,7 +12,7 @@ Index: vim-8.2.3204/src/testdir/Make_all.mak
  	test_vim9_disassemble \
 -	test_vim9_expr \
  	test_vim9_fails \
- 	test_vim9_func \
+-	test_vim9_func \
  	test_vim9_script
  
  TEST_VIM9_RES = \
@@ -22,9 +22,11 @@ Index: vim-8.2.3204/src/testdir/Make_all.mak
  	test_vim9_disassemble.res \
 -	test_vim9_expr.res \
  	test_vim9_fails.res \
- 	test_vim9_func.res \
+-	test_vim9_func.res \
  	test_vim9_script.res
-@@ -221,7 +217,6 @@ NEW_TESTS = \
+ 
+ # Benchmark scripts.
+@@ -222,7 +216,6 @@ NEW_TESTS = \
  	test_quickfix \
  	test_quotestar \
  	test_random \
@@ -32,7 +34,7 @@ Index: vim-8.2.3204/src/testdir/Make_all.mak
  	test_regex_char_classes \
  	test_regexp_latin \
  	test_regexp_utf8 \
-@@ -457,7 +452,6 @@ NEW_TESTS_RES = \
+@@ -459,7 +452,6 @@ NEW_TESTS_RES = \
  	test_quickfix.res \
  	test_quotestar.res \
  	test_random.res \
diff --git a/vim.changes b/vim.changes
index 7927344..5d6af94 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 18 12:43:01 UTC 2021 - Andreas Schwab <schwab@suse.de>
+
+- Disable unreliable tests also on riscv64
+- disable-unreliable-tests-arch.patch: also disable test_vim9_func
+
 -------------------------------------------------------------------
 Wed Aug 11 09:03:06 UTC 2021 - Christian Boltz <suse-beta@cboltz.de>
 
diff --git a/vim.spec b/vim.spec
index 1f67b8a..0704723 100644
--- a/vim.spec
+++ b/vim.spec
@@ -92,7 +92,7 @@ BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(xt)
 Requires:       vim-data-common = %{version}-%{release}
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 Recommends:     vim-data = %{version}-%{release}
 Conflicts:      vim-base < 8.2
 Provides:       vi
@@ -141,7 +141,7 @@ Group:          Productivity/Text/Editors
 Requires:       gvim_client
 Requires:       vim-data = %{version}-%{release}
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 Conflicts:      gvim < 8.2
 Provides:       gvim-base = %{version}-%{release}
 Provides:       gvim-enhanced = %{version}-%{release}
@@ -161,7 +161,7 @@ want less features, you might want to install vim instead.
 Summary:        Vim with reduced features
 Group:          Productivity/Text/Editors
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 Provides:       vi
 Provides:       vim_client
 Requires:       vim-data-common = %{version}-%{release}
@@ -189,7 +189,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%ifarch s390x %{arm} aarch64
+%ifarch s390x %{arm} aarch64 riscv64
 %patch25 -p1
 %endif
 %patch100 -p1