diff --git a/cairo.changes b/cairo.changes
index 4698325..ef86ad0 100644
--- a/cairo.changes
+++ b/cairo.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Feb 14 09:59:51 UTC 2012 - vuntz@opensuse.org
+
+- Ship additional COPYING files that come with some utilities.
+- Fix license of the tool subpackage: it is GPL-3.0+ (bnc#739748).
+- Change the group of library subpackages from
+  Development/Libraries/X11 to System/Libraries.
+
 -------------------------------------------------------------------
 Fri Dec  9 11:48:43 UTC 2011 - coolo@suse.com
 
diff --git a/cairo.spec b/cairo.spec
index 66a5a90..15a7ab1 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cairo
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define build_xcb_backend 0
 %define build_gl_backend 0
 
@@ -23,8 +24,8 @@ Version:        1.10.2
 Release:        0
 # FIXME: on update, check that cairo-fix-libs.patch (patch1) is still needed (nobody has the right fix for upstream :/)
 Summary:        Vector Graphics Library with Cross-Device Output Support
-License:        LGPL-2.1+ ; MPL-1.1
-Group:          Development/Libraries/X11
+License:        LGPL-2.1+ or MPL-1.1
+Group:          System/Libraries
 Url:            http://cairographics.org/
 Source:         %{name}-%{version}.tar.bz2
 Source99:       baselibs.conf
@@ -62,6 +63,8 @@ hardware acceleration when available.
 
 %package -n libcairo2
 Summary:        Vector Graphics Library with Cross-Device Output Support
+License:        LGPL-2.1+ or MPL-1.1
+Group:          System/Libraries
 Provides:       cairo = %{version}
 Obsoletes:      cairo < %{version}
 # bug437293
@@ -79,6 +82,8 @@ hardware acceleration when available.
 
 %package -n libcairo-gobject2
 Summary:        Vector Graphics Library with Cross-Device Output Support
+License:        LGPL-2.1+ or MPL-1.1
+Group:          System/Libraries
 
 %description -n libcairo-gobject2
 Cairo is a vector graphics library with cross-device output support.
@@ -92,6 +97,8 @@ meant to support gobject-introspection binding creation.
 
 %package -n libcairo-script-interpreter2
 Summary:        Vector Graphics Library with Cross-Device Output Support
+License:        LGPL-2.1+ or MPL-1.1
+Group:          System/Libraries
 
 %description -n libcairo-script-interpreter2
 Cairo is a vector graphics library with cross-device output support.
@@ -102,6 +109,8 @@ hardware acceleration when available.
 
 %package tools
 Summary:        Vector Graphics Library with Cross-Device Output Support -- Utilities
+License:        GPL-3.0+
+Group:          Development/Libraries/X11
 # We need an explicit requires since nothing links to the cairo library
 Requires:       libcairo2 = %{version}
 # Named changed during  development of 11.4
@@ -119,6 +128,8 @@ This package contains various cairo utilities.
 
 %package devel
 Summary:        Development environment for cairo
+License:        LGPL-2.1+ or MPL-1.1
+Group:          Development/Libraries/X11
 Requires:       libcairo2 = %{version}
 Requires:       libcairo-gobject2 = %{version}
 Requires:       libcairo-script-interpreter2 = %{version}
@@ -191,10 +202,12 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %files -n libcairo-script-interpreter2
 %defattr(-, root, root)
+%doc util/cairo-script/COPYING
 %{_libdir}/libcairo-script-interpreter.so.*
 
 %files tools
 %defattr(-, root, root)
+%doc util/cairo-trace/COPYING util/cairo-trace/COPYING-GPL-3
 %{_bindir}/cairo-sphinx
 %{_bindir}/cairo-trace
 %dir %{_libdir}/cairo