diff --git a/gucharmap-1.10.1.tar.bz2 b/gucharmap-1.10.1.tar.bz2
deleted file mode 100644
index 311912b..0000000
--- a/gucharmap-1.10.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0069a72299a68048c06466b68fec2abc3974bcf0b5331bfc56f02f64dca40dc8
-size 2561279
diff --git a/gucharmap-2.21.4.tar.bz2 b/gucharmap-2.21.4.tar.bz2
new file mode 100644
index 0000000..759c8fb
--- /dev/null
+++ b/gucharmap-2.21.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d2c3fa0e7cc8d12d863fe18b931cc7dfa3e8de9b3ca3c7efa205268ad403183
+size 2552104
diff --git a/gucharmap-glib-breakage.patch b/gucharmap-glib-breakage.patch
new file mode 100644
index 0000000..6d39081
--- /dev/null
+++ b/gucharmap-glib-breakage.patch
@@ -0,0 +1,26 @@
+=== modified file 'gucharmap/gucharmap-chartable-accessible.c'
+--- gucharmap/gucharmap-chartable-accessible.c	2007-12-20 21:37:47 +0000
++++ gucharmap/gucharmap-chartable-accessible.c	2007-12-20 22:19:14 +0000
+@@ -677,7 +677,7 @@
+ GType
+ gucharmap_chartable_accessible_get_type (void)
+ {
+-  static volatile gsize type__volatile = 0;
++  static volatile gpointer type__volatile = NULL;
+ 
+   if (g_once_init_enter (&type__volatile))
+     {
+@@ -730,10 +730,10 @@
+       g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
+                                    &atk_component_info);
+ 
+-      g_once_init_leave (&type__volatile, type);
++      g_once_init_leave (&type__volatile, (gpointer) type);
+     }
+ 
+-  return type__volatile;
++  return *(GType *) type__volatile;
+ }
+ #endif
+ 
+
diff --git a/gucharmap.changes b/gucharmap.changes
index 879017a..2bb3541 100644
--- a/gucharmap.changes
+++ b/gucharmap.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Dec 20 23:38:42 CET 2007 - maw@suse.de
+
+- Add gucharmap-glib-breakage.patch (#350152).
+
+-------------------------------------------------------------------
+Thu Dec 20 10:39:37 CST 2007 - maw@suse.de
+
+- Update to version 2.21.4:
+  + The large version bump is gucharmap synchronizing its version
+    number with that of GNOME
+  + Bugs (bugzilla.gnome.org) fixed: #501915, #331103, #501710,
+    #469131
+  + Install gconf schemas
+- Remove bogus dependencies
+- Remove bogus stuff in %post and %postun.
+
 -------------------------------------------------------------------
 Wed Sep 19 02:03:19 CEST 2007 - mauro@suse.de
 
diff --git a/gucharmap.spec b/gucharmap.spec
index 81ba25e..236ba96 100644
--- a/gucharmap.spec
+++ b/gucharmap.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gucharmap (Version 1.10.1)
+# spec file for package gucharmap (Version 2.21.4)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,19 +11,21 @@
 # norootforbuild
 
 Name:           gucharmap
-BuildRequires:  docbook_4 fdupes gnome-doc-utils-devel intltool libgnomeui-devel scrollkeeper update-desktop-files
-License:        GPL v2 or later, LGPL v2 or later
+BuildRequires:  docbook_4 fdupes gnome-common gnome-doc-utils-devel intltool libgnomeui-devel scrollkeeper update-desktop-files
+License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/GUI/GNOME
-Version:        1.10.1
+Version:        2.21.4
 Release:        1
 Summary:        A Feature-Rich Unicode Character Map
-Source:         ftp://ftp.gnome.org/pub/gnome/sources/gucharmap/1.8/%{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.bz2
 Patch:          %name-desktop.patch
 Patch1:         gucharmap-no-root.patch
+# See https://bugzilla.novell.com/show_bug.cgi?id=350152
+Patch2:         gucharmap-glib-breakage.patch
 Url:            http://gucharmap.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-PreReq:         filesystem
 Requires:       %{name}-lang = %{version}
+%gconf_schemas_prereq
 
 %description
 Gucharmap is a feature-rich Unicode character map and font viewer.
@@ -37,7 +39,7 @@ Authors:
 %package devel
 Summary:        Include Files and Libraries mandatory for Development.
 Group:          System/GUI/GNOME
-Requires:       %{name} = %{version} glib2-devel gtk2-devel libgnome-devel libgnomeui-devel
+Requires:       %{name} = %{version} gconf2-devel glib2-devel gtk2-devel libgnome-devel libgnomeui-devel
 
 %description devel
 This package contains all necessary include files and libraries needed
@@ -54,6 +56,7 @@ Authors:
 %setup -q
 %patch
 %patch1
+%patch2
 
 %build
 autoreconf -f -i
@@ -66,21 +69,23 @@ make %{?jobs:-j%jobs}
 %install
 %makeinstall
 %find_lang %{name}
+%find_gconf_schemas
 %fdupes $RPM_BUILD_ROOT
 %suse_update_desktop_file %{name}
 
-%post
-touch var/adm/SuSEconfig/run-gtk
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-touch var/adm/SuSEconfig/run-gtk
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%pre -f %{name}.schemas_pre
+
+%preun -f %{name}.schemas_preun
+%posttrans -f %{name}.schemas_posttrans
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.schemas_list
 %defattr(-,root,root)
 %doc COPYING COPYING.LIB ChangeLog README TODO
 %{_bindir}/*
@@ -99,6 +104,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Dec 20 2007 - maw@suse.de
+- Add gucharmap-glib-breakage.patch (#350152).
+* Thu Dec 20 2007 - maw@suse.de
+- Update to version 2.21.4:
+  + The large version bump is gucharmap synchronizing its version
+  number with that of GNOME
+  + Bugs (bugzilla.gnome.org) fixed: #501915, #331103, #501710,
+  [#469131]
+  + Install gconf schemas
+- Remove bogus dependencies
+- Remove bogus stuff in %%post and %%postun.
 * Wed Sep 19 2007 - mauro@suse.de
 - Update to version 1.10.1
 - Bugfixes for bgo: #311912, #357471, #396265, #434276, #433134