diff --git a/guile22.spec b/guile22.spec
index 71af635..6126f8f 100644
--- a/guile22.spec
+++ b/guile22.spec
@@ -6,7 +6,7 @@
 
 Name: guile22
 Version: 2.2.7
-Release: 6%{?dist}
+Release: 6.0.riscv64%{?dist}
 Summary: A GNU implementation of Scheme for application extensibility
 Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz
 URL: http://www.gnu.org/software/guile/
@@ -52,11 +52,7 @@ install the guile package.
 
 %build
 autoreconf -fiv
-%configure --disable-static --disable-error-on-warning --program-suffix=%{?mver}
-
-# Remove RPATH
-sed -i 's|" $sys_lib_dlsearch_path "|" $sys_lib_dlsearch_path %{_libdir} "|' \
-    libtool
+%configure --disable-static --disable-error-on-warning --disable-rpath --program-suffix=%{?mver}
 
 %{make_build}
 
@@ -161,6 +157,9 @@ fi
 
 
 %changelog
+* Thu Sep 22 2022 David Abdurachmanov <davidlt@rivosinc.com> - 2.2.7-6.0.riscv64
+- Switch to --disable-rpath
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild