diff --git a/binutils.spec b/binutils.spec
index 4f4af62..e4159b1 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        6
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec
index 5a276f3..4254fcc 100644
--- a/cross-alpha-binutils.spec
+++ b/cross-alpha-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-alpha-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-alpha-binutils
+Name:           cross-alpha-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index ac7819b..3d8bfbc 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-arm-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-arm-binutils
+Name:           cross-arm-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index c97eec8..a5f8b8a 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-hppa-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-hppa-binutils
+Name:           cross-hppa-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index c87ae8e..0a4756c 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-hppa64-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-hppa64-binutils
+Name:           cross-hppa64-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index ebdccf7..f4037b4 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-i386-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-i386-binutils
+Name:           cross-i386-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 0e87a79..7118159 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-ia64-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-ia64-binutils
+Name:           cross-ia64-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index 13f9a29..b7d5334 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-mips-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-mips-binutils
+Name:           cross-mips-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 46ae31e..53a1d1f 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-ppc-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-ppc-binutils
+Name:           cross-ppc-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index 9ed88d1..09597f8 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-ppc64-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-ppc64-binutils
+Name:           cross-ppc64-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index a1738d4..ddf33a5 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-s390-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-s390-binutils
+Name:           cross-s390-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 4b80d82..f708dc4 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-s390x-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-s390x-binutils
+Name:           cross-s390x-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index b5a225b..d13deb9 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-sparc-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-sparc-binutils
+Name:           cross-sparc-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 0e52104..9a596ff 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-spu-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-spu-binutils
+Name:           cross-spu-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 08aaaa4..edd12a5 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils
+# spec file for package cross-x86_64-binutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-x86_64-binutils
+Name:           cross-x86_64-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 # for the testsuite
 %if 0%{suse_version} >= 1210
@@ -31,7 +31,7 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 Version:        2.21.1
-Release:        1
+Release:        2
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -93,7 +93,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch16:        amd-bdver2-and-fixes2.diff.gz
 Patch17:        binutils-add-pep.diff
-Patch18:	gold-depend-on-opcodes.diff
+Patch18:        gold-depend-on-opcodes.diff
 Patch19:        readelf-bad-elf-endless-loop.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch