diff --git a/gnupg-2.0.4-oldkey.diff b/gnupg-2.0.4-oldkey.diff
new file mode 100644
index 0000000..0856e2a
--- /dev/null
+++ b/gnupg-2.0.4-oldkey.diff
@@ -0,0 +1,11 @@
+--- g10/seckey-cert.c
++++ g10/seckey-cert.c
+@@ -212,7 +212,7 @@ do_check( PKT_secret_key *sk, const char
+                 csum += checksum (buffer, ndata);
+                 gcry_mpi_release (sk->skey[i]);
+ 
+-		err = gcry_mpi_scan( &sk->skey[i], GCRYMPI_FMT_USG,
++		err = gcry_mpi_scan( &sk->skey[i], GCRYMPI_FMT_PGP,
+ 				     buffer, ndata, &ndata );
+ 		xfree (buffer);
+                 if (err)
diff --git a/gpg2.changes b/gpg2.changes
index b5f9e2f..438d83e 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 12 22:40:46 CEST 2007 - ltinkl@suse.cz
+
+- fix #304749 - gpg2 unable to use old secret key
+
 -------------------------------------------------------------------
 Mon Sep 10 20:13:07 CEST 2007 - ltinkl@suse.cz
 
diff --git a/gpg2.spec b/gpg2.spec
index 0bc22be..003d062 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -24,10 +24,11 @@ Provides:       newpg gpg = 1.4.7 gnupg = %{version}
 Obsoletes:      newpg gpg <= 1.4.7
 Summary:        GnuPG 2
 Version:        2.0.4
-Release:        42
+Release:        44
 Source:         gnupg-%{version}-svn4472.tar.bz2
 %define nld_build 0
 Patch2:         nld-build.diff
+Patch3:         gnupg-2.0.4-oldkey.diff
 Patch5:         gnupg-1.9.22-ccid-driver-fix.diff
 Patch6:         gnupg-1.9.18-tmpdir.diff
 Patch7:         gnupg-2.0.4-install_tools.diff
@@ -51,6 +52,7 @@ Authors:
 %if %nld_build
 %patch2
 %endif
+%patch3
 %patch5
 %patch6
 %patch7
@@ -114,6 +116,8 @@ ln -sf gpgv2.1 $RPM_BUILD_ROOT/usr/share/man/man1/gpgv.1
 /usr/share/gnupg
 
 %changelog
+* Wed Sep 12 2007 - ltinkl@suse.cz
+- fix #304749 - gpg2 unable to use old secret key
 * Mon Sep 10 2007 - ltinkl@suse.cz
 - fix gpg2 crash on accessing key (#307666)
 - fix gpg doesn't work on the console (#302323)