diff --git a/evolution-2.11.6.1-cal-busy-recursion.patch b/evolution-2.11.6.1-cal-busy-recursion.patch
new file mode 100644
index 0000000..8244527
--- /dev/null
+++ b/evolution-2.11.6.1-cal-busy-recursion.patch
@@ -0,0 +1,14 @@
+--- evolution-2.11.6.1/calendar/gui/e-cal-model.c~	2007-07-30 10:19:22.000000000 -0400
++++ evolution-2.11.6.1/calendar/gui/e-cal-model.c	2007-08-16 15:48:33.000000000 -0400
+@@ -1536,11 +1536,6 @@ cal_opened_cb (ECal *client, ECalendarSt
+ 	ECalModel *model = (ECalModel *) user_data;
+ 	ECalModelClient *client_data;
+ 
+-	if (status == E_CALENDAR_STATUS_BUSY) {
+-		e_cal_open_async (client, FALSE);
+-		return;
+-	}
+-	
+ 	if (status != E_CALENDAR_STATUS_OK) {
+ 		e_cal_model_remove_client (model, client);
+ 
diff --git a/evolution.changes b/evolution.changes
index de3d648..3163cd5 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 17 22:44:01 CEST 2007 - jberkman@novell.com
+
+- fix infinite recursion when used with smartcard auth patches
+
 -------------------------------------------------------------------
 Mon Aug  6 20:34:11 CEST 2007 - maw@suse.de
 
diff --git a/evolution.spec b/evolution.spec
index f000821..724138f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -18,7 +18,7 @@ Obsoletes:      evoltn
 Provides:       evoltn
 Autoreqprov:    on
 Version:        2.11.6.1
-Release:        5
+Release:        10
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 #Source:         ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2
 Source:         %{name}-%{version}.tar.bz2
@@ -57,6 +57,7 @@ Patch91:        evo-2.8.2-build-break.fix
 Patch92:        evo-2.8.2-regression-fix.patch
 Patch100:       abuild.patch
 #Patch101:       xsltproc-no-net.patch
+Patch102:       evolution-2.11.6.1-cal-busy-recursion.patch
 Patch999:       build-fixes.diff
 Patch1000:      evolution-stringcompare.patch
 URL:            http://gnome.org/projects/evolution/
@@ -312,6 +313,7 @@ Authors:
 # %patch92
 %patch100 -p1
 #%patch101 -p1
+%patch102 -p1
 %patch999
 %patch1000
 
@@ -438,6 +440,8 @@ fi
 %{_libdir}/evolution/*/conduits/*.so
 
 %changelog
+* Fri Aug 17 2007 - jberkman@novell.com
+- fix infinite recursion when used with smartcard auth patches
 * Mon Aug 06 2007 - maw@suse.de
 - Split off a -lang subpackage.
 * Sat Aug 04 2007 - aj@suse.de