diff --git a/gnupg-2.1.11.tar.bz2 b/gnupg-2.1.11.tar.bz2
deleted file mode 100644
index 956c438..0000000
--- a/gnupg-2.1.11.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7b0fb2c8c5d47d7ec916d4a1097c0ddcb94a12bb1c0ac424ad86b1ee316b61a
-size 5224007
diff --git a/gnupg-2.1.11.tar.bz2.sig b/gnupg-2.1.11.tar.bz2.sig
deleted file mode 100644
index 32fba6c..0000000
Binary files a/gnupg-2.1.11.tar.bz2.sig and /dev/null differ
diff --git a/gnupg-2.1.12.tar.bz2 b/gnupg-2.1.12.tar.bz2
new file mode 100644
index 0000000..812395b
--- /dev/null
+++ b/gnupg-2.1.12.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac34929d2400a58a349963865442ee6cdd75e500a8d5df083d29835e88bfc506
+size 5510723
diff --git a/gnupg-2.1.12.tar.bz2.sig b/gnupg-2.1.12.tar.bz2.sig
new file mode 100644
index 0000000..98d8011
Binary files /dev/null and b/gnupg-2.1.12.tar.bz2.sig differ
diff --git a/gnupg-set_umask_before_open_outfile.patch b/gnupg-set_umask_before_open_outfile.patch
index b18e04b..291939a 100644
--- a/gnupg-set_umask_before_open_outfile.patch
+++ b/gnupg-set_umask_before_open_outfile.patch
@@ -1,16 +1,16 @@
-Index: gnupg-2.1.10/g10/plaintext.c
+Index: gnupg-2.1.12/g10/plaintext.c
 ===================================================================
---- gnupg-2.1.10.orig/g10/plaintext.c	2015-11-30 17:39:52.000000000 +0100
-+++ gnupg-2.1.10/g10/plaintext.c	2015-12-04 14:26:56.876677813 +0100
-@@ -25,6 +25,7 @@
+--- gnupg-2.1.12.orig/g10/plaintext.c	2016-05-04 11:43:16.000000000 +0200
++++ gnupg-2.1.12/g10/plaintext.c	2016-05-04 17:36:13.945784756 +0200
+@@ -24,6 +24,7 @@
+ #include <string.h>
  #include <errno.h>
- #include <assert.h>
  #include <sys/types.h>
 +#include <sys/stat.h>
  #ifdef HAVE_DOSISH_SYSTEM
  # include <fcntl.h> /* for setmode() */
  #endif
-@@ -39,6 +40,9 @@
+@@ -38,6 +39,9 @@
  #include "status.h"
  #include "i18n.h"
  
@@ -20,7 +20,7 @@ Index: gnupg-2.1.10/g10/plaintext.c
  
  /* Get the output filename.  On success, the actual filename that is
     used is set in *FNAMEP and a filepointer is returned in *FP.
-@@ -146,11 +150,15 @@ get_output_file (const byte *embedded_na
+@@ -145,11 +149,15 @@ get_output_file (const byte *embedded_na
        log_error (_("error creating '%s': %s\n"), fname, gpg_strerror (err));
        goto leave;
      }
diff --git a/gpg2.changes b/gpg2.changes
index 07b7982..91a16d4 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Wed May  4 15:37:12 UTC 2016 - astieger@suse.com
+
+- GnuPG 2.1.12:
+ * gpg: New --edit-key sub-command "change-usage" for testing
+   purposes.
+ * gpg: Out of order key-signatures are now systematically detected
+   and fixed by --edit-key.
+ * gpg: Improved detection of non-armored messages.
+ * gpg: Removed the extra prompt needed to create Curve25519 keys.
+ * gpg: Improved user ID selection for --quick-sign-key.
+ * gpg: Use the root CAs provided by the system with --fetch-key.
+ * gpg: Add support for the experimental Web Key Directory key
+   location service.
+ * gpg: Improve formatting of Tofu messages and emit new Tofu specific
+   status lines.
+ * gpgsm: Add option --pinentry-mode to support a loopback pinentry.
+ * gpgsm: A new pubring.kbx is now created with the header blob so
+   that gpg can detect that the keybox format needs to be used.
+ * agent: Add read support for the new private key protection format
+   openpgp-s2k-ocb-aes.
+ * agent: Add read support for the new extended private key format.
+ * agent: Default to --allow-loopback-pinentry and add option
+   --no-allow-loopback-pinentry.
+ * scd: Changed to use the new libusb 1.0 API for the internal CCID
+   driver.
+ * dirmngr: The dirmngr-client does now auto-detect the PEM format.
+ * g13: Add experimental support for dm-crypt.
+ * The man pages for gpg and gpgv are now installed under the correct
+   name (gpg2 or gpg - depending on a configure option).
+
 -------------------------------------------------------------------
 Sun Mar  6 08:17:00 UTC 2016 - astieger@suse.com
 
diff --git a/gpg2.spec b/gpg2.spec
index 1ae65e7..93be054 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gpg2
-Version:        2.1.11
+Version:        2.1.12
 Release:        0
 Summary:        GnuPG 2
 License:        GPL-3.0+
@@ -157,6 +157,7 @@ install -m 755 tools/gpg-zip %{buildroot}/%{_bindir}
 %{_libdir}/[^d]*
 %{_sbindir}/addgnupghome
 %{_sbindir}/applygnupgdefaults
+%{_sbindir}/g13-syshelp
 %{_datadir}/gnupg
 %dir %{_sysconfdir}/gnupg
 %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf