diff --git a/gnupg-2.1.7.tar.bz2 b/gnupg-2.1.7.tar.bz2
deleted file mode 100644
index 2ba9e93..0000000
--- a/gnupg-2.1.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c18a3776d47fec98892d51d28b6574ef16bf0a25eabb0956231058aaf2e7846e
-size 4918583
diff --git a/gnupg-2.1.7.tar.bz2.sig b/gnupg-2.1.7.tar.bz2.sig
deleted file mode 100644
index 7ee5074..0000000
Binary files a/gnupg-2.1.7.tar.bz2.sig and /dev/null differ
diff --git a/gnupg-2.1.8.tar.bz2 b/gnupg-2.1.8.tar.bz2
new file mode 100644
index 0000000..6ea3a0f
--- /dev/null
+++ b/gnupg-2.1.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3b8d01e4690715d42e8f289493c85413766f3fa935e4fe7e5ff5b0f6e2781a3
+size 4900705
diff --git a/gnupg-2.1.8.tar.bz2.sig b/gnupg-2.1.8.tar.bz2.sig
new file mode 100644
index 0000000..64c5b17
Binary files /dev/null and b/gnupg-2.1.8.tar.bz2.sig differ
diff --git a/gpg2.changes b/gpg2.changes
index a3e9867..0b4520e 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Sep 11 06:02:23 UTC 2015 - astieger@suse.com
+
+- GnuPG 2.1.8:
+ * gpg: Sending very large keys to the keyservers works again.
+ * gpg: Validity strings in key listings are now again translatable.
+ * gpg: Emit FAILURE status lines to help GPGME.
+ * gpg: Does not anymore link to Libksba to reduce dependencies.
+ * gpgsm: Export of secret keys via Assuan is now possible.
+ * agent: Raise the maximum passphrase length from 100 to 255 bytes.
+ * agent: Fix regression using EdDSA keys with ssh.
+ * Does not anymore use a build timestamp by default.
+ * The fallback encoding for broken locale settings changed
+   from Latin-1 to UTF-8.
+ * Many code cleanups and improved internal documentation.
+ * Various minor bug fixes.
+
 -------------------------------------------------------------------
 Wed Aug 12 10:58:48 UTC 2015 - astieger@suse.com
 
diff --git a/gpg2.spec b/gpg2.spec
index ad29f4d..8494b5e 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gpg2
-Version:        2.1.7
+Version:        2.1.8
 Release:        0
 Summary:        GnuPG 2
 License:        GPL-3.0+
@@ -27,6 +27,7 @@ Source:         ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
 Source2:        ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 # https://www.gnupg.org/signature_key.html
 Source3:        %{name}.keyring
+Source99:       %{name}.changes
 Patch4:         gnupg-2.0.9-langinfo.patch
 Patch5:         gnupg-2.0.18-files-are-digests.patch
 Patch6:         gnupg-dont-fail-with-seahorse-agent.patch
@@ -91,6 +92,7 @@ PIE="-fpie"
 %endif
 export CFLAGS="%{optflags} ${PIE}"
 export LDFLAGS=-pie
+date=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99})
 %configure \
     --libexecdir=%{_libdir} \
     --docdir=%{_docdir}/%{name} \
@@ -104,7 +106,8 @@ export LDFLAGS=-pie
     --enable-gpgtar \
     --enable-large-rsa \
     --enable-large-secmem \
-    --with-gnu-ld
+    --with-gnu-ld \
+    --enable-build-timestamp=$date
 
 make %{?_smp_mflags}
 
@@ -140,7 +143,7 @@ install -m 755 tools/gpgsplit %{buildroot}/%{_bindir}
 %check
 %if ! 0%{?qemu_user_space_build}
 %ifnarch ppc64
-make check
+make %{?_smp_mflags} check
 %endif
 %endif
 
@@ -155,8 +158,8 @@ make check
 
 %files
 %defattr(-,root,root)
-%doc %{_infodir}/gnupg*
-%doc %{_mandir}/*/*.gz
+%{_infodir}/gnupg*
+%{_mandir}/*/*.gz
 %doc %{_docdir}/%{name}
 %{_bindir}/*
 %{_libdir}/[^d]*