diff --git a/gnome-system-monitor-3.4.1.tar.xz b/gnome-system-monitor-3.4.1.tar.xz
deleted file mode 100644
index a5ef263..0000000
--- a/gnome-system-monitor-3.4.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60f53f1b37c717b2f12502bf6f3b4b43c8e8f3d2fb1198ba66bf933ec4c3130b
-size 2548064
diff --git a/gnome-system-monitor-3.6.0.tar.xz b/gnome-system-monitor-3.6.0.tar.xz
new file mode 100644
index 0000000..397ce2f
--- /dev/null
+++ b/gnome-system-monitor-3.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e427d6c7dbe3cfb87afe3feb93882485f79ce71556e5b855152055d8a6080ab
+size 2658456
diff --git a/gnome-system-monitor.changes b/gnome-system-monitor.changes
index d58401a..c711b1a 100644
--- a/gnome-system-monitor.changes
+++ b/gnome-system-monitor.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Mon Sep 24 19:57:23 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.6.0:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Sep 17 23:33:35 UTC 2012 - zaitor@opensuse.org
+
+- Update to version 3.5.92:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Aug 21 08:07:29 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.90.1:
+  + Port to new documentation infrastructure
+  + Updated translations.
+- Replace gnome-doc-utils-devel BuildRequires with yelp-tools,
+  following upstreams change to the new documentation
+  infrastructure.
+
+-------------------------------------------------------------------
+Tue Aug  7 09:15:29 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.90:
+  + Bugs fixed: bgo#663736, bgo#671036, bgo#681271
+  + Updated translations.
+
 -------------------------------------------------------------------
 Tue Apr 17 06:19:04 UTC 2012 - vuntz@opensuse.org
 
diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index cc0547a..52a4f17 100644
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -17,17 +17,16 @@
 
 
 Name:           gnome-system-monitor
-Version:        3.4.1
+Version:        3.6.0
 Release:        0
 Url:            http://www.gnome.org
 Summary:        A Simple Process Monitor
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
-Source0:        http://download.gnome.org/sources/gnome-system-monitor/3.4/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/gnome-system-monitor/3.6/%{name}-%{version}.tar.xz
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gnome-icon-theme-devel
 BuildRequires:  intltool
 BuildRequires:  libgtop-devel
@@ -35,6 +34,7 @@ BuildRequires:  librsvg-devel >= 2.35
 BuildRequires:  libxml2-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
+BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gtkmm-3.0)
 %if 0%{?suse_version} >= 1220
@@ -88,13 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %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
+%doc %{_datadir}/help/C/%{name}/
 %{_bindir}/gnome-system-monitor
 %{_datadir}/applications/gnome-system-monitor.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.enums.xml