diff --git a/gnupg-CVE-2010-2547.patch b/gnupg-CVE-2010-2547.patch
new file mode 100644
index 0000000..531f81e
--- /dev/null
+++ b/gnupg-CVE-2010-2547.patch
@@ -0,0 +1,12 @@
+Index: gnupg-2.0.16/kbx/keybox-blob.c
+===================================================================
+--- gnupg-2.0.16.orig/kbx/keybox-blob.c	2009-09-21 18:53:44.000000000 +0200
++++ gnupg-2.0.16/kbx/keybox-blob.c	2010-07-28 11:28:50.000000000 +0200
+@@ -898,6 +898,7 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_
+               rc = gpg_error_from_syserror ();
+               goto leave;
+             }
++	  names = tmp;
+         }
+       names[blob->nuids++] = p;
+       if (!i && (p=x509_email_kludge (p)))
diff --git a/gpg2.changes b/gpg2.changes
index 2113d43..71228d5 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul 28 09:39:00 UTC 2010 - puzel@novell.com
+
+- gnupg-CVE-2010-2547.patch (bnc#625947)
+- renumber patches
+
 -------------------------------------------------------------------
 Mon Jul 19 21:49:40 UTC 2010 - puzel@novell.com
 
diff --git a/gpg2.spec b/gpg2.spec
index e01187b..d1b453b 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -20,7 +20,7 @@
 
 Name:           gpg2
 Version:        2.0.16
-Release:        1
+Release:        2
 BuildRequires:  expect
 BuildRequires:  fdupes
 BuildRequires:  libgpg-error-devel >= 1.7
@@ -52,12 +52,13 @@ Provides:       gpg2_signd_support
 Obsoletes:      gpg < 1.4.9
 Summary:        GnuPG 2
 Source:         gnupg-%{version}.tar.bz2
-Patch5:         gnupg-2.0.10-tmpdir.diff
-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
-Patch14:        gnupg-dont-fail-with-seahorse-agent.patch
+Patch1:         gnupg-2.0.10-tmpdir.diff
+Patch2:         gnupg-2.0.4-install_tools.diff
+Patch3:         gnupg-2.0.9-RSA_ES.patch
+Patch4:         gnupg-2.0.9-langinfo.patch
+Patch5:         gnupg-files-are-digests.patch
+Patch6:         gnupg-dont-fail-with-seahorse-agent.patch
+Patch7:         gnupg-CVE-2010-2547.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -67,12 +68,13 @@ gpg-agent, and a keybox library.
 %lang_package
 %prep
 %setup  -q -n gnupg-%version
+%patch1 -p1
+%patch2
+%patch3 -p1
+%patch4
 %patch5 -p1
-%patch7
-%patch10 -p1
-%patch11
-%patch12 -p1
-%patch14 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 # Required for patch7: