diff --git a/gvfs-1.16.1.tar.xz b/gvfs-1.16.1.tar.xz
deleted file mode 100644
index 21ddd98..0000000
--- a/gvfs-1.16.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7ec47547ff8029a2e8d81533bdfa870fe4a547c9d7c4e1e946d42d38970b0ac
-size 1493260
diff --git a/gvfs-1.17.0.tar.xz b/gvfs-1.17.0.tar.xz
new file mode 100644
index 0000000..435ff43
--- /dev/null
+++ b/gvfs-1.17.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:078c59f95e8ad2ff2ef13a25d2c2a7097ec2709a9e81e80cb280bd4daceb30b3
+size 1503260
diff --git a/gvfs-mtp-build.patch b/gvfs-mtp-build.patch
new file mode 100644
index 0000000..645d894
--- /dev/null
+++ b/gvfs-mtp-build.patch
@@ -0,0 +1,34 @@
+From 238a92496f5ab165b52f90d414379525cb262ee1 Mon Sep 17 00:00:00 2001
+From: Philip Langdale <philipl@overt.org>
+Date: Wed, 01 May 2013 22:33:02 +0000
+Subject: MTP: Fix compilation warning.
+
+The add_cache_entry helper's signature said it returned the CacheEntry
+but it doesn't.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=699424
+---
+diff --git a/daemon/gvfsbackendmtp.c b/daemon/gvfsbackendmtp.c
+index 48f6b8b..cbdbb02 100644
+--- a/daemon/gvfsbackendmtp.c
++++ b/daemon/gvfsbackendmtp.c
+@@ -144,7 +144,7 @@ emit_delete_event (gpointer key,
+  * Cache Helpers
+  ************************************************/
+ 
+-static CacheEntry *
++static void
+ add_cache_entry (GVfsBackendMtp *backend,
+                  char *path,
+                  uint32_t storage,
+@@ -291,7 +291,6 @@ remove_cache_entry (GVfsBackendMtp *backend,
+                     const char *path)
+ {
+   DEBUG ("(III) remove_cache_entry: %s", path);
+-  //g_hash_table_remove (backend->file_cache, path);
+   g_hash_table_foreach_remove (backend->file_cache,
+                                remove_cache_entry_by_prefix,
+                                (gpointer) path);
+--
+cgit v0.9.1
+
diff --git a/gvfs.changes b/gvfs.changes
index 873b91f..6313afb 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed May  1 08:17:16 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 1.17.0:
+  + daemon:
+    - Tweak read sizes.
+    - Close channels belonging to the active mount only.
+    - Add infrastructure for the backends to exit cleanly.
+  + channel:
+    - Unqueue cancelled requests.
+    - Verify that replies are for the right serial.
+  + mtp:
+    - Refactor read path in preparation for supporting normal
+      files.
+    - Use Android extensions to support in place read and write of
+      files.
+    - Use normal filenames in paths.
+    - When removing cache entries, remove children too.
+    - Clear previous cache entries when refreshing a directory.
+    - Clear cache and emit delete events when an object is removed.
+    - Handle overwriting of files in do_push and do_pull correctly.
+    - Use standard name for SD Card icon.
+  + GVfsIcon: support icon serialisation.
+  + Man pages typo fixes.
+  + Updated translations.
+- Add gvfs-mtp-build.patch: fix signature of add_cache_entry().
+
 -------------------------------------------------------------------
 Tue Apr 16 14:08:43 UTC 2013 - dimstar@opensuse.org
 
diff --git a/gvfs.spec b/gvfs.spec
index 1e164c2..656fea5 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -20,18 +20,20 @@
 %define with_cdda 1
 
 Name:           gvfs
-Version:        1.16.1
+Version:        1.17.0
 Release:        0
 Summary:        VFS functionality for GLib
 License:        LGPL-2.0+
 Group:          Development/Libraries/C and C++
 Url:            http://www.gnome.org
-Source0:        http://download.gnome.org/sources/gvfs/1.16/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/gvfs/1.17/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 # PATCH-FEATURE-OPENSUSE gvfs-nvvfs.patch ksamrat@novell.com -- Provides gvfs backend for novell nautilus plugin
 Patch5:         gvfs-nvvfs.patch
 # PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus
 Patch6:         gvfs-nds.patch
+# PATCH-FIX-UPSTREAM gvfs-mtp-build.patch bgo#699424 dmistar@opensuse.org -- MTP: Fix compilation warning.
+Patch7:         gvfs-mtp-build.patch
 BuildRequires:  bluez-devel
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fuse-devel
@@ -57,7 +59,7 @@ BuildRequires:  xsltproc
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
-BuildRequires:  pkgconfig(glib-2.0) >= 2.35.0
+BuildRequires:  pkgconfig(glib-2.0) >= 2.37.0
 BuildRequires:  pkgconfig(goa-1.0) >= 3.7.1
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0) => 3.0
@@ -139,6 +141,7 @@ VFS functionality for GLib.
 translation-update-upstream
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 autoreconf -f