diff --git a/bnc-304835-ex-crash-after-restart.patch b/bnc-304835-ex-crash-after-restart.patch
new file mode 100644
index 0000000..932450e
--- /dev/null
+++ b/bnc-304835-ex-crash-after-restart.patch
@@ -0,0 +1,21 @@
+--- servers/exchange/lib/e2k-autoconfig.c~	2007-08-31 16:46:14.000000000 +0530
++++ servers/exchange/lib/e2k-autoconfig.c	2007-08-31 20:28:37.000000000 +0530
+@@ -342,7 +342,18 @@ void
+ e2k_autoconfig_set_creds (E2kAutoconfig *ac,
+						  E2kCreds      *creds)
+ {
++	char *username, *password, *authmech;
+	ac->creds = creds;
++	
++	authmech = creds->http_auth_method (creds);
++	creds->http_authenticate (creds, authmech, NULL, &username, &password);
++
++	e2k_autoconfig_set_username (ac, username);
++	e2k_autoconfig_set_password (ac, password);
++
++	/* FIXME: Verify all code paths return strdup'd values */
++	g_free (username);
++	g_free (password);
+ }
+ 
+ /*
diff --git a/evolution-data-server.changes b/evolution-data-server.changes
index 04a055c..bd29807 100644
--- a/evolution-data-server.changes
+++ b/evolution-data-server.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep  3 18:48:45 CEST 2007 - vvaradhan@novell.com
+
+- Fixes (BNC)
+	#304835 - Exchange crashes when restart
+	(Fix introduces a bug when user is running in smart-card 
+	environment that will popup a password dialog for accessing GAL.  
+	Without this fix, exchange is un-usable for all users (including 
+	smart-card and non-smart-card users).  Fix is being worked out 
+	for this regression. 
+
 -------------------------------------------------------------------
 Wed Aug 29 19:00:51 CEST 2007 - maw@suse.de
 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index b53b622..d379cd4 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -17,7 +17,7 @@ Group:          Development/Libraries/GNOME
 Autoreqprov:    on
 Summary:        Evolution Data Server
 Version:        1.11.91
-Release:        1
+Release:        3
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.11/%{name}-%{version}.tar.bz2
 #Patch3:       evolution-data-server-gcc4.patch
 Patch5:         evolution-data-server-configure.patch
@@ -107,6 +107,7 @@ Patch85:        bnc-167330-default-GW-alarms.patch
 Patch86:        eds-compiler-warning.patch
 Patch89:        bgo-369168-buffer-overrun.patch
 Patch90:        evolution-data-server-1.11.5-cert-auth-complete.patch
+Patch91:        bnc-304835-ex-crash-after-restart.patch
 # Change patch below if we move away from /opt/gnome
 # It avoids a build dependency on libgnomeui to speed up bootstrap
 Patch99:        libgnomeui-dep.patch
@@ -240,6 +241,7 @@ documentation.
 %patch86
 #%patch89
 %patch90
+%patch91
 %patch99 -p1
 
 %build
@@ -299,6 +301,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 03 2007 - vvaradhan@novell.com
+- Fixes (BNC)
+  [#304835] - Exchange crashes when restart
+  (Fix introduces a bug when user is running in smart-card
+  environment that will popup a password dialog for accessing GAL.
+  Without this fix, exchange is un-usable for all users (including
+  smart-card and non-smart-card users).  Fix is being worked out
+  for this regression.
 * Wed Aug 29 2007 - maw@suse.de
 - Update to version 1.11.91:
   + New debugging framework which can be controlled during runtime