diff --git a/gcc.changes b/gcc.changes
index 49d4e56..20d8200 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May  7 11:18:00 CEST 2008 - rguenther@suse.de
+
+- Make dependencies between the gcc subpackages versioned. [bnc#385305]
+
 -------------------------------------------------------------------
 Fri Nov 23 14:53:40 CET 2007 - rguenther@suse.de
 
diff --git a/gcc.spec b/gcc.spec
index c1c0242..a834669 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gcc (Version 4.3)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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.
 #
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+
 Name:           gcc
 %define separate_bi32 0
 %define separate_bi64 0
@@ -24,7 +25,7 @@ Url:            http://gcc.gnu.org/
 %define gcc_suffix 4.3
 License:        GPL v2 or later
 Version:        4.3
-Release:        9
+Release:        34
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C Compiler
 Provides:       c_compiler
@@ -44,10 +45,11 @@ Authors:
     The GCC team.
 
 %package -n gcc-32bit
+
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C Compiler
 Requires:       gcc%{gcc_version}-32bit
-Requires:       gcc
+Requires:       gcc = %{version}
 
 %description -n gcc-32bit
 This rpm was re-packaged from gcc-3.2.2-56, whose source rpm
@@ -63,10 +65,11 @@ Authors:
     The GCC team.
 
 %package -n gcc-64bit
+
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C Compiler
 Requires:       gcc%{gcc_version}-64bit
-Requires:       gcc
+Requires:       gcc = %{version}
 
 %description -n gcc-64bit
 This rpm was re-packaged from gcc-3.2.2-56, whose source rpm
@@ -82,6 +85,7 @@ Authors:
     The GCC team.
 
 %package -n cpp
+License:        GPL v2 or later
 Group:          Development/Languages/C and C++
 Summary:        The system GNU Preprocessor
 Requires:       cpp%{gcc_version}
@@ -96,6 +100,7 @@ Authors:
     The GCC team. 
 
 %package -n gcc-locale
+License:        GPL v2 or later
 Group:          Development/Languages/C and C++
 Summary:        The system GNU Compiler locale files
 Requires:       gcc%{gcc_version}-locale
@@ -106,6 +111,7 @@ The system GNU Compiler locale files.
 
 
 %package -n gcc-info
+License:        GNU Free Documentation License, Version 1.1 (GFDL 1.1)
 Group:          Development/Languages/C and C++
 Summary:        The system GNU Compiler documentation
 Requires:       gcc%{gcc_version}-info
@@ -116,11 +122,12 @@ The system GNU Compiler documentation.
 
 
 %package -n gcc-c++
+License:        LGPL v2.1 or later
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C++ Compiler
 Provides:       c++_compiler
 Requires:       gcc%{gcc_version}-c++
-Requires:       gcc
+Requires:       gcc = %{version}
 
 %description -n gcc-c++
 The system GNU C++ Compiler.
@@ -128,6 +135,7 @@ The system GNU C++ Compiler.
 
 
 %package -n libstdc++-devel
+License:        GPL v2 or later
 Group:          System/Libraries
 Summary:        The system GNU C++ development files
 Requires:       libstdc++%{gcc_version}-devel
@@ -138,10 +146,11 @@ The system GNU C++ development files.
 
 
 %package -n gcc-fortran
+License:        GPL v2 or later
 Group:          Development/Languages/Fortran
 Summary:        The system GNU Fortran Compiler
 Requires:       gcc%{gcc_version}-fortran
-Requires:       gcc
+Requires:       gcc = %{version}
 
 %description -n gcc-fortran
 The system GNU Fortran Compiler.
@@ -153,10 +162,11 @@ Authors:
     The GCC team.
 
 %package -n gcc-fortran-32bit
+
 Group:          Development/Languages/Fortran
 Summary:        The system GNU Fortran Compiler
 Requires:       gcc%{gcc_version}-fortran-32bit
-Requires:       gcc-fortran
+Requires:       gcc-fortran = %{version}
 
 %description -n gcc-fortran-32bit
 This is a re-packaged binary rpm. For the package source, please look
@@ -171,10 +181,11 @@ Authors:
     The GCC team.
 
 %package -n gcc-fortran-64bit
+
 Group:          Development/Languages/Fortran
 Summary:        The system GNU Fortran Compiler
 Requires:       gcc%{gcc_version}-fortran-64bit
-Requires:       gcc-fortran
+Requires:       gcc-fortran = %{version}
 
 %description -n gcc-fortran-64bit
 This is a re-packaged binary rpm. For the package source, please look
@@ -189,12 +200,13 @@ Authors:
     The GCC team.
 
 %package -n gcc-java
+License:        GPL v2 or later
 Group:          Development/Languages/Java
 Summary:        The system GNU Java Compiler
 Requires:       gcc%{gcc_version}-java
-Requires:       libgcj-devel
-Recommends:     gcc-gij
-Requires:       gcc
+Requires:       libgcj-devel = %{version}
+Recommends:     gcc-gij = %{version}
+Requires:       gcc = %{version}
 
 %description -n gcc-java
 The system GNU Java Compiler.
@@ -202,6 +214,7 @@ The system GNU Java Compiler.
 
 
 %package -n libgcj-devel
+License:        GPL v2 or later; LGPL v2.1 or later
 Group:          Development/Libraries/Java
 Summary:        The system GNU Java development files.
 Requires:       libgcj%{gcc_version}-devel
@@ -212,6 +225,7 @@ The system GNU Java development files.
 
 
 %package -n gcc-gij
+License:        GPL v2 or later
 Group:          Development/Languages/Java
 Summary:        The system GNU Java bytecode interpreter
 Requires:       gcc%{gcc_version}-gij
@@ -222,6 +236,7 @@ The system GNU Java bytecode interpreter.
 
 
 %package -n gcc-gij-32bit
+
 Group:          Development/Languages/Java
 Summary:        The system GNU Java bytecode interpreter
 Requires:       gcc%{gcc_version}-gij-32bit
@@ -231,6 +246,7 @@ The system GNU Java bytecode interpreter.
 
 
 %package -n gcc-gij-64bit
+
 Group:          Development/Languages/Java
 Summary:        The system GNU Java bytecode interpreter
 Requires:       gcc%{gcc_version}-gij-64bit
@@ -241,10 +257,11 @@ The system GNU Java bytecode interpreter.
 
 
 %package -n gcc-objc
+License:        GPL v2 or later
 Group:          Development/Languages/Other
 Summary:        The system GNU Objective C Compiler
 Requires:       gcc%{gcc_version}-objc
-Requires:       gcc
+Requires:       gcc = %{version}
 
 %description -n gcc-objc
 The system GNU Objective C Compiler.
@@ -252,10 +269,11 @@ The system GNU Objective C Compiler.
 
 
 %package -n gcc-objc-32bit
+
 Group:          Development/Languages/Other
 Summary:        The system GNU Objective C Compiler
 Requires:       gcc%{gcc_version}-objc-32bit
-Requires:       gcc-objc
+Requires:       gcc-objc = %{version}
 
 %description -n gcc-objc-32bit
 This is a re-packaged binary rpm. For the package source, please look
@@ -266,10 +284,11 @@ The system GNU Objective C Compiler.
 
 
 %package -n gcc-objc-64bit
+
 Group:          Development/Languages/Other
 Summary:        The system GNU Objective C Compiler
 Requires:       gcc%{gcc_version}-objc-64bit
-Requires:       gcc-objc
+Requires:       gcc-objc = %{version}
 
 %description -n gcc-objc-64bit
 This is a re-packaged binary rpm. For the package source, please look
@@ -280,10 +299,11 @@ The system GNU Objective C Compiler.
 
 
 %package -n gcc-obj-c++
+License:        GPL v2 or later
 Group:          Development/Languages/Other
 Summary:        The system GNU Objective C++ Compiler
 Requires:       gcc%{gcc_version}-obj-c++
-Requires:       gcc-objc
+Requires:       gcc-objc = %{version}
 
 %description -n gcc-obj-c++
 The system GNU Objective C++ Compiler.
@@ -291,10 +311,11 @@ The system GNU Objective C++ Compiler.
 
 
 %package -n gcc-ada
+License:        GPL v2 or later
 Group:          Development/Languages/C and C++
 Summary:        The system GNU Ada Compiler
 Requires:       gcc%{gcc_version}-ada
-Requires:       gcc
+Requires:       gcc = %{version}
 
 %description -n gcc-ada
 The system GNU Ada Compiler.
@@ -306,6 +327,7 @@ Authors:
     The GCC team.
 
 %package -n libffi-devel
+License:        BSD 3-Clause
 Group:          System/Libraries
 Summary:        The system GNU Foreign Function Interface library development files
 Requires:       libffi%{gcc_version}-devel
@@ -316,6 +338,7 @@ The system GNU Foreign Function Interface library development files.
 
 
 %package -n libffi-devel-32bit
+
 Group:          System/Libraries
 Summary:        The system GNU Foreign Function Interface library development files
 Requires:       libffi%{gcc_version}-devel-32bit
@@ -329,6 +352,7 @@ The system GNU Foreign Function Interface library development files.
 
 
 %package -n libffi-devel-64bit
+
 Group:          System/Libraries
 Summary:        The system GNU Foreign Function Interface library development files
 Requires:       libffi%{gcc_version}-devel-64bit
@@ -595,55 +619,57 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 %endif
 
 %changelog
-* Fri Nov 23 2007 - rguenther@suse.de
+* Wed May 07 2008 rguenther@suse.de
+- Make dependencies between the gcc subpackages versioned. [bnc#385305]
+* Fri Nov 23 2007 rguenther@suse.de
 - Make gcc-gij dependency of gcc-java a recommendation, all java
   tools are back to the gcc-java package.  Require libgcj-devel
   from gcc-java.
 - Revert /lib/cpp changes.
-* Fri Nov 16 2007 - rguenther@suse.de
+* Fri Nov 16 2007 rguenther@suse.de
 - For now disable symlinking of binaries and manpages that
   conflict with the classpath package.
-* Tue Nov 13 2007 - rguenther@suse.de
+* Tue Nov 13 2007 rguenther@suse.de
 - Make /lib/cpp traditional and avoid GCC and target specific
   defines.
-* Tue Oct 30 2007 - rguenther@suse.de
+* Tue Oct 30 2007 rguenther@suse.de
 - Add gcc-gij dependency to gcc-java as it contains many of the
   tools formerly packaged in the gcc-java package.
-* Mon Sep 24 2007 - rguenther@suse.de
+* Mon Sep 24 2007 rguenther@suse.de
 - Switch gcc default to 4.3.
-* Fri Jul 27 2007 - rguenther@suse.de
+* Fri Jul 27 2007 rguenther@suse.de
 - Fix typo.
-* Tue Jul 24 2007 - rguenther@suse.de
+* Tue Jul 24 2007 rguenther@suse.de
 - Add 32bit and 64bit variants of gcc-gij.  [#293423]
-* Fri Jul 06 2007 - rguenther@suse.de
+* Fri Jul 06 2007 rguenther@suse.de
 - Mark ppc64 as separate bi-32.
-* Thu Jun 14 2007 - ro@suse.de
+* Thu Jun 14 2007 ro@suse.de
 - Do not mark README.packaging as NoSource. (again)
-* Fri Jun 08 2007 - rguenther@suse.de
+* Fri Jun 08 2007 rguenther@suse.de
 - Switch gcc default to 4.2.  [#275939]
-* Tue Apr 24 2007 - rguenther@suse.de
+* Tue Apr 24 2007 rguenther@suse.de
 - Do not link to grmic and grmiregistry, they conflict with
   the classpath package versions.
-* Tue Jan 16 2007 - rguenther@suse.de
+* Tue Jan 16 2007 rguenther@suse.de
 - Do not mark README.packaging as NoSource.
-* Thu Nov 09 2006 - rguenther@suse.de
+* Thu Nov 09 2006 rguenther@suse.de
 - Remove gcc-c++-32bit and gcc-c++-64bit packages.
-* Tue Oct 31 2006 - dmueller@suse.de
+* Tue Oct 31 2006 dmueller@suse.de
 - don't build as root
-* Mon Oct 30 2006 - rguenther@suse.de
+* Mon Oct 30 2006 rguenther@suse.de
 - Make gcc architecture dependent again.  [#215971]
-* Thu Oct 26 2006 - rguenther@suse.de
+* Thu Oct 26 2006 rguenther@suse.de
 - Add dependencies to the gcc and non-32/64bit packages.  [#215217]
-* Tue Sep 19 2006 - rguenther@suse.de
+* Tue Sep 19 2006 rguenther@suse.de
 - New gcc-gij package.
-* Fri Aug 25 2006 - rguenther@suse.de
+* Fri Aug 25 2006 rguenther@suse.de
 - Add 32bit and 64bit support packages to gcc, gcc-c++, gcc-fortran,
   gcc-objc and libffi-devel.
-* Thu Aug 24 2006 - rguenther@suse.de
+* Thu Aug 24 2006 rguenther@suse.de
 - Make gcc require cpp to pull in /lib/cpp.
-* Fri Aug 18 2006 - rguenther@suse.de
+* Fri Aug 18 2006 rguenther@suse.de
 - gcc obsoletes gcc-mudflap which is no longer.
-* Mon Aug 07 2006 - rguenther@suse.de
+* Mon Aug 07 2006 rguenther@suse.de
 - Provide gcc-mudflap, gcc-info and gcc-locale packages [#197515].
-* Fri Jul 14 2006 - rguenther@suse.de
+* Fri Jul 14 2006 rguenther@suse.de
 - New package.