diff --git a/gnote-3.5.0.tar.xz b/gnote-3.5.0.tar.xz
deleted file mode 100644
index 6efdd55..0000000
--- a/gnote-3.5.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76d5f738a723de6f5bee99882a6c617b6878106262fafe3c2f2da438fa387aa8
-size 2620592
diff --git a/gnote-3.6.0.tar.xz b/gnote-3.6.0.tar.xz
new file mode 100644
index 0000000..7d1f050
--- /dev/null
+++ b/gnote-3.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac61c84a4fe8eeae613af76bb11cb481f2f44c8bc64ef4b7aac90b8e68e94957
+size 2633952
diff --git a/gnote.changes b/gnote.changes
index 8ad34d7..7cd3707 100644
--- a/gnote.changes
+++ b/gnote.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Sep 28 20:35:15 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.6.0:
+  + New Features:
+    - WebDAV synchronization checks now time-out
+    - Port to new documentation infrastructure
+  + Fixes:
+    - Fix error in WebDAV manual
+    - Fix exit in status icon mode on close window
+  + Updated translations.
+- Replace gnome-doc-utils-devel BuildRequires with yelp-tools:
+  follow upstreams port to the new documentation infrastructure.
+
 -------------------------------------------------------------------
 Wed Aug 29 08:05:13 UTC 2012 - dimstar@opensuse.org
 
diff --git a/gnote.spec b/gnote.spec
index cc202af..fc574ea 100644
--- a/gnote.spec
+++ b/gnote.spec
@@ -17,23 +17,23 @@
 
 
 Name:           gnote
-Version:        3.5.0
+Version:        3.6.0
 Release:        0
 Summary:        A Port of Tomboy to C++
 License:        GPL-3.0+
 Group:          Productivity/Text/Editors
 Url:            http://live.gnome.org/Gnote
-Source:         http://download.gnome.org/sources/gnote/3.5/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnote/3.6/%{name}-%{version}.tar.xz
 BuildRequires:  boost-devel >= 1.34
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gtkmm3-devel >= 3.4
 BuildRequires:  intltool
 BuildRequires:  libuuid-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(libsecret-1) >= 0.8
 BuildRequires:  pkgconfig(x11)
 Recommends:     %{name}-lang
@@ -75,14 +75,11 @@ test "%{buildroot}" != "/" && %__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%dir %{_datadir}/gnome/
-%dir %{_datadir}/gnome/help/
-%dir %{_datadir}/gnome/help/%{name}/
-%doc %{_datadir}/gnome/help/%{name}/C/
+%doc %{_datadir}/help/C/%{name}/
 %{_bindir}/gnote
 %{_libdir}/gnote/
 # Splitting does not make sense as it's just a lib for gnote itself (and it's plugins)
-%{_libdir}/libgnote-3.5.so*
+%{_libdir}/libgnote-3.6.so*
 %{_libdir}/libgnote.so
 %{_datadir}/applications/gnote.desktop
 %{_datadir}/dbus-1/services/org.gnome.Gnote.service