diff --git a/gobject-introspection.changes b/gobject-introspection.changes
index b6c8f15..eabecb4 100644
--- a/gobject-introspection.changes
+++ b/gobject-introspection.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Wed Jun  6 15:17:10 UTC 2012 - dimstar@opensuse.org
+
+- Update License tags (bnc#765472):
+  + The main/src package is LGPL-2.1+ and GPL-2.0+
+  + The library subpackages are LGPL-2.1+
+
+-------------------------------------------------------------------
+Tue May 22 19:21:57 UTC 2012 - dimstar@opensuse.org
+
+- Create new subpackage girepository-1_0, which contains the
+  *.typelib files. This allows to bump the soname of
+  libgirepository and being able to parallel install several
+  libgirepository without a file conflict on the typelib files.
+  This fixes bnc#684826.
+- Add a girepository-1_0 Requires to libgirepository-1_0-1, for the
+  above. The Requires is versioned with a >=, which is what allows
+  the parallel-installability.
+- Drop xz BuildRequires, as it now comes for free in the build
+  system.
+- Change rpm group of libgirepository-1_0-1 from
+  Development/Libraries/GNOME to System/Libraries.
+
 -------------------------------------------------------------------
 Wed Apr 18 07:33:27 UTC 2012 - vuntz@opensuse.org
 
diff --git a/gobject-introspection.spec b/gobject-introspection.spec
index b3f7e03..c4d5ffe 100644
--- a/gobject-introspection.spec
+++ b/gobject-introspection.spec
@@ -21,7 +21,7 @@ Version:        1.32.1
 Release:        0
 # FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel
 Summary:        GObject Introspection Tools
-License:        LGPL-2.1+
+License:        LGPL-2.1+ and GPL-2.0+
 Group:          Development/Libraries/GNOME
 Url:            http://live.gnome.org/GObjectIntrospection
 Source0:        http://download.gnome.org/sources/gobject-introspection/1.32/%{name}-%{version}.tar.xz
@@ -40,8 +40,6 @@ BuildRequires:  libffi-devel
 BuildRequires:  libtool
 BuildRequires:  python-devel
 BuildRequires:  python-xml
-# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
-BuildRequires:  xz
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(gobject-2.0)
 %if 0%{?BUILD_FROM_VCS}
@@ -58,17 +56,30 @@ a uniform, machine readable format.
 
 %package -n libgirepository-1_0-1
 Summary:        GObject Introspection Library
-Group:          Development/Libraries/GNOME
-# Provide typelib() symbols based on gobject-introspection-typelib.template
-# The template is checked during install if it matches the installed *.typelib files.
-%(cat %{S:3} | awk '{ print "Provides: " $0}')
+License:        LGPL-2.1+
+Group:          System/Libraries
+Requires:       girepository-1_0 >= %{version}
 
 %description -n libgirepository-1_0-1
 The goal of the project is to describe the APIs and collect them in
 a uniform, machine readable format.
 
+%package -n girepository-1_0
+Summary:        Base GObject Introspection Bindings
+License:        LGPL-2.1+
+Group:          System/Libraries
+Requires:       libgirepository-1_0-1 >= %{version}
+# Provide typelib() symbols based on gobject-introspection-typelib.template
+# The template is checked during install if it matches the installed *.typelib files.
+%(cat %{S:3} | awk '{ print "Provides: " $0}')
+
+%description -n girepository-1_0
+The goal of the project is to describe the APIs and collect them in
+a uniform, machine readable format.
+
 %package devel
 Summary:        GObject Introspection Development Files
+License:        LGPL-2.1+
 Group:          Development/Libraries/GNOME
 # Note: the devel package requires the binaries, not just the library
 Requires:       %{name} = %{version}
@@ -151,7 +162,11 @@ rm -rf %{buildroot}
 # not have to own it
 %dir %{_datadir}/gir-1.0
 %{_libdir}/libgirepository-1.0.so.*
-%{_libdir}/girepository-1.0/
+%dir %{_libdir}/girepository-1.0
+
+%files -n girepository-1_0
+%defattr(-,root,root)
+%{_libdir}/girepository-1.0/*.typelib
 
 %files devel
 %defattr(-,root,root)