diff --git a/passwd-0.75-gnome-keyring.patch b/passwd-0.75-gnome-keyring.patch
new file mode 100644
index 0000000..bee1530
--- /dev/null
+++ b/passwd-0.75-gnome-keyring.patch
@@ -0,0 +1,10 @@
+diff -up passwd-0.75/passwd.pamd.gnome-keyring passwd-0.75/passwd.pamd
+--- passwd-0.75/passwd.pamd.gnome-keyring	2008-02-20 17:54:48.000000000 +0100
++++ passwd-0.75/passwd.pamd	2008-04-08 15:40:49.000000000 +0200
+@@ -1,4 +1,5 @@
+ #%PAM-1.0
+ auth       include	system-auth
+ account    include	system-auth
+-password   include	system-auth
++password   substack	system-auth
++password   optional	pam_gnome_keyring.so
diff --git a/passwd.spec b/passwd.spec
index d479105..f7fd903 100644
--- a/passwd.spec
+++ b/passwd.spec
@@ -7,11 +7,12 @@
 Summary: The passwd utility for setting/changing passwords using PAM
 Name: passwd
 Version: 0.75
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://fedorahosted.org/passwd
 Source: %{name}-%{version}.tar.bz2
+Patch1: passwd-0.75-gnome-keyring.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pam >= 0.78, /etc/pam.d/system-auth
 %if %{WITH_SELINUX}
@@ -33,6 +34,7 @@ To use passwd, you should have PAM installed on your system.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .gnome-keyring
 
 %build
 %configure \
@@ -66,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Tue Apr  8 2008 Tomas Mraz <tmraz@redhat.com> 0.75-2
+- add optional pam_gnome_keyring module to passwd pam config
+
 * Wed Feb 20 2008 Tomas Mraz <tmraz@redhat.com> 0.75-1
 - fix disabling SELinux and audit in spec (#433284)
 - remove obsolete no.po (#332121)