diff --git a/binutils.changes b/binutils.changes
index ef9ef7e..0674343 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/binutils.spec b/binutils.spec
index 8359c44..9943653 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -181,10 +181,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-aarch64-binutils.changes
+++ b/cross-aarch64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index 2e675ec..829c4b6 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index 68cdbe7..aeb4181 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index 3a59030..d908f58 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-epiphany-binutils.changes b/cross-epiphany-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-epiphany-binutils.changes
+++ b/cross-epiphany-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec
index 8619faa..c93daa4 100644
--- a/cross-epiphany-binutils.spec
+++ b/cross-epiphany-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index cadb2cf..bd42dc7 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index dd52a34..7e30918 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 8b6270c..5f077fb 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 8b2445c..9c295bf 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-m68k-binutils.changes b/cross-m68k-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-m68k-binutils.changes
+++ b/cross-m68k-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec
index 55343ce..f150f1f 100644
--- a/cross-m68k-binutils.spec
+++ b/cross-m68k-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index cb715b0..80f6a55 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index e7ebc38..e58158b 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index 0c18ffa..76c8df7 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-ppc64le-binutils.changes b/cross-ppc64le-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-ppc64le-binutils.changes
+++ b/cross-ppc64le-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec
index decdc44..52ec2e7 100644
--- a/cross-ppc64le-binutils.spec
+++ b/cross-ppc64le-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-rx-binutils.changes b/cross-rx-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-rx-binutils.changes
+++ b/cross-rx-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-rx-binutils.spec b/cross-rx-binutils.spec
index e15f2d8..d042b54 100644
--- a/cross-rx-binutils.spec
+++ b/cross-rx-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 634ddc7..f5038d3 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 12d7aa8..eac3494 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index eb1b460..11bdf62 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-sparc64-binutils.changes
+++ b/cross-sparc64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index 359072d..b21e3e7 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 07e08cb..e68b19b 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index ef9ef7e..0674343 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  4 16:58:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Remove qemu workaround from spec file, since qemu 2.5.0rc0 the
+  length of the argument list is no longer limited to 128 kByte.
+
 -------------------------------------------------------------------
 Wed Aug 24 11:26:22 UTC 2016 - rguenther@suse.com
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 1d08f4b..cc35de2 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -184,10 +184,6 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 #
 # test_vanilla
 %endif
-%if 0%{?qemu_user_space_build}
-# Work around bug in qemu (make: execvp: /bin/sh: Argument list too long)
-sed -i 's/\.EXPORT_ALL_VARIABLES:/#&/' gold/testsuite/Makefile.{am,in}
-%endif
 
 %build
 sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h