diff --git a/binutils.changes b/binutils.changes
index 90d4131..4664561 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/binutils.spec b/binutils.spec
index fd0aa6c..ca94b26 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -63,7 +63,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -399,6 +399,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-aarch64-binutils.changes
+++ b/cross-aarch64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index 7b2618c..801af6f 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-aarch64-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index f28b74a..204feb2 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-arm-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index bb9b8d0..83411d2 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-avr-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-epiphany-binutils.changes
+++ b/cross-epiphany-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec
index 67a49aa..581687f 100644
--- a/cross-epiphany-binutils.spec
+++ b/cross-epiphany-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-epiphany-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index b6c6a8f..e065359 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-hppa-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index 4533b9a..8e635dd 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-hppa64-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 1d108c3..6be202e 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-i386-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 9e4019d..4390fab 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ia64-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-m68k-binutils.changes
+++ b/cross-m68k-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec
index 9b01936..bda0274 100644
--- a/cross-m68k-binutils.spec
+++ b/cross-m68k-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-m68k-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index decde88..64e6002 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-mips-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 946c725..4b26b3a 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ppc-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index 54197c5..fbb1c93 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ppc64-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-ppc64le-binutils.changes
+++ b/cross-ppc64le-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec
index 31285d0..ffd6b07 100644
--- a/cross-ppc64le-binutils.spec
+++ b/cross-ppc64le-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ppc64le-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-riscv64-binutils.changes
+++ b/cross-riscv64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-riscv64-binutils.spec b/cross-riscv64-binutils.spec
index 4e93842..3595e50 100644
--- a/cross-riscv64-binutils.spec
+++ b/cross-riscv64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-riscv64-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-rx-binutils.changes
+++ b/cross-rx-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-rx-binutils.spec b/cross-rx-binutils.spec
index 5e5a681..d8a38b7 100644
--- a/cross-rx-binutils.spec
+++ b/cross-rx-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-rx-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 1efd3b0..6019299 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-s390-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index a0a1540..95a00d8 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-s390x-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index bdc181a..e5f9f90 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-sparc-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-sparc64-binutils.changes
+++ b/cross-sparc64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index f9d7f66..171b9f3 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-sparc64-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index adcc0e2..0c77ba7 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-spu-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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 90d4131..4664561 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 22 09:40:25 UTC 2018 - schwab@suse.de
+
+- Add riscv64 to %target_list
+
+-------------------------------------------------------------------
+Wed Jan 17 11:28:03 UTC 2018 - afaerber@suse.de
+
+- Add arm-none-eabi symlinks (bsc#1074741)
+
 -------------------------------------------------------------------
 Mon Oct  2 19:29:22 UTC 2017 - matz@suse.com
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index ea597f4..eb93871 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-x86_64-binutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@ Release:        0
 %else
 %define build_multitarget 0
 %endif
-%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le s390 s390x sh4 sparc sparc64 x86_64
+%define target_list aarch64 alpha armv5l armv6l armv7l armv8l hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 s390 s390x sh4 sparc sparc64 x86_64
 #
 #
 #
@@ -402,6 +402,14 @@ T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
+%if "%{TARGET}" == "arm"
+# Instead of building duplicate binutils, add symlinks
+for f in %buildroot/usr/$T/bin/* ; do
+  for p in arm-none-eabi; 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