diff --git a/gcc.changes b/gcc.changes
index 20d8200..27308ac 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec  4 18:26:30 CET 2008 - matz@suse.de
+
+- Add new gcc-z9 package on s390 and s390x to change the
+  default -march and -mtune settings.
+
 -------------------------------------------------------------------
 Wed May  7 11:18:00 CEST 2008 - rguenther@suse.de
 
diff --git a/gcc.spec b/gcc.spec
index a834669..11aaa1e 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -2,9 +2,16 @@
 # spec file for package gcc (Version 4.3)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -25,7 +32,7 @@ Url:            http://gcc.gnu.org/
 %define gcc_suffix 4.3
 License:        GPL v2 or later
 Version:        4.3
-Release:        34
+Release:        59
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C Compiler
 Provides:       c_compiler
@@ -364,6 +371,20 @@ for the source of the package without the "64bit" ending
 The system GNU Foreign Function Interface library development files.
 
 
+%package -n gcc-z9
+License:        GPL v2 or later
+Group:          Development/Languages/C and C++
+Summary:        The system GNU C Compiler
+Requires:       gcc
+
+%description -n gcc-z9
+The system GNU C Compiler.
+
+
+
+Authors:
+--------
+    The GCC team.
 
 %prep 
 
@@ -432,6 +453,15 @@ ln -sf g++-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/c++
 ln -sf gcc-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/cc
 ln -sf g++-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/c++.1.gz
 ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
+%ifarch s390 s390x
+dir=`gcc -print-prog-name=cc1`
+dir=${dir%/cc1}
+mkdir -p $RPM_BUILD_ROOT/$dir
+cat > $RPM_BUILD_ROOT/$dir/defaults.spec <<EOF
+*default_spec:
+%{!mtune=*:-mtune=z10} %{!march=*:-march=z9-109}
+EOF
+%endif
 
 %files
 %defattr(-,root,root)
@@ -617,8 +647,17 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 # empty - only for the dependency
 %doc README
 %endif
+%ifarch s390 s390x
+
+%files -n gcc-z9
+%defattr(-,root,root)
+/usr/lib*/gcc/*-suse-linux/*/defaults.spec
+%endif
 
 %changelog
+* Thu Dec 04 2008 matz@suse.de
+- Add new gcc-z9 package on s390 and s390x to change the
+  default -march and -mtune settings.
 * Wed May 07 2008 rguenther@suse.de
 - Make dependencies between the gcc subpackages versioned. [bnc#385305]
 * Fri Nov 23 2007 rguenther@suse.de