diff --git a/compiler-rt17.spec b/compiler-rt17.spec
index 8e79248..b1dcf6a 100644
--- a/compiler-rt17.spec
+++ b/compiler-rt17.spec
@@ -44,7 +44,7 @@
 
 Name:		%{pkg_name}
 Version:	%{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release:	6%{?dist}
+Release:	6.0.riscv64%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	Apache-2.0 WITH LLVM-exception OR NCSA OR MIT
@@ -160,11 +160,14 @@ ln -s i386-redhat-linux-gnu %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/%{_t
 %{_prefix}/lib/clang/%{maj_ver}/include/*
 %{_prefix}/lib/clang/%{maj_ver}/lib/*
 %{_prefix}/lib/clang/%{maj_ver}/share/*
-#%ifarch x86_64 aarch64
-#{_bindir}/hwasan_symbolize
-#%endif
+%ifnarch riscv64
+%{_bindir}/hwasan_symbolize
+%endif
 
 %changelog
+* Thu Mar 28 2024 David Abdurachmanov <davidlt@rivosinc.com> - 17.0.6-6.0.riscv64
+- Do not package hwasan_symbolize on riscv64
+
 * Sat Mar 02 2024 Tom Stellard <tstellar@redhat.com> - 17.0.6-6
 - Depend on clang-resource-filesystem from clang compat