diff --git a/gnome-user-share.changes b/gnome-user-share.changes
index 60f2da3..754dae6 100644
--- a/gnome-user-share.changes
+++ b/gnome-user-share.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Feb 13 16:19:42 CET 2011 - vuntz@opensuse.org
+
+- Call relevant macros in %post/%postun:
+  + %desktop_database_post/postun because the package ships at
+    least one desktop file.
+  + %icon_theme_cache_post/postun because the package ships themed
+    icons.
+- 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.
+
 -------------------------------------------------------------------
 Tue Dec 14 15:06:15 CET 2010 - vuntz@opensuse.org
 
diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index 72d3fa2..9905a34 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -40,7 +40,7 @@ BuildRequires:  libunique-devel
 BuildRequires:  nautilus-devel
 BuildRequires:  update-desktop-files
 Requires:       obex-data-server
-Requires:       %{name}-lang = %{version}
+Recommends:     %{name}-lang
 Suggests:       apache2-prefork
 Suggests:       apache2-worker
 Suggests:       apache2-mod_dnssd
@@ -83,9 +83,8 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
 grep -q X-GNOME-NetworkSettings %{buildroot}%{_datadir}/applications/gnome-user-share-properties.desktop
 %suse_update_desktop_file -r gnome-user-share-properties GNOME Settings X-GNOME-PersonalSettings X-SuSE-ControlCenter-Personal
 %suse_update_desktop_file gnome-user-share
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
-cat %{name}.schemas_list >%{name}.lst
 %fdupes $RPM_BUILD_ROOT
 
 %clean
@@ -93,13 +92,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre -f %{name}.schemas_pre
 
+%post
+%desktop_database_post
+%icon_theme_cache_post
+
 %posttrans -f %{name}.schemas_posttrans
 
 %preun -f %{name}.schemas_preun
 
-%files -f %{name}.lst
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
+
+%files -f %{name}.schemas_list
 %defattr(-,root,root,-)
 %doc README COPYING NEWS
+%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}/*
 %{_libexecdir}/gnome-user-share
 %{_datadir}/applications/*
@@ -109,8 +123,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %files lang -f %{name}.lang
-%defattr(-, root, root)
-%dir %{_datadir}/gnome
-%dir %{_datadir}/gnome/help
 
 %changelog