diff --git a/gnome-system-monitor.changes b/gnome-system-monitor.changes
index 3517996..ab3b7ad 100644
--- a/gnome-system-monitor.changes
+++ b/gnome-system-monitor.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Feb 13 12:51:18 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.
+- Remove 2.x references in summaries and descriptions.
+
 -------------------------------------------------------------------
 Tue Dec 14 15:07:28 CET 2010 - vuntz@opensuse.org
 
diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index 87e7ab0..af5090f 100644
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -42,20 +42,13 @@ Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A Simple Process Monitor
 Requires:       gnome-icon-theme
-Requires:       %{name}-lang = %{version}
 Requires:       /usr/bin/lsb_release
+Recommends:     %{name}-lang
 %gconf_schemas_prereq
 
 %description
-GNOME-system-monitor (formerly Procman) is a simple process and system
-monitor for the GNOME 2.x Desktop.
-
-
-
-Authors:
---------
-    Kevin Vandersloot <kfv101@psu.edu>
-    Erik Johnsson <zaphod@linux.nu>
+GNOME-system-monitor is a simple process and system monitor for the
+GNOME Desktop.
 
 %lang_package
 %prep
@@ -75,9 +68,8 @@ Authors:
 ln -s ../icons/gnome/32x32/apps/utilities-system-monitor.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 echo DocPath=gnome-system-monitor >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monitor.desktop
 %suse_update_desktop_file -N "GNOME System Monitor" gnome-system-monitor System Monitor
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
-cat %{name}.schemas_list >%{name}.lst
 %fdupes $RPM_BUILD_ROOT
 
 %clean
@@ -85,21 +77,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre -f %{name}.schemas_pre
 
+%post
+%desktop_database_post
+
 %posttrans -f %{name}.schemas_posttrans
 
 %preun -f %{name}.schemas_preun
 
-%files -f %{name}.lst
+%postun
+%desktop_database_postun
+
+%files -f %{name}.schemas_list
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
+%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}/gnome-system-monitor
 %{_datadir}/applications/gnome-system-monitor.desktop
 %{_datadir}/pixmaps/*.png
 %{_datadir}/pixmaps/gnome-system-monitor/
 
 %files lang -f %{name}.lang
-%defattr(-, root, root)
-%dir %{_datadir}/gnome
-%dir %{_datadir}/gnome/help
 
 %changelog