diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 45c529c..14d5970 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -3,7 +3,7 @@
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
 Version: 2.20.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.20/gnome-keyring-%{version}.tar.bz2
@@ -22,6 +22,10 @@ BuildRequires: perl(XML::Parser)
 # http://bugzilla.gnome.org/show_bug.cgi?id=484612 
 Patch0:    gnome-keyring-2.20-selinux-pam.patch
 
+# autounlock does not currently work, see
+# https://bugzilla.redhat.com/show_bug.cgi?id=250147
+Patch1: no-autounlock.patch
+
 %description
 gnome-keyring manages passwords and other types of secrets
 for the user, storing them encrypted with a main password.
@@ -61,6 +65,7 @@ and start the keyring daemon.
 %setup -q -n gnome-keyring-%{version}
 
 %patch0 -p1 -b .selinux_pam
+%patch1 -p1 -b .no-autounlock
 
 %build
 aclocal
@@ -107,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 15 2007 Matthias Clasen  <mclasen@redhat.com> - 2.20.1-2
+- Disable the auto-unlock question for now (#312531)
+
 * Mon Oct 15 2007 Matthias Clasen  <mclasen@redhat.com> - 2.20.1-1
 - Update to 2.20.1
 - Drop obsolete patches