diff --git a/gucharmap.changes b/gucharmap.changes
index 99d1584..e0ae500 100644
--- a/gucharmap.changes
+++ b/gucharmap.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug  8 00:17:50 CEST 2007 - maw@suse.de
+
+- Use %fdupes
+- Split off a -lang subpackage
+- s#%run_ldconfig#/sbin/ldconfig/ in %post and %postun.
+
 -------------------------------------------------------------------
 Mon May 14 11:28:32 CEST 2007 - pgajdos@suse.cz
 
diff --git a/gucharmap.spec b/gucharmap.spec
index c286cf5..3fd0e8e 100644
--- a/gucharmap.spec
+++ b/gucharmap.spec
@@ -11,11 +11,11 @@
 # norootforbuild
 
 Name:           gucharmap
-BuildRequires:  docbook_4 gnome-doc-utils-devel intltool libgnomeui-devel scrollkeeper update-desktop-files
-License:        GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+BuildRequires:  docbook_4 fdupes gnome-doc-utils-devel intltool libgnomeui-devel scrollkeeper update-desktop-files
+License:        GPL v2 or later, LGPL v2 or later
 Group:          System/GUI/GNOME
 Version:        1.10.0
-Release:        17
+Release:        48
 Summary:        A Feature-Rich Unicode Character Map
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/gucharmap/1.8/%{name}-%{version}.tar.bz2
 Patch:          %name-desktop.patch
@@ -23,6 +23,7 @@ Patch1:         gucharmap-no-root.patch
 URL:            http://gucharmap.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         filesystem
+Requires:       %{name}-lang = %{version}
 
 %description
 Gucharmap is a feature-rich Unicode character map and font viewer.
@@ -48,6 +49,7 @@ Authors:
 --------
     Noah Levitt
 
+%lang_package
 %prep
 %setup -q
 %patch
@@ -64,20 +66,22 @@ make %{?jobs:-j%jobs}
 %install
 %makeinstall
 %find_lang %{name}
+
+%fdupes $RPM_BUILD_ROOT
 %suse_update_desktop_file %{name}
 
 %post
 touch var/adm/SuSEconfig/run-gtk
-%run_ldconfig
+/sbin/ldconfig
 
 %postun
 touch var/adm/SuSEconfig/run-gtk
-%run_ldconfig
+/sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %files -f %{name}.lang
+%files
 %defattr(-,root,root)
 %doc COPYING COPYING.LIB ChangeLog README TODO
 %{_bindir}/*
@@ -86,6 +90,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*.desktop
 %{_datadir}/omf/gucharmap
 
+%files lang -f %{name}.lang
+
 %files devel
 %defattr (-, root, root)
 %{_includedir}/*
@@ -94,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Aug 08 2007 - maw@suse.de
+- Use %%fdupes
+- Split off a -lang subpackage
+- s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun.
 * Mon May 14 2007 - pgajdos@suse.cz
 - removed gnome-icon-theme from Requires and BuildRequires
   [#247450]