diff --git a/guile.spec b/guile.spec
index ebaae0f..4f1bd18 100644
--- a/guile.spec
+++ b/guile.spec
@@ -2,7 +2,7 @@ Summary: A GNU implementation of Scheme for application extensibility
 Name: guile
 %define mver 2.0
 Version: 2.0.14
-Release: 31%{?dist}
+Release: 31.0.riscv64%{?dist}
 Epoch: 5
 Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz
 URL: http://www.gnu.org/software/guile/
@@ -68,11 +68,7 @@ autoreconf -fiv
 export CFLAGS="$(echo $RPM_OPT_FLAGS | sed 's/-O2/-Os/')"
 %endif
 
-%configure --disable-static --disable-error-on-warning
-
-# Remove RPATH
-sed -i 's|" $sys_lib_dlsearch_path "|" $sys_lib_dlsearch_path %{_libdir} "|' \
-    libtool
+%configure --disable-static --disable-error-on-warning --disable-rpath
 
 %{make_build}
 
@@ -173,6 +169,9 @@ fi
 %{_includedir}/guile
 
 %changelog
+* Wed Mar 01 2023 David Abdurachmanov <davidlt@rivosinc.com> - 5:2.0.14-31.0.riscv64
+- Switch to --disable-rpath
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild