diff --git a/rtems/config/5/rtems-riscv32.bset b/rtems/config/5/rtems-riscv.bset
similarity index 78%
rename from rtems/config/5/rtems-riscv32.bset
rename to rtems/config/5/rtems-riscv.bset
index 8bb840f..37dfe42 100644
--- a/rtems/config/5/rtems-riscv32.bset
+++ b/rtems/config/5/rtems-riscv.bset
@@ -2,7 +2,7 @@
 # RISC-V architecture
 #
 %define release 1
-%define rtems_arch riscv32
+%define rtems_arch riscv
 %define with_libgomp
 
 %include rtems-base.bset
@@ -10,7 +10,7 @@
 5/rtems-autotools
 
 devel/expat-2.1.0-1
-tools/rtems-binutils-2.31.1
+tools/rtems-binutils-906c6f2c54425f18eccb30e3ae54cbe620f0fe86
 tools/rtems-gcc-62cab5089882f91865e9040672f7932ae8d09db1-newlib-3.0.0.20180720
 tools/rtems-gdb-ce73f310150418a9a1625ab60a527d959096a9e2
 tools/rtems-tools-5-1
diff --git a/rtems/config/tools/rtems-binutils-906c6f2c54425f18eccb30e3ae54cbe620f0fe86.cfg b/rtems/config/tools/rtems-binutils-906c6f2c54425f18eccb30e3ae54cbe620f0fe86.cfg
new file mode 100644
index 0000000..efd114a
--- /dev/null
+++ b/rtems/config/tools/rtems-binutils-906c6f2c54425f18eccb30e3ae54cbe620f0fe86.cfg
@@ -0,0 +1,29 @@
+#
+# Binutils
+#
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define binutils_version 906c6f2c54425f18eccb30e3ae54cbe620f0fe86
+%define binutils_external 1
+%define binutils_expand_name sourceware-mirror-binutils-gdb-%{binutils_version}
+%source set binutils --rsb-file=%{binutils_expand_name}.tar.gz https://codeload.github.com/RTEMS/sourceware-mirror-binutils-gdb/tar.gz/%{binutils_version}
+%hash sha512 %{binutils_expand_name}.tar.gz 60d61ef67b82bc74b7375313ac05b1b4885be0154e3595268ce6748683ffc3a60fcc61e3863abaae86617117b4a1ef89a91ed8351af4608ae874ff4d0494cfe7
+
+#
+# Enable deterministic archives by default. This will be the default
+# there all tools using this binutils will create deterministic
+# archives.
+#
+%define with_deterministic_archives 1
+
+#
+# Enable 64-bit BFD support
+#
+%define with_64_bit_bfd 1
+
+#
+# The binutils build instructions. We use 2.xx Release 1.
+#
+%include %{_configdir}/binutils-2-1.cfg