diff --git a/gnupg-2.0.24.tar.bz2 b/gnupg-2.0.24.tar.bz2
deleted file mode 100644
index f48264a..0000000
--- a/gnupg-2.0.24.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d974a1d86c9470571411346368416d96200ef9510028763c1303cd66e3820232
-size 4301922
diff --git a/gnupg-2.0.24.tar.bz2.sig b/gnupg-2.0.24.tar.bz2.sig
deleted file mode 100644
index f7f7db6..0000000
Binary files a/gnupg-2.0.24.tar.bz2.sig and /dev/null differ
diff --git a/gnupg-2.0.25.tar.bz2 b/gnupg-2.0.25.tar.bz2
new file mode 100644
index 0000000..8867c49
--- /dev/null
+++ b/gnupg-2.0.25.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3abe97df096cf53d6a422ac922f3c48e688bc892b7ccf669b92f0b7fc6c5823
+size 4301689
diff --git a/gnupg-2.0.25.tar.bz2.sig b/gnupg-2.0.25.tar.bz2.sig
new file mode 100644
index 0000000..596495f
Binary files /dev/null and b/gnupg-2.0.25.tar.bz2.sig differ
diff --git a/gpg2.changes b/gpg2.changes
index ec29925..9542caa 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Jul  1 21:05:55 UTC 2014 - andreas.stieger@gmx.de
+
+- gnupg-add_legacy_FIPS_mode_option.patch (part of [bnc#856312])
+  mentions GCRYCTL_INACTIVATE_FIPS_FLAG, raising the requirement
+  for gcrypt from 1.4.0 (from configure) to 1.6.1 where said flag
+  was introduced. Require this version to build.
+
+-------------------------------------------------------------------
+Mon Jun 30 18:52:36 UTC 2014 - andreas.stieger@gmx.de
+
+- update to 2.0.25:
+ * gpg: Fix a regression in 2.0.24 if more than one keyid is given
+   to --recv-keys et al.
+ * gpg: Cap RSA and Elgamal keysize at 4096 bit also for unattended
+   key generation.
+ * gpgsm: Fix a DISPLAY related problem with
+   --export-secret-key-p12.
+ * scdaemon: Support reader Gemalto IDBridge CT30.
+
 -------------------------------------------------------------------
 Tue Jun 24 22:25:12 UTC 2014 - andreas.stieger@gmx.de
 
diff --git a/gpg2.spec b/gpg2.spec
index 72023e3..2566a65 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gpg2
-Version:        2.0.24
+Version:        2.0.25
 Release:        0
 BuildRequires:  automake >= 1.10
 BuildRequires:  expect
@@ -26,7 +26,9 @@ BuildRequires:  libadns-devel
 BuildRequires:  libassuan-devel >= 2.0.0
 BuildRequires:  libbz2-devel
 BuildRequires:  libcurl-devel >= 7.10
-BuildRequires:  libgcrypt-devel >= 1.4.0
+# patch11 (gnupg-add_legacy_FIPS_mode_option.patch) mentions GCRYCTL_INACTIVATE_FIPS_FLAG
+# raising gcrypt requirement from 1.4.0
+BuildRequires:  libgcrypt-devel >= 1.6.1
 BuildRequires:  libgpg-error-devel >= 1.11
 BuildRequires:  libksba-devel >= 1.0.7
 BuildRequires:  libusb-devel