diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 7a69a43..6aebd98 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -13,7 +13,7 @@
 %define eds_api_version 1.2
 
 %define use_gtk_doc 0
-
+%define use_gnome_keyring 1
 %define support_imap4_provider 0
 
 %define camel_provider_dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.11.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -213,6 +213,12 @@ if ! pkg-config --exists nss; then
 fi
 %endif
 
+%if %{use_gnome_keyring}
+%define keyring_flags --enable-gnome-keyring
+%else
+%define keyring flags --disable-gnome-keyring
+%endif
+
 %if %{support_imap4_provider}
 %define imap4_flags --enable-imap4=yes
 %else
@@ -259,7 +265,8 @@ CFLAGS="$CFLAGS \
 	--with-libdb=/usr \
 	--enable-file-locking=fcntl \
 	--enable-dot-locking=no \
-	%ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags
+	%ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags \
+	%keyring_flags
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -380,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon May 21 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.2-2.fc7
+- Store account passwords in GNOME Keyring.
+
 * Fri May 18 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.2-1.fc7
 - Update to 1.11.2
 - Bump eds_base_version to 1.12.