diff --git a/gnupg-2.0.15.tar.bz2 b/gnupg-2.0.15.tar.bz2
new file mode 100644
index 0000000..d452433
--- /dev/null
+++ b/gnupg-2.0.15.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5881882f4da120ce1c71da64468392704b391ca7652ddc512bc4f1d8968f0d1c
+size 3976879
diff --git a/gnupg-2.0.16.tar.bz2 b/gnupg-2.0.16.tar.bz2
deleted file mode 100644
index 7b64b08..0000000
--- a/gnupg-2.0.16.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d5abb977c02ebb0f6ce25a5ba71c8df90835aa666a85acd73a9b7f9df35a80b
-size 4004033
diff --git a/gpg2.changes b/gpg2.changes
index 2113d43..16eb9b2 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,17 +1,3 @@
--------------------------------------------------------------------
-Mon Jul 19 21:49:40 UTC 2010 - puzel@novell.com
-
-- update to gnupg-2.0.16
- * If the agent's --use-standard-socket option is active, all tools
-   try to start and daemonize the agent on the fly.  In the past this
-   was only supported on W32; on non-W32 systems the new configure
-   option --use-standard-socket may now be used to use this feature by
-   default.
- * The gpg-agent commands KILLAGENT and RELOADAGENT are now available
-   on all platforms.
- * Minor bug fixes.
-- drop gnupg-2.0.14-s2kcount.patch (builds fine without it now)
-
 -------------------------------------------------------------------
 Mon Jun  7 09:40:32 UTC 2010 - adrian@suse.de
 
diff --git a/gpg2.spec b/gpg2.spec
index c08f0d5..7a8b58a 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gpg2 (Version 2.0.16)
+# spec file for package gpg2 (Version 2.0.15)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,13 +19,13 @@
 
 
 Name:           gpg2
-Version:        2.0.16
+Version:        2.0.15
 Release:        4
 BuildRequires:  expect
 BuildRequires:  fdupes
-BuildRequires:  libgpg-error-devel >= 1.7
+BuildRequires:  libgpg-error-devel >= 1.4
 BuildRequires:  libgcrypt-devel >= 1.4.0
-BuildRequires:  libksba-devel >= 1.0.7
+BuildRequires:  libksba-devel >= 1.0.2
 BuildRequires:  libassuan-devel >= 2.0.0
 BuildRequires:  opensc-devel
 BuildRequires:  libusb-devel
@@ -57,6 +57,8 @@ Patch7:         gnupg-2.0.4-install_tools.diff
 Patch10:        gnupg-2.0.9-RSA_ES.patch
 Patch11:        gnupg-2.0.9-langinfo.patch
 Patch12:        gnupg-files-are-digests.patch
+# PATCH-FIX-UPSTREAM gnupg-2.0.14-s2kcount.patch dimstar@opensuse.org -- use fixed s2k-count number to not use gpg-agent.
+Patch13:        gnupg-2.0.14-s2kcount.patch
 Patch14:        gnupg-dont-fail-with-seahorse-agent.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -72,6 +74,7 @@ gpg-agent, and a keybox library.
 %patch10 -p1
 %patch11
 %patch12 -p1
+%patch13 -p1
 %patch14 -p1
 
 %build