diff --git a/.gitignore b/.gitignore
index ecad7d7..8dfe266 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/seahorse-3.14.1.tar.xz
+SOURCES/seahorse-3.20.0.tar.xz
diff --git a/.seahorse.metadata b/.seahorse.metadata
index 73c56b4..6a775fd 100644
--- a/.seahorse.metadata
+++ b/.seahorse.metadata
@@ -1 +1 @@
-df86687c924eec40361adebb687d7067280a91f9 SOURCES/seahorse-3.14.1.tar.xz
+db7f592b475c95b5331aadd509d56ffcb4e04d4e SOURCES/seahorse-3.20.0.tar.xz
diff --git a/SOURCES/set-gnupg-engine.patch b/SOURCES/set-gnupg-engine.patch
index 53b271a..4ec456a 100644
--- a/SOURCES/set-gnupg-engine.patch
+++ b/SOURCES/set-gnupg-engine.patch
@@ -1,28 +1,12 @@
-From cad4d259805840d912d3f20f76bc3f4cd57e9502 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@redhat.com>
-Date: Sat, 25 Oct 2014 08:44:33 +0200
-Subject: [PATCH] pgp: Force use of the first gnupg found by configure.ac
-
-Some people are having problems using recent versions of gpg2.
-This allows configure.ac to identify a version during building
-and then stick to using that one.
----
- pgp/seahorse-pgp-backend.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c
-index ab9b8fb..4b267c3 100644
---- a/pgp/seahorse-pgp-backend.c
-+++ b/pgp/seahorse-pgp-backend.c
-@@ -310,6 +310,8 @@ seahorse_pgp_backend_initialize (void)
- 	g_object_unref (self);
+diff -up seahorse-3.20.0/pgp/seahorse-pgp-backend.c.gpg14 seahorse-3.20.0/pgp/seahorse-pgp-backend.c
+--- seahorse-3.20.0/pgp/seahorse-pgp-backend.c.gpg14	2017-02-24 13:13:37.219519356 -0500
++++ seahorse-3.20.0/pgp/seahorse-pgp-backend.c	2017-02-24 13:14:11.113770713 -0500
+@@ -341,7 +341,7 @@ seahorse_pgp_backend_initialize (void)
  
  	g_return_if_fail (pgp_backend != NULL);
-+
+ 
+-	gpgme_set_engine_info (GPGME_PROTOCOL_OpenPGP, NULL, NULL);
 +	gpgme_set_engine_info (GPGME_PROTOCOL_OpenPGP, GNUPG, NULL);
  }
  
  SeahorseGpgmeKeyring *
--- 
-2.1.0
-
diff --git a/SPECS/seahorse.spec b/SPECS/seahorse.spec
index 4f6dcf3..e426e78 100644
--- a/SPECS/seahorse.spec
+++ b/SPECS/seahorse.spec
@@ -1,18 +1,19 @@
 Name:		seahorse
-Version:	3.14.1
+Version:	3.20.0
 Release:	1%{?dist}
 Summary:	A GNOME application for managing encryption keys
-Group:		User Interface/Desktops
+
 # seahorse is GPLv2+
 # libcryptui is LGPLv2+
 License:        GPLv2+ and LGPLv2+
 URL:            https://wiki.gnome.org/Apps/Seahorse
 #VCS: git:git://git.gnome.org/seahorse
-Source:         https://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz
 
 # Use GnuPG 1.4.x instead of 2.0.x
 Patch0:         set-gnupg-engine.patch
 
+Source:         https://download.gnome.org/sources/%{name}/3.20/%{name}-%{version}.tar.xz
+
 BuildRequires:  pkgconfig(avahi-client)
 BuildRequires:  pkgconfig(avahi-glib)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -24,7 +25,7 @@ BuildRequires:  pkgconfig(libsoup-2.4)
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gpgme-devel >= 1.0
-BuildRequires:  gnupg
+BuildRequires:  gnupg2
 BuildRequires:  itstool
 BuildRequires:  libSM-devel
 BuildRequires:  openldap-devel
@@ -37,7 +38,6 @@ BuildRequires:  /usr/bin/appstream-util
 # https://bugzilla.redhat.com/show_bug.cgi?id=587328
 Requires:       pinentry-gui
 
-Obsoletes: gnome-keyring-manager
 Obsoletes: seahorse-devel < 3.1.4-2
 Obsoletes: seahorse-plugins < 2.91.6-0.8
 # Self-obsoletes to assist with seahorse-sharing package split
@@ -51,10 +51,10 @@ operations.  It is a keyring manager.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .gpg14
 
 %build
-GNUPG=/usr/bin/gpg ; export GNUPG ; %configure
+%configure
 
 make %{?_smp_mflags}
 # cleanup permissions for files that go into debuginfo
@@ -117,6 +117,7 @@ update-mime-database -n %{_datadir}/mime &> /dev/null || :
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/seahorse.png
 %{_datadir}/icons/hicolor/*/apps/seahorse-preferences.png
+%{_datadir}/icons/hicolor/symbolic/apps/seahorse-symbolic.svg
 %{_mandir}/man1/*.1*
 %dir %{_libdir}/seahorse
 %{_libdir}/seahorse/*
@@ -128,6 +129,10 @@ update-mime-database -n %{_datadir}/mime &> /dev/null || :
 %{_datadir}/gnome-shell/search-providers/seahorse-search-provider.ini
 
 %changelog
+* Fri Feb 24 2017 Matthias Clasen <mclasen@redhat.com> - 3.20.0-1
+- Rebase to 3.20.0
+  Resolves: rhbz#1387044
+
 * Thu May 14 2015 David King <dking@redhat.com> - 3.14.1-1
 - Rebase to 3.14.1 (#1193148)