diff --git a/binutils.changes b/binutils.changes
index f33518c..a7dd3d7 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/binutils.spec b/binutils.spec
index 8e12c99..110d7fb 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -410,6 +410,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-aarch64-binutils.changes
+++ b/cross-aarch64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index dffe3e9..8a71b3b 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index 3ea35ca..c9d0bdd 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index ceb6c34..ad9a07a 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-epiphany-binutils.changes b/cross-epiphany-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-epiphany-binutils.changes
+++ b/cross-epiphany-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec
index 73cbe9e..014f8ca 100644
--- a/cross-epiphany-binutils.spec
+++ b/cross-epiphany-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 90ba5a8..f53887d 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index 47777b1..33b1ae5 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 4e1ad3e..ec534bb 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 3664c49..a663aeb 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-m68k-binutils.changes b/cross-m68k-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-m68k-binutils.changes
+++ b/cross-m68k-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec
index d2032b5..2a9b536 100644
--- a/cross-m68k-binutils.spec
+++ b/cross-m68k-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index aea02ed..3247636 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index b7f777e..c75f456 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index e5dad49..70aac88 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-ppc64le-binutils.changes b/cross-ppc64le-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-ppc64le-binutils.changes
+++ b/cross-ppc64le-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec
index e02bdfa..f2e4227 100644
--- a/cross-ppc64le-binutils.spec
+++ b/cross-ppc64le-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-riscv64-binutils.changes b/cross-riscv64-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-riscv64-binutils.changes
+++ b/cross-riscv64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-riscv64-binutils.spec b/cross-riscv64-binutils.spec
index 650ce96..580dcdd 100644
--- a/cross-riscv64-binutils.spec
+++ b/cross-riscv64-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-rx-binutils.changes b/cross-rx-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-rx-binutils.changes
+++ b/cross-rx-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-rx-binutils.spec b/cross-rx-binutils.spec
index bce69f5..1ae07c2 100644
--- a/cross-rx-binutils.spec
+++ b/cross-rx-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 310c3bc..f683899 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index de8854f..a240dc5 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index 55419ff..2739651 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-sparc64-binutils.changes
+++ b/cross-sparc64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index 1742fb7..a851dc4 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index ec8c10f..a2d719f 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index f33518c..a7dd3d7 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 20:57:32 UTC 2018 - afaerber@suse.de
+
+- Restore riscv64-elf cross prefix via symlinks
+
 -------------------------------------------------------------------
 Thu Mar 22 17:11:45 UTC 2018 - schwab@suse.de
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index aabdf94..ec33e20 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -413,6 +413,14 @@ for f in %buildroot/usr/$T/bin/* ; do
   done
 done
 %endif
+%if "%{TARGET}" == "riscv64"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in riscv64-elf; do
+    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+  done
+done
+%endif
 %if "%{TARGET}" == "avr"
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
 ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as