diff --git a/binutils.changes b/binutils.changes
index 9c48519..e787f8f 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/binutils.spec b/binutils.spec
index 49f53dc..e3a6680 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -98,6 +98,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    %{TARGET}
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-alpha-binutils.changes b/cross-alpha-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-alpha-binutils.changes
+++ b/cross-alpha-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec
index 4b754e4..5237086 100644
--- a/cross-alpha-binutils.spec
+++ b/cross-alpha-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    alpha
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index 75a13e3..c472134 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    arm
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index 4a91330..0e7792a 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    avr
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 631a736..364e775 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    hppa
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index 7d262a6..ac4f082 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    hppa64
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index ef7722f..bf464c4 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    i586
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 0e0863d..17806c8 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    ia64
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index 4e10223..1010c5b 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    mips
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 6f3b234..e6ef223 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    powerpc
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index 92d2328..a7f444f 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    powerpc64
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 2cdb18d..093ef73 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    s390
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 172d4a6..1e8131d 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    s390x
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index 197a43f..960b3e0 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    sparc
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 9d10dd3..0c0888c 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    spu
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index 9c48519..e787f8f 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 14 11:53:56 UTC 2012 - coolo@suse.com
+
+- exclude our target arch for cross compiling - this is just not cross
+
 -------------------------------------------------------------------
 Thu Apr 19 11:28:41 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 425bc0d..11bafb9 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -116,6 +116,10 @@ Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{!?cross:1}
+ExcludeArch:    x86_64
+%endif
+
 %description
 C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib,
 size, strings, and strip. These utilities are needed whenever you want
diff --git a/pre_checkin.sh b/pre_checkin.sh
index cbcae30..01500af 100644
--- a/pre_checkin.sh
+++ b/pre_checkin.sh
@@ -7,13 +7,15 @@ for arch in hppa hppa64 mips arm i386 x86_64 s390 s390x ppc ppc64 ia64 sparc alp
    echo -n "Building package for $arch --> cross-$arch-binutils ..."
 
    ln -f binutils.changes cross-$arch-binutils.changes
+   targetarch=`echo $arch | sed -e "s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/"`
    ( echo "%define cross 1"
-     echo "%define TARGET $arch" \
-       | sed -e "s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/"
+     echo "%define TARGET $targetarch" 
    ) > cross-$arch-binutils.spec
-   sed -e "s/^Name:.*binutils\$/Name:         cross-$arch-binutils/" \
+   sed -e "s/^Name:.*binutils\$/Name:         cross-$arch-binutils/; s/^ExcludeArch:.*/ExcludeArch: $targetarch/" \
        < binutils.spec >> cross-$arch-binutils.spec
 
    echo " done."
 done
 
+osc service localrun format_spec_file
+