diff --git a/binutils.spec b/binutils.spec
index bd45ebe..7673be7 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -203,7 +203,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -256,7 +256,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index 84fae7a..50a10d5 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec
index 245675c..9e70368 100644
--- a/cross-alpha-binutils.spec
+++ b/cross-alpha-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index ea25a01..7f7361e 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index 2a97eec..c112473 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 53c3d79..d41dd34 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index fa992ba..ed1774c 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index a8f5e88..6abff98 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 7a9b163..4480a4e 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index 152dfc5..e9ba992 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 16baa6e..4dfee97 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index f5930eb..be91b63 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 44572a0..b1baa62 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 87ed86b..c708e95 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index 2cbbeca..db88a3d 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index 8361894..d7eb3bf 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 91ab53b..406e32e 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index da34e78..7fbc16e 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -206,7 +206,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %ifarch aarch64
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -259,7 +259,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "aarch64"
-EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux-gnueabi"
+EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}