diff --git a/ChangeLog b/ChangeLog
index 6405b737e..d747b426d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	corresponding fields to "". Also, we make sure those fake fields
 	are not specified in the SQL query and we ensure all the fields
 	are only requested once each.
+	(-davCalendarComponentSet): we need to retain the returned
+	array to avoid a crash during the next access to the attribute.
 
 2009-06-30  Cyril Robert <crobert@inverse.ca>
 
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index b3aa10786..7a6295296 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2252,6 +2252,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
                                   XMLNS_CALDAV,
                                   components)
                                  asWebDAVValue];
+      [componentSet retain];
     }
 
   return componentSet;