diff --git a/gnupg-2.2.4.tar.bz2 b/gnupg-2.2.4.tar.bz2
deleted file mode 100644
index e9631b7..0000000
--- a/gnupg-2.2.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec
-size 6571487
diff --git a/gnupg-2.2.4.tar.bz2.sig b/gnupg-2.2.4.tar.bz2.sig
deleted file mode 100644
index d7aacb9..0000000
Binary files a/gnupg-2.2.4.tar.bz2.sig and /dev/null differ
diff --git a/gnupg-2.2.5.tar.bz2 b/gnupg-2.2.5.tar.bz2
new file mode 100644
index 0000000..ccb4d41
--- /dev/null
+++ b/gnupg-2.2.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57
+size 6584756
diff --git a/gnupg-2.2.5.tar.bz2.sig b/gnupg-2.2.5.tar.bz2.sig
new file mode 100644
index 0000000..9c1f226
Binary files /dev/null and b/gnupg-2.2.5.tar.bz2.sig differ
diff --git a/gpg2.changes b/gpg2.changes
index bab380b..c9cab4b 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Sun Feb 25 12:14:54 UTC 2018 - astieger@suse.com
+
+- GnuPG 2.2.5:
+  * gpg: Allow the use of the "cv25519" and "ed25519" short names
+    in addition to the canonical curve names in --batch --gen-key
+  * gpg: Make sure to print all secret keys with option --list-only
+    and --decrypt
+  * gpg: Fix the use of future-default with --quick-add-key for
+    signing keys
+  * gpg: Select a secret key by checking availability under
+    gpg-agent
+  * gpg: Fix reversed prompt texts for --only-sign-text-ids
+  * gpg,gpgsm: Fix detection of bogus keybox blobs on 32 bit
+    systems
+  * gpgsm: Fix regression since 2.1 in --export-secret-key-raw
+    which got $d mod (q-1)$ wrong
+  * scd: Support the KDF Data Object of the OpenPGP card 3.3
+  * scd: Fix a regression in the internal CCID driver for certain
+    card readers
+  * dirmngr: Improve returned error description on failure of DNS
+    resolving
+  * wks: Implement command --install-key for gpg-wks-server.
+
+-------------------------------------------------------------------
+Thu Feb 22 15:10:33 UTC 2018 - fvogt@suse.com
+
+- Use %license (boo#1082318)
+
 -------------------------------------------------------------------
 Thu Dec 21 09:44:03 UTC 2017 - astieger@suse.com
 
diff --git a/gpg2.spec b/gpg2.spec
index 32628fe..3147026 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gpg2
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           gpg2
-Version:        2.2.4
+Version:        2.2.5
 Release:        0
 Summary:        File encryption, decryption, signature creation and verification utility
 License:        GPL-3.0+
@@ -36,7 +36,7 @@ Patch9:         gnupg-detect_FIPS_mode.patch
 Patch11:        gnupg-add_legacy_FIPS_mode_option.patch
 BuildRequires:  expect
 BuildRequires:  fdupes
-BuildRequires:  libassuan-devel >= 2.4.3
+BuildRequires:  libassuan-devel >= 2.5.0
 BuildRequires:  libgcrypt-devel >= 1.7.0
 BuildRequires:  libgpg-error-devel >= 1.24
 BuildRequires:  libksba-devel >= 1.3.4
@@ -125,8 +125,6 @@ ln -sf gpg2.1 %{buildroot}%{_mandir}/man1/gpg.1
 ln -sf gpgv2.1 %{buildroot}%{_mandir}/man1/gpgv.1
 # fix rpmlint invalid-lc-messages-dir:
 rm -rf %{buildroot}/%{_datadir}/locale/en@{bold,}quot
-# additional files to documentation directory
-install -m 644 AUTHORS COPYING* ChangeLog NEWS THANKS TODO doc/FAQ %{buildroot}/%{_docdir}/%{name}
 # install scdaemon to %{_bindir} (bnc#863645)
 mv %{buildroot}%{_libdir}/scdaemon %{buildroot}%{_bindir}
 mv %{buildroot}%{_libdir}/dirmngr_ldap %{buildroot}%{_bindir}
@@ -154,6 +152,8 @@ install -m 755 tools/gpg-zip %{buildroot}/%{_bindir}
 %files
 %{_infodir}/gnupg*
 %{_mandir}/*/*%{ext_man}
+%license COPYING*
+%doc AUTHORS ChangeLog NEWS THANKS TODO doc/FAQ
 %doc %{_docdir}/%{name}
 %{_bindir}/*
 %{_libdir}/[^d]*