diff --git a/ghc-tasty.changes b/ghc-tasty.changes
index 7cd3770..3ed422e 100644
--- a/ghc-tasty.changes
+++ b/ghc-tasty.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug  2 17:23:04 UTC 2023 - Andreas Schwab <schwab@suse.de>
+
+- riscv64-unbounded-delays.patch: Don't depend on unbounded-delays for
+  riscv64
+
 -------------------------------------------------------------------
 Thu Mar 30 17:08:30 UTC 2023 - Peter Simons <psimons@suse.com>
 
diff --git a/ghc-tasty.spec b/ghc-tasty.spec
index 9f8c740..cb11acc 100644
--- a/ghc-tasty.spec
+++ b/ghc-tasty.spec
@@ -25,6 +25,8 @@ Summary:        Modern and extensible testing framework
 License:        MIT
 URL:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+# https://github.com/UnkindPartition/tasty/pull/371
+Patch0:         riscv64-unbounded-delays.patch
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-ansi-terminal-devel
 BuildRequires:  ghc-ansi-terminal-prof
@@ -77,7 +79,7 @@ Supplements:    (ghc-%{pkg_name}-devel and ghc-prof)
 This package provides the Haskell %{pkg_name} profiling library.
 
 %prep
-%autosetup -n %{pkg_name}-%{version}
+%autosetup -n %{pkg_name}-%{version} -p1
 
 %build
 %ghc_lib_build
diff --git a/riscv64-unbounded-delays.patch b/riscv64-unbounded-delays.patch
new file mode 100644
index 0000000..7bd9f52
--- /dev/null
+++ b/riscv64-unbounded-delays.patch
@@ -0,0 +1,25 @@
+From 65da3d6512ee2f8c53d2bbde840456749c5038c8 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Thu, 22 Jun 2023 08:21:17 +0300
+Subject: [PATCH] Don't depend on unbounded-delays for riscv64
+
+64-bit RISC-V should fall into the same case in
+https://github.com/UnkindPartition/tasty/pull/344 and should be added
+here. Tested locally.
+---
+ core/tasty.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: tasty-1.4.3/tasty.cabal
+===================================================================
+--- tasty-1.4.3.orig/tasty.cabal
++++ tasty-1.4.3/tasty.cabal
+@@ -68,7 +68,7 @@ library
+     ansi-terminal        >= 0.9
+ 
+   -- No reason to depend on unbounded-delays on 64-bit architecture
+-  if(!arch(x86_64) && !arch(aarch64))
++  if(!arch(x86_64) && !arch(aarch64) && !arch(riscv64))
+     build-depends:
+       unbounded-delays >= 0.1
+