diff --git a/gnupg-2.1.19-stronger-defaults.patch b/gnupg-2.1.19-stronger-defaults.patch
deleted file mode 100644
index 983dabd..0000000
--- a/gnupg-2.1.19-stronger-defaults.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Andreas Stieger <astieger@suse.com>
-Date: Tue, 14 Mar 2017 20:43:20 +0000
-Subject; FATE#323084: Stronger GnuPG defaults
-References: FATE#323084
-Upstream: no
-
-Index: gnupg-2.1.19/g10/options.skel
-===================================================================
---- gnupg-2.1.19.orig/g10/options.skel
-+++ gnupg-2.1.19/g10/options.skel
-@@ -137,3 +137,15 @@
- # Uncomment the following option to get rid of the copyright notice
- 
- #no-greeting
-+
-+# SUSE recommended output options
-+with-fingerprint
-+keyid-format 0xlong
-+no-emit-version
-+
-+# SUSE recommends SHA-2 family of hashes for all  
-+personal-digest-preferences SHA512 SHA384 SHA256 SHA224
-+default-preference-list SHA512 SHA384 SHA256 AES256 AES192 AES CAST5 BZIP2 ZLIB ZIP Uncompressed
-+cert-digest-algo SHA512
-+digest-algo SHA512
-+
diff --git a/gnupg-2.1.20.tar.bz2 b/gnupg-2.1.20.tar.bz2
deleted file mode 100644
index c7c955c..0000000
--- a/gnupg-2.1.20.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d
-size 6456128
diff --git a/gnupg-2.1.20.tar.bz2.sig b/gnupg-2.1.20.tar.bz2.sig
deleted file mode 100644
index 4bc8e14..0000000
Binary files a/gnupg-2.1.20.tar.bz2.sig and /dev/null differ
diff --git a/gnupg-2.1.21.tar.bz2 b/gnupg-2.1.21.tar.bz2
new file mode 100644
index 0000000..dc0cbdc
--- /dev/null
+++ b/gnupg-2.1.21.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd
+size 6472887
diff --git a/gnupg-2.1.21.tar.bz2.sig b/gnupg-2.1.21.tar.bz2.sig
new file mode 100644
index 0000000..0bbb1e2
Binary files /dev/null and b/gnupg-2.1.21.tar.bz2.sig differ
diff --git a/gpg2.changes b/gpg2.changes
index 67513e1..0ffc0eb 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon May 15 20:49:25 UTC 2017 - astieger@suse.com
+
+- GnuPG 2.1.21:
+  * gpg,gpgsm: Fix corruption of old style keyring.gpg files,
+    regression in 2.1.20
+  * gpg,dirmngr: Removed the skeleton config file support
+    New installations no longer generate a configuration file.
+    In the absence of a file, SHA-2 family hashes are used.
+    Existing configurations are not touched.   
+    drop gnupg-2.1.19-stronger-defaults.patch FATE#323084 
+  * gpg: Fixed import filter property match bug.
+  * scd: Removed Linux support for Cardman 4040 PCMCIA reader.
+  * scd: Fixed some corner case bugs in resume/suspend handling.
+  * Many minor bug fixes and code cleanup.  
+
 -------------------------------------------------------------------
 Tue Apr  4 14:00:36 UTC 2017 - astieger@suse.com
 
diff --git a/gpg2.spec b/gpg2.spec
index 8af4583..3b2b5e6 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gpg2
-Version:        2.1.20
+Version:        2.1.21
 Release:        0
 Summary:        File encryption, decryption, signature creation and verification utility
 License:        GPL-3.0+
@@ -34,7 +34,6 @@ Patch6:         gnupg-dont-fail-with-seahorse-agent.patch
 Patch8:         gnupg-set_umask_before_open_outfile.patch
 Patch9:         gnupg-detect_FIPS_mode.patch
 Patch11:        gnupg-add_legacy_FIPS_mode_option.patch
-Patch12:        gnupg-2.1.19-stronger-defaults.patch
 BuildRequires:  expect
 BuildRequires:  fdupes
 BuildRequires:  libassuan-devel >= 2.4.3
@@ -87,7 +86,6 @@ gpg2 provides GPGSM, gpg-agent, and a keybox library.
 %patch8 -p1
 %patch9 -p1
 %patch11 -p1
-%patch12 -p1
 
 %build
 date=$(date -u +%%Y-%%m-%%dT%%H:%%M+0000 -r %{SOURCE99})