diff --git a/qemu.spec b/qemu.spec
index a051a0a..8520a46 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -317,7 +317,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release}
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 7.2.0
-Release: %{baserelease}%{?rcrel}%{?dist}
+Release: %{baserelease}%{?rcrel}.0.riscv64%{?dist}
 Epoch: 2
 License: GPLv2 and BSD and MIT and CC-BY
 URL: http://www.qemu.org/
@@ -491,6 +491,10 @@ BuildRequires: SDL2_image-devel
 
 %if %{user_static}
 BuildRequires: glibc-static glib2-static zlib-static
+# if -pthread is used GCC SPEC will add --as-needed -latomic --no-as-needed for linker
+%ifarch riscv64
+BuildRequires: libatomic-static
+%endif
 %if 0%{?fedora} >= 37
 BuildRequires: pcre2-static
 %else
@@ -1988,7 +1992,8 @@ rm -rf %{static_buildroot}
 pushd %{qemu_kvm_build}
 echo "Testing %{name}-build"
 # 2022-06: ppc64le random qtest segfaults with no discernable pattern
-%ifnarch %{power64}
+# 2022-10: some arches (2) hang in endless loops in qtests on riscv64
+%ifnarch %{power64} riscv64
 %make_build check
 %endif
 
@@ -2508,8 +2513,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %{_bindir}/qemu-riscv64-static
 %{_datadir}/systemtap/tapset/qemu-riscv32-static.stp
 %{_datadir}/systemtap/tapset/qemu-riscv64-static.stp
-%{_exec_prefix}/lib/binfmt.d/qemu-riscv32-static.conf
 %ifnarch riscv64
+%{_exec_prefix}/lib/binfmt.d/qemu-riscv32-static.conf
 %{_exec_prefix}/lib/binfmt.d/qemu-riscv64-static.conf
 %endif
 
@@ -2762,6 +2767,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 
 
 %changelog
+* Thu Apr 06 2023 David Abdurachmanov <davidlt@rivosinc.com> - 7.2.0-6.0.riscv64
+- Add support for riscv64
+
 * Tue Jan 31 2023 Stefan Hajnoczi <stefanha@redhat.com> - 7.2.0-6
 - Enable libblkio