diff --git a/gnome-terminal-3.4.1.1.tar.xz b/gnome-terminal-3.4.1.1.tar.xz
deleted file mode 100644
index 77f9b29..0000000
--- a/gnome-terminal-3.4.1.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14d4a252fcbadf0a5fff89f1ff65f0a84d02f5e51c42f8fc14cee73eabc43fdd
-size 2015448
diff --git a/gnome-terminal-3.6.0.tar.xz b/gnome-terminal-3.6.0.tar.xz
new file mode 100644
index 0000000..17adcb1
--- /dev/null
+++ b/gnome-terminal-3.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ee068ca7f4d0e410aabbddee3937559138163d84c00e5bef1e9050beb7409cd
+size 1860524
diff --git a/gnome-terminal.changes b/gnome-terminal.changes
index b8c788b..4255f2a 100644
--- a/gnome-terminal.changes
+++ b/gnome-terminal.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Sep 25 09:27:18 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.6.0:
+  + Updated documentation
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sun Aug 19 22:42:43 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.90:
+  + Port to new documentation infrastructure
+  + screen: Recognise man: and info: URIs
+  + Bugs fixed: bgo#676452
+  + Updated translations.
+- Add yelp-tools BuildRequires, following upstreams port to the new
+  documentation infrastructure (note: gnome-doc-utils-devel should
+  no longer be needed, but configure still checks for it).
+
 -------------------------------------------------------------------
 Tue Apr 17 06:30:35 UTC 2012 - vuntz@opensuse.org
 
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index aa79d89..92615a3 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -17,13 +17,14 @@
 
 
 Name:           gnome-terminal
-Version:        3.4.1.1
+Version:        3.6.0
 Release:        0
+# FIXME: bgo#683486 - Check if gnome-doc-utils-devel BuildRequires can be dropped. There is a mismatch upstream.
 Summary:        GNOME Terminal
 License:        GPL-3.0+ ; LGPL-2.1+
 Group:          System/X11/Terminals
 Url:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/gnome-terminal/3.4/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-terminal/3.6/%{name}-%{version}.tar.xz
 BuildRequires:  fdupes
 BuildRequires:  gnome-doc-utils-devel
 # for gtk-builder-convert
@@ -31,6 +32,7 @@ BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
+BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gsettings-desktop-schemas)
@@ -64,10 +66,6 @@ translation-update-upstream
 %if 0%{?suse_version} <= 1120
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
-# Some doc translations are not ported to gnome-doc-utils, so we still have to
-# do this. When this won't be needed anymore, we'll be able to remove
-# scrollkeeper from BuildRequires.
-rm -r $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 %suse_update_desktop_file -N "GNOME Terminal" -G "Terminal" %name TerminalEmulator
 %find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
@@ -91,13 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
+%doc %{_datadir}/help/C/%{name}/
 %{_bindir}/gnome-terminal
 %{_datadir}/applications/gnome-terminal.desktop
 %{_datadir}/gnome-terminal/