diff --git a/packages/gnupg2/build.sh b/packages/gnupg2/build.sh
index d6ffefaa7..b852a988b 100755
--- a/packages/gnupg2/build.sh
+++ b/packages/gnupg2/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
 TERMUX_PKG_VERSION=2.1.11
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=3
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libnpth,readline,pinentry"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ldap --disable-sqlite"
diff --git a/packages/gnupg2/g10-gpg.c.patch b/packages/gnupg2/g10-gpg.c.patch
new file mode 100644
index 000000000..f698b1206
--- /dev/null
+++ b/packages/gnupg2/g10-gpg.c.patch
@@ -0,0 +1,13 @@
+diff -u -r ../gnupg-2.1.11/g10/gpg.c ./g10/gpg.c
+--- ../gnupg-2.1.11/g10/gpg.c	2016-01-26 07:05:55.000000000 -0500
++++ ./g10/gpg.c	2016-04-14 21:42:15.168898294 -0400
+@@ -4669,6 +4669,9 @@
+   if (opt.debug)
+     gcry_control (GCRYCTL_DUMP_SECMEM_STATS );
+ 
++  /* XXX: Workaround for libgpg-error atexit()-callback not working. */
++  es_fflush(NULL);
++
+   emergency_cleanup ();
+ 
+   rc = rc? rc : log_get_errorcount(0)? 2 : g10_errors_seen? 1 : 0;