diff --git a/gedit-3.6.0.tar.xz b/gedit-3.6.0.tar.xz
deleted file mode 100644
index 5f65b60..0000000
--- a/gedit-3.6.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2043aaa61708222f476dd1c83e43bd17c67a341b30a4baa6466a60bbfb6d9471
-size 2953208
diff --git a/gedit-3.6.1.tar.xz b/gedit-3.6.1.tar.xz
new file mode 100644
index 0000000..18a84b3
--- /dev/null
+++ b/gedit-3.6.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75fb18e32a7571900dda8cbd3a71212bded1ef714d3aa9f9513296eea02779a4
+size 3000568
diff --git a/gedit.changes b/gedit.changes
index 06b00d4..d273cf0 100644
--- a/gedit.changes
+++ b/gedit.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Oct 16 07:10:56 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.6.1:
+  + File Browser side panel improvements.
+  + Fix print preview in landscape mode.
+  + Misc bugfixes.
+  + Updated translations.
+- Fixup .desktop file: add trailing semicolon to keywords.
+
 -------------------------------------------------------------------
 Mon Sep 24 20:57:54 UTC 2012 - dimstar@opensuse.org
 
diff --git a/gedit.spec b/gedit.spec
index f108176..2569b69 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gedit
-Version:        3.6.0
+Version:        3.6.1
 Release:        0
 Summary:        Small and lightweight UTF-8 text editor
 License:        GPL-2.0+
@@ -87,6 +87,10 @@ environment.
 %setup -q
 translation-update-upstream
 %patch0 -p0
+# Fix the _keywords line: it must end with a trailing semicolon.
+# Build fails when upstream fixes this (bgo#686250).
+test ! $(grep  "_Keywords=.*;" data/gedit.desktop.in.in)
+sed -i "s:_Keywords=Text:_Keywords=Text;:" data/gedit.desktop.in.in
 
 %build
 %configure \
@@ -97,7 +101,7 @@ make %{?_smp_mflags} V=1
 %install
 %make_install
 find %{buildroot} -type f -name '*.la' -delete -print
-%suse_update_desktop_file -N gedit -G "Text Editor" gedit TextEditor
+%suse_update_desktop_file gedit
 %find_lang %{name} %{?no_lang_C}
 %fdupes %{buildroot}
 
@@ -123,6 +127,8 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.gnome.gedit.service
 %{_datadir}/GConf/gsettings/gedit.convert
+# %{_datadir}/gedit/gir-1.0/ lives in -devel
+%exclude %{_datadir}/gedit/gir-1.0/
 %{_datadir}/gedit/
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
@@ -176,6 +182,7 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-, root, root)
 %doc %{_datadir}/gtk-doc/html/gedit/
+%{_datadir}/gedit/gir-1.0/
 %{_includedir}/*
 %{_libdir}/pkgconfig/*.pc