diff --git a/libgcrypt-mpicheck.patch b/libgcrypt-mpicheck.patch
new file mode 100644
index 0000000..d00be15
--- /dev/null
+++ b/libgcrypt-mpicheck.patch
@@ -0,0 +1,12 @@
+--- mpi/mpicoder.c
++++ mpi/mpicoder.c
+@@ -51,7 +51,9 @@
+   else if (!nbits)
+     {
+       log_error ("an mpi of size 0 is not allowed\n");
++/*
+       goto leave;
++*/
+     }
+   buffer += 2;
+   nread = 2;
diff --git a/libgcrypt.changes b/libgcrypt.changes
index e0ff3c5..7e73ac1 100644
--- a/libgcrypt.changes
+++ b/libgcrypt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 13 01:28:53 CEST 2007 - ltinkl@suse.cz
+
+- add sanity check for mpi of size 0 (#304479)
+
 -------------------------------------------------------------------
 Mon Feb  5 10:25:21 CET 2007 - mkoenig@suse.de
 
diff --git a/libgcrypt.spec b/libgcrypt.spec
index d408079..44988dc 100644
--- a/libgcrypt.spec
+++ b/libgcrypt.spec
@@ -14,14 +14,15 @@ Name:           libgcrypt
 BuildRequires:  libgpg-error-devel
 URL:            http://www.gnu.org/directory/Security/libgcrypt.html
 Version:        1.2.4
-Release:        1
+Release:        36
 Summary:        The GNU Crypto Library
-License:        GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License:        GPL v2 or later, LGPL v2 or later
 Group:          Development/Libraries/C and C++
 Autoreqprov:    on
 Source:         %name-%version.tar.bz2
 Patch0:         %name-ppc64.patch
-Patch1:         libgcrypt-strict-aliasing.patch 
+Patch1:         libgcrypt-strict-aliasing.patch
+Patch2:         libgcrypt-mpicheck.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %install_info_prereq
 
@@ -72,6 +73,7 @@ Authors:
 %setup -q -n libgcrypt-%version
 %patch0 -p1
 %patch1
+%patch2
 
 %build
 %{?suse_update_config}
@@ -124,7 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %_includedir/*
 %_datadir/aclocal/*
 
-%changelog -n libgcrypt
+%changelog
+* Thu Sep 13 2007 - ltinkl@suse.cz
+- add sanity check for mpi of size 0 (#304479)
 * Mon Feb 05 2007 - mkoenig@suse.de
 - update to version 1.2.4:
   * Fixed a bug in the memory allocator which could have been the