diff --git a/gnome-keyring-2.21.5-dont-ask-for-password.patch b/gnome-keyring-2.21.5-dont-ask-for-password.patch
new file mode 100644
index 0000000..e442cf1
--- /dev/null
+++ b/gnome-keyring-2.21.5-dont-ask-for-password.patch
@@ -0,0 +1,19 @@
+diff -up gnome-keyring-2.21.5/pam/gkr-pam-module.c.dont-ask-for-password gnome-keyring-2.21.5/pam/gkr-pam-module.c
+--- gnome-keyring-2.21.5/pam/gkr-pam-module.c.dont-ask-for-password	2008-01-28 11:53:45.000000000 -0500
++++ gnome-keyring-2.21.5/pam/gkr-pam-module.c	2008-01-28 11:53:55.000000000 -0500
+@@ -775,6 +775,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
+ 		
+ 	/* Look up the password */
+ 	ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password);
++#if 0
+ 	if (ret != PAM_SUCCESS || password == NULL) {
+ 		ret = prompt_password (ph);
+ 		if (ret != PAM_SUCCESS) {
+@@ -789,6 +790,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
+ 			return PAM_AUTHTOK_RECOVER_ERR;
+ 		}
+ 	}
++#endif
+ 
+ 
+ 	started_daemon = 0;
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index bccd852..707c147 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -8,7 +8,7 @@
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
 Version: 2.21.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.21/gnome-keyring-%{version}.tar.bz2
@@ -33,6 +33,9 @@ Requires(post): GConf2
 # RH #429097 / GNOME #502603
 Patch0: gnome-keyring-2.21.5-race-condition.patch
 
+#
+Patch1: gnome-keyring-2.21.5-dont-ask-for-password.patch
+
 %description
 gnome-keyring manages passwords and other types of secrets
 for the user, storing them encrypted with a main password.
@@ -71,6 +74,7 @@ and start the keyring daemon.
 %prep
 %setup -q -n gnome-keyring-%{version}
 %patch0 -p1 -b .race-condition
+%patch1 -p1 -b .dont-ask-for-password
 
 %build
 aclocal
@@ -139,6 +143,9 @@ fi
 
 
 %changelog
+* Mon Jan 28 2008 Ray Strode <rstrode@redhat.com> - 2.21.5-3
+- Don't ask for a password...ever (bug 430525)
+
 * Mon Jan 21 2008 Matthew Barnes  <mbarnes@redhat.com> - 2.21.5-2
 - Fix a race condition that was causing Evolution to hang (#429097)