diff --git a/gcc.spec b/gcc.spec
index 89e8939..674c4da 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -119,7 +119,7 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}%{?dist}
+Release: %{gcc_release}.0.riscv64%{?dist}
 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
 # GCC Runtime Exception.
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@@ -924,6 +924,13 @@ ISL_FLAG_PIC=-fPIC
 ISL_FLAG_PIC=-fpic
 %endif
 cd isl-build
+
+%ifarch riscv64
+# Update config.{sub,guess} scripts for riscv64 (the original ones are too old)
+curl -o ../../isl-%{isl_version}/config.guess 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess'
+curl -o ../../isl-%{isl_version}/config.sub 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub'
+%endif
+
 sed -i 's|libisl|libgcc11privateisl|g' \
   ../../isl-%{isl_version}/Makefile.{am,in}
 ../../isl-%{isl_version}/configure \
@@ -3150,6 +3157,9 @@ end
 %endif
 
 %changelog
+* Thu Jul 28 2022 David Abdurachmanov <davidlt@rivosinc.com> 11.3.1-2.0.riscv64
+- Update config.{sub,guess} scripts for ISL 0.18 on riscv64
+
 * Thu Apr 21 2022 Jakub Jelinek <jakub@redhat.com> 11.3.1-2
 - update from releases/gcc-11-branch
   - PRs debug/105203, gcov-profile/105282, libstdc++/105324, target/105257