diff --git a/gucharmap.changes b/gucharmap.changes
index 81fa393..af51d1b 100644
--- a/gucharmap.changes
+++ b/gucharmap.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Feb 13 16:23:07 CET 2011 - vuntz@opensuse.org
+
+- Call relevant macros in %post/%postun:
+  + %desktop_database_post/postun because the package ships at
+    least one desktop file.
+- Pass %{?no_lang_C} to %find_lang so that english documentation
+  can be packaged with the program, and not in the lang subpackage.
+- Change Requires of lang subpackage to Recommends, since the
+  english documentation is not there anymore.
+
 -------------------------------------------------------------------
 Thu Dec 23 19:05:01 CET 2010 - vuntz@opensuse.org
 
diff --git a/gucharmap.spec b/gucharmap.spec
index d0e956c..3e72800 100644
--- a/gucharmap.spec
+++ b/gucharmap.spec
@@ -36,7 +36,7 @@ Summary:        A Featureful Unicode Character Map
 Source:         %{name}-%{version}.tar.bz2
 Url:            http://gucharmap.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       %{name}-lang = %{version}
+Recommends:     %{name}-lang
 %gconf_schemas_prereq
 
 %description
@@ -89,7 +89,7 @@ make %{?jobs:-j%jobs}
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
 %fdupes $RPM_BUILD_ROOT
 # We need X-SuSE-Editor to avoid an error for the categories check. We don't
@@ -102,8 +102,14 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 
 %pre -f %{name}.schemas_pre
 
+%post
+%desktop_database_post
+
 %preun -f %{name}.schemas_preun
 
+%postun
+%desktop_database_postun
+
 %posttrans -f %{name}.schemas_posttrans
 
 %clean
@@ -112,6 +118,13 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.schemas_list
 %defattr(-,root,root)
 %doc COPYING ChangeLog NEWS README TODO
+%dir %{_datadir}/gnome/
+%dir %{_datadir}/gnome/help/
+%dir %{_datadir}/gnome/help/%{name}/
+%doc %{_datadir}/gnome/help/%{name}/C/
+%dir %{_datadir}/omf/
+%dir %{_datadir}/omf/%{name}/
+%doc %{_datadir}/omf/%{name}/%{name}-C.omf
 %{_bindir}/charmap
 %{_bindir}/gnome-character-map
 %{_bindir}/gucharmap