diff --git a/.gitignore b/.gitignore
index 6c9f65a..f1c3c73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/gnome-online-miners-3.14.3.tar.xz
+SOURCES/gnome-online-miners-3.22.0.tar.xz
diff --git a/.gnome-online-miners.metadata b/.gnome-online-miners.metadata
index f7cbd11..7eab331 100644
--- a/.gnome-online-miners.metadata
+++ b/.gnome-online-miners.metadata
@@ -1 +1 @@
-d0843447c327f34303aaca7ba1e1c5bdca72784d SOURCES/gnome-online-miners-3.14.3.tar.xz
+f826bc55e20927684e971519401d259a3106d634 SOURCES/gnome-online-miners-3.22.0.tar.xz
diff --git a/SOURCES/0001-zpj-Use-an-HTTP-URL-as-nie-url.patch b/SOURCES/0001-zpj-Use-an-HTTP-URL-as-nie-url.patch
new file mode 100644
index 0000000..cc5b48e
--- /dev/null
+++ b/SOURCES/0001-zpj-Use-an-HTTP-URL-as-nie-url.patch
@@ -0,0 +1,64 @@
+From 4e095d31acb53b7f393dc7a5ecdbd427f2529a68 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Mon, 27 Mar 2017 18:36:30 +0200
+Subject: [PATCH] zpj: Use an HTTP URL as nie:url
+
+The nao:identifier value is not a valid nie:url. The identifier has the
+format "windows-live:skydrive:<id>", and is not a GVfs supported URI.
+This is a problem because the nie:url is used to locate the path to
+the entry's thumbnail in the desktop's thumbnail cache. Running
+g_file_query_info (file, G_FILE_ATTRIBUTE_THUMBNAIL_PATH, ...) on such
+a URI will fail. Therefore we use a fake OneDrive-namespaced URI that
+GVfs understands.
+
+Force a full reindex of OneDrive resources for existing users.
+---
+ src/gom-zpj-miner.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/gom-zpj-miner.c b/src/gom-zpj-miner.c
+index 6dff947ada9d..da54c2a53be5 100644
+--- a/src/gom-zpj-miner.c
++++ b/src/gom-zpj-miner.c
+@@ -46,6 +46,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gchar *contact_resource;
+   gchar *resource = NULL;
+   gchar *date, *identifier;
++  gchar *url = NULL;
+   const gchar *class = NULL, *id, *name;
+   gboolean resource_exists, mtime_changed;
+   gint64 new_mtime;
+@@ -99,11 +100,12 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+     goto out;
+ 
+   /* the resource changed - just set all the properties again */
++  url = g_strconcat ("http://onedrive.com/", id, NULL);
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+      datasource_urn, resource,
+-     "nie:url", identifier);
++     "nie:url", url);
+ 
+   if (*error != NULL)
+     goto out;
+@@ -202,6 +204,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+  out:
+   g_free (resource);
+   g_free (identifier);
++  g_free (url);
+ 
+   if (*error != NULL)
+     return FALSE;
+@@ -324,7 +327,7 @@ gom_zpj_miner_class_init (GomZpjMinerClass *klass)
+ 
+   miner_class->goa_provider_type = "windows_live";
+   miner_class->miner_identifier = MINER_IDENTIFIER;
+-  miner_class->version = 1;
++  miner_class->version = 2;
+ 
+   miner_class->create_services = create_services;
+   miner_class->query = query_zpj;
+-- 
+2.9.3
+
diff --git a/SPECS/gnome-online-miners.spec b/SPECS/gnome-online-miners.spec
index a13961d..bbeb60e 100644
--- a/SPECS/gnome-online-miners.spec
+++ b/SPECS/gnome-online-miners.spec
@@ -3,13 +3,16 @@
 %global __requires_exclude ^(%{_privatelibs})$
 
 Name:           gnome-online-miners
-Version:        3.14.3
-Release:        1%{?dist}
+Version:        3.22.0
+Release:        2%{?dist}
 Summary:        Crawls through your online content
 
-License:        GPLv2+
+License:        GPLv2+ and LGPLv2+ and MIT
 URL:            https://wiki.gnome.org/Projects/GnomeOnlineMiners
-Source0:        http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=985887
+Patch0:         0001-zpj-Use-an-HTTP-URL-as-nie-url.patch
 
 BuildRequires:  glib2-devel >= 2.35.1
 BuildRequires:  gnome-online-accounts-devel >= 3.8.0
@@ -17,6 +20,7 @@ BuildRequires:  libgdata-devel >= 0.15.2
 BuildRequires:  libzapojit-devel >= 0.0.2
 BuildRequires:  pkgconfig
 BuildRequires:  tracker-devel >= 0.17.2
+
 Requires:       dbus
 Requires:       gvfs >= 1.18.3
 
@@ -28,6 +32,7 @@ and ownCloud.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -42,7 +47,7 @@ make %{?_smp_mflags}
 
 
 %install
-make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
+%make_install
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
 # Use %%doc instead.
@@ -53,8 +58,8 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/org.gnome.OnlineMiners.Flickr.s
 rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/org.gnome.OnlineMiners.MediaServer.service
 
 %files
+%license COPYING
 %doc AUTHORS
-%doc COPYING
 %doc NEWS
 %doc README
 %{_datadir}/dbus-1/services/org.gnome.OnlineMiners.GData.service
@@ -70,6 +75,14 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/org.gnome.OnlineMiners.MediaSer
 
 
 %changelog
+* Mon Mar 27 2017 Debarshi Ray <rishi@fedoraproject.org> - 3.22.0-2
+- Fix the nie:url for OneDrive entries
+- Resolves: #985887, #1386954
+
+* Mon Sep 19 2016 Kalev Lember <klember@redhat.com> - 3.22.0-1
+- Update to 3.22.0
+- Resolves: #1386954
+
 * Tue May 05 2015 Debarshi Ray <rishi@fedoraproject.org> - 3.14.3-1
 - Update to 3.14.3
 Resolves: #1184195