diff --git a/gucharmap-3.2.1.tar.bz2 b/gucharmap-3.2.1.tar.bz2
deleted file mode 100644
index 7a369c2..0000000
--- a/gucharmap-3.2.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d4d0dd7d79d318f110b3f75d97c0a7fbcd69f98df683f05cecf37072b794bbf
-size 3298299
diff --git a/gucharmap-3.3.0.tar.xz b/gucharmap-3.3.0.tar.xz
new file mode 100644
index 0000000..8a21756
--- /dev/null
+++ b/gucharmap-3.3.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c97b5a49175006e6b9fa0cf43b2a4c7bbb77c005c78887f4c201b532351889b
+size 2750884
diff --git a/gucharmap.changes b/gucharmap.changes
index 344c7ab..f9e8ad0 100644
--- a/gucharmap.changes
+++ b/gucharmap.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue Dec 20 11:21:59 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.3.0:
+  + Update to Unicode 6.1.0 (beta).
+  + Use new workarea API.
+  + Don't allow the charmap side pane to shrink too much.
+  + Use attributes for deprecation.
+  + Build fixes.
+  + Updated translations.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+
+-------------------------------------------------------------------
+Thu Dec  8 22:36:37 UTC 2011 - dimstar@opensuse.org
+
+- Split typelib file into typelib-1_0-Gucharmap-2_90 subpackage.
+- Add typelib-1_0-Gucharmap-2_90 Requires to devel subpackage.
+
+-------------------------------------------------------------------
+Tue Nov 15 10:29:31 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.2.2:
+  + Updated translations.
+
 -------------------------------------------------------------------
 Mon Oct 17 18:22:57 CEST 2011 - dimstar@opensuse.org
 
diff --git a/gucharmap.spec b/gucharmap.spec
index 512bcc3..1d39749 100644
--- a/gucharmap.spec
+++ b/gucharmap.spec
@@ -15,8 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 %define api_version 2.90
 %define so_api _2_90
 %define so_gucharmap 7
@@ -24,21 +22,23 @@
 
 Name:           gucharmap
 BuildRequires:  fdupes
-BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gtk-doc
-BuildRequires:  intltool
 BuildRequires:  gconf2-devel
+BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gobject-introspection-devel
+BuildRequires:  gtk-doc
 BuildRequires:  gtk3-devel
+BuildRequires:  intltool
 BuildRequires:  scrollkeeper
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-License:        GPLv3+ ; LGPLv2.1+
-Group:          System/GUI/GNOME
-Version:        3.2.1
-Release:        1
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
+Version:        3.3.0
+Release:        0
 Summary:        A Featureful Unicode Character Map
-Source:         http://download.gnome.org/sources/gucharmap/3.2/%{name}-%{version}.tar.bz2
+License:        GPL-3.0+ ; LGPL-2.1+
+Group:          System/GUI/GNOME
+Source:         http://download.gnome.org/sources/gucharmap/3.3/%{name}-%{version}.tar.xz
 Url:            http://gucharmap.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Recommends:     %{name}-lang
@@ -49,7 +49,6 @@ Gucharmap is a featureful unicode character map.
 
 %package -n libgucharmap%{so_api}-%{so_gucharmap}
 
-License:        GPLv3+ ; LGPLv2.1+
 Summary:        A Featureful Unicode Character Map -- Library
 Group:          System/GUI/GNOME
 
@@ -58,11 +57,21 @@ Gucharmap is a featureful unicode character map.
 
 This package contains a library to use the character map.
 
+%package -n typelib-1_0-Gucharmap-2_90
+Summary:        A Featureful Unicode Character Map -- Introspection bindings
+Group:          System/Libraries
+
+%description -n typelib-1_0-Gucharmap-2_90
+Gucharmap is a featureful unicode character map.
+
+This package provides the GObject Introspection bindings for the
+gucharmap library.
+
 %package devel
-License:        GPLv3+ ; LGPLv2.1+
 Summary:        A Featureful Unicode Character Map -- Development Files
 Group:          Development/Libraries/GNOME
 Requires:       libgucharmap%{so_api}-%{so_gucharmap} = %{version}
+Requires:       typelib-1_0-Gucharmap-2_90 = %{version}
 
 %description devel
 This package contains all necessary include files and libraries needed
@@ -131,7 +140,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libgucharmap%{so_api}-%{so_gucharmap}
 %defattr(-,root,root)
 %{_libdir}/libgucharmap%{so_api}.so.%{so_gucharmap}*
-%{_libdir}/girepository-1.0/Gucharmap-%{pc_api}.typelib
+
+%files -n typelib-1_0-Gucharmap-2_90
+%defattr(-,root,root)
+%{_libdir}/girepository-1.0/Gucharmap-2.90.typelib
 
 %files lang -f %{name}.lang