diff --git a/gnote.changes b/gnote.changes
index 462d350..9319d17 100644
--- a/gnote.changes
+++ b/gnote.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Feb 12 18:46:05 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.
+- Add missing Recommends for lang subpackage.
+
 -------------------------------------------------------------------
 Sun Dec 12 16:31:30 UTC 2010 - bitshuffler@opensuse.org
 
diff --git a/gnote.spec b/gnote.spec
index adbfd35..e9e3b46 100644
--- a/gnote.spec
+++ b/gnote.spec
@@ -22,10 +22,10 @@ Name:           gnote
 Version:        0.7.3
 Release:        1
 License:        GNU GPL v3 or later
+Summary:        A Port of Tomboy to C++
 Group:          Productivity/Text/Editors
 Url:            http://live.gnome.org/Gnote
 Source:         %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  boost-devel >= 1.34
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -40,15 +40,14 @@ BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  pcre-devel
 BuildRequires:  update-desktop-files
+Recommends:     %{name}-lang
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
-Summary:        A Port of Tomboy to C++
 
 %description
-It is the same note taking application, including most of the add-ins (more are 
+It is the same note taking application, including most of the add-ins (more are
 to come). Synchronization support is being worked on.
 
-
-
 %lang_package
 %prep
 %setup -q
@@ -61,7 +60,10 @@ V=1 %__make %{?_smp_mflags}
 %__make install DESTDIR=%{buildroot}
 %suse_update_desktop_file gnote     Utility  DesktopUtility
 %find_gconf_schemas
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
+
+%clean
+test "%{buildroot}" != "/" && %__rm -rf %{buildroot}
 
 %pre -f %{name}.schemas_pre
 
@@ -69,17 +71,33 @@ V=1 %__make %{?_smp_mflags}
 
 %posttrans -f %{name}.schemas_posttrans
 
-%clean
-test "%{buildroot}" != "/" && %__rm -rf %{buildroot}
+%if 0%{?suse_version} > 1130
+%post
+%desktop_database_post
+%icon_theme_cache_post
+%endif
+
+%if 0%{?suse_version} > 1130
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
+%endif
 
 %files -f %{name}.schemas_list
 %defattr(-,root,root)
+%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}/gnote
 %{_prefix}/lib/gnote-applet
 %{_libdir}/bonobo/servers/GNOME_GnoteApplet.server
-%{_libdir}/gnote
+%{_libdir}/gnote/
 %{_datadir}/applications/gnote.desktop
-%{_datadir}/gnote
+%{_datadir}/gnote/
 %{_datadir}/icons/hicolor/*/apps/gnote.*
 %{_mandir}/man1/gnote.1*