diff --git a/gcc.changes b/gcc.changes
index 55046a2..1b018e2 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb 10 10:06:12 UTC 2011 - rguenther@novell.com
+
+- Fix licenses to match those of the system compiler.  [bnc#670658]
+
 -------------------------------------------------------------------
 Tue Jan 25 10:36:30 UTC 2011 - rguenther@novell.com
 
diff --git a/gcc.spec b/gcc.spec
index 7e2be0d..0bd3f29 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -30,7 +30,7 @@ Name:           gcc
 Url:            http://gcc.gnu.org/
 %define gcc_version 45
 %define gcc_suffix 4.5
-License:        GPLv2+
+License:        GPLv3+
 Version:        4.5
 Release:        12
 Group:          Development/Languages/C and C++
@@ -47,12 +47,8 @@ The system GNU C Compiler.
 
 
 
-Authors:
---------
-    The GCC team.
-
 %package -n gcc-32bit
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C Compiler
 Requires:       gcc%{gcc_version}-32bit
@@ -63,12 +59,8 @@ The system GNU C Compiler.
 
 
 
-Authors:
---------
-    The GCC team.
-
 %package -n gcc-64bit
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C Compiler
 Requires:       gcc%{gcc_version}-64bit
@@ -79,12 +71,8 @@ The system GNU C Compiler.
 
 
 
-Authors:
---------
-    The GCC team.
-
 %package -n cpp
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/C and C++
 Summary:        The system GNU Preprocessor
 Requires:       cpp%{gcc_version}
@@ -94,12 +82,8 @@ The system GNU Preprocessor.
 
 
 
-Authors:
---------
-    The GCC team. 
-
 %package -n gcc-locale
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/C and C++
 Summary:        The system GNU Compiler locale files
 Requires:       gcc%{gcc_version}-locale
@@ -110,7 +94,7 @@ The system GNU Compiler locale files.
 
 
 %package -n gcc-info
-License:        GFDLv1.1
+License:        GFDLv1.2
 Group:          Development/Languages/C and C++
 Summary:        The system GNU Compiler documentation
 PreReq:         %{install_info_prereq}
@@ -131,7 +115,7 @@ The system GNU Compiler documentation.
 %install_info --info-dir=%{_infodir} --name=gfortran --description=\\"The GNU Fortran compiler.\\" %{_infodir}/gfortran-%{gcc_suffix}.info.gz
 
 %package -n gcc-c++
-License:        LGPLv2.1+
+License:        GPLv3+
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C++ Compiler
 Provides:       c++_compiler
@@ -143,7 +127,7 @@ The system GNU C++ Compiler.
 
 
 %package -n gcc-c++-32bit
-License:        LGPLv2.1+
+License:        GPLv3+
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C++ Compiler
 Requires:       gcc-c++ = %{version}
@@ -155,7 +139,7 @@ The system GNU C++ Compiler 32 bit support.
 
 
 %package -n gcc-c++-64bit
-License:        LGPLv2.1+
+License:        GPLv3+
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C++ Compiler
 Requires:       gcc-c++ = %{version}
@@ -168,7 +152,7 @@ The system GNU C++ Compiler 64 bit support.
 
 
 %package -n libstdc++-devel
-License:        GPLv2+
+License:        GPLv3+ <<ex(GCC Runtime Library Exception 3.1)
 Group:          System/Libraries
 Summary:        The system GNU C++ development files
 Requires:       libstdc++%{gcc_version}-devel
@@ -179,7 +163,7 @@ The system GNU C++ development files.
 
 
 %package -n gcc-fortran
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/Fortran
 Summary:        The system GNU Fortran Compiler
 Requires:       gcc%{gcc_version}-fortran
@@ -189,13 +173,8 @@ Requires:       gcc = %{version}
 The system GNU Fortran Compiler.
 
 
-
-Authors:
---------
-    The GCC team.
-
 %package -n gcc-fortran-32bit
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/Fortran
 Summary:        The system GNU Fortran Compiler
 Requires:       gcc%{gcc_version}-fortran-32bit
@@ -205,13 +184,8 @@ Requires:       gcc-fortran = %{version}
 The system GNU Fortran Compiler 32 bit support.
 
 
-
-Authors:
---------
-    The GCC team.
-
 %package -n gcc-fortran-64bit
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/Fortran
 Summary:        The system GNU Fortran Compiler
 Requires:       gcc%{gcc_version}-fortran-64bit
@@ -221,13 +195,8 @@ Requires:       gcc-fortran = %{version}
 The system GNU Fortran Compiler 64 bit support.
 
 
-
-Authors:
---------
-    The GCC team.
-
 %package -n gcc-java
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/Java
 Summary:        The system GNU Java Compiler
 Requires:       gcc%{gcc_version}-java
@@ -241,7 +210,7 @@ The system GNU Java Compiler.
 
 
 %package -n libgcj-devel
-License:        GPLv2+ ; LGPLv2.1+
+License:        GPLv2+ <<ex(LIBGCJ runtime library exception)
 Group:          Development/Libraries/Java
 Summary:        The system GNU Java development files.
 Requires:       libgcj%{gcc_version}-devel
@@ -285,7 +254,7 @@ The system GNU Java bytecode interpreter as 64 bit application.
 
 
 %package -n gcc-objc
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/Other
 Summary:        The system GNU Objective C Compiler
 Requires:       gcc%{gcc_version}-objc
@@ -300,7 +269,7 @@ The system GNU Objective C Compiler.
 
 
 %package -n gcc-objc-32bit
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/Other
 Summary:        The system GNU Objective C Compiler
 Requires:       gcc%{gcc_version}-objc-32bit
@@ -312,7 +281,7 @@ The system GNU Objective C Compiler 32 bit support.
 
 
 %package -n gcc-objc-64bit
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/Other
 Summary:        The system GNU Objective C Compiler
 Requires:       gcc%{gcc_version}-objc-64bit
@@ -324,7 +293,7 @@ The system GNU Objective C Compiler 64 bit support.
 
 
 %package -n gcc-obj-c++
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/Other
 Summary:        The system GNU Objective C++ Compiler
 Requires:       gcc%{gcc_version}-obj-c++
@@ -336,7 +305,7 @@ The system GNU Objective C++ Compiler.
 
 
 %package -n gcc-ada
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/C and C++
 Summary:        The system GNU Ada Compiler
 Requires:       gcc%{gcc_version}-ada
@@ -346,14 +315,8 @@ Requires:       gcc = %{version}
 The system GNU Ada Compiler.
 
 
-
-Authors:
---------
-    The GCC team.
-
-
 %package -n gcc-z9
-License:        GPLv2+
+License:        GPLv3+
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C Compiler
 Requires:       gcc
@@ -362,11 +325,6 @@ Requires:       gcc
 The system GNU C Compiler.
 
 
-
-Authors:
---------
-    The GCC team.
-
 %prep 
 
 %build