diff --git a/ChangeLog b/ChangeLog
index 60d3f9d82..9ab2ea19b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAptMailNotification.[hm]: work on
+	iCalEntityObject instances instead of just iCalEvent's.
+
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
 	([SOGoAppointmentFolder
 	-fetchFields:_fieldsfromFolder:_folderfrom:_startDateto:_endDatecomponent:_component]): set ownership of returned records by adding an "owner" key to the resulting dictionaries.
diff --git a/SoObjects/Appointments/SOGoAptMailNotification.h b/SoObjects/Appointments/SOGoAptMailNotification.h
index e7c92be6d..934571757 100644
--- a/SoObjects/Appointments/SOGoAptMailNotification.h
+++ b/SoObjects/Appointments/SOGoAptMailNotification.h
@@ -25,7 +25,7 @@
 #include <NGObjWeb/SoComponent.h>
 
 @class NSString, NSTimeZone, NSCalendarDate;
-@class iCalEvent;
+@class iCalEntityObject;
 
 /*
  * NOTE: We inherit from SoComponent in order to get the correct
@@ -33,8 +33,8 @@
  */
 @interface SOGoAptMailNotification : SoComponent
 {
-  iCalEvent* oldApt;
-  iCalEvent* newApt;
+  iCalEntityObject* oldApt;
+  iCalEntityObject* newApt;
   NSString *homePageURL;
   NSTimeZone *viewTZ;
   NSCalendarDate *oldStartDate;
@@ -43,13 +43,13 @@
 }
 
 - (id) oldApt;
-- (void) setOldApt: (iCalEvent *) _oldApt;
+- (void) setOldApt: (iCalEntityObject *) _oldApt;
 
 - (id) newApt;
-- (void) setNewApt: (iCalEvent *) _newApt;
+- (void) setNewApt: (iCalEntityObject *) _newApt;
 
 - (NSString *)homePageURL;
-- (void)setHomePageURL:(NSString *)_homePageURL;
+- (void)setHomePageURL: (NSString *)_homePageURL;
 
 - (NSTimeZone *)viewTZ;
 - (void)setViewTZ:(NSTimeZone *)_viewTZ;
diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m
index 1ed6b36e1..bba1ef46c 100644
--- a/SoObjects/Appointments/SOGoAptMailNotification.m
+++ b/SoObjects/Appointments/SOGoAptMailNotification.m
@@ -19,7 +19,7 @@
   02111-1307, USA.
 */
 
-#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalEntityObject.h>
 
 #import "SOGoAptMailNotification.h"
 #import "common.h"
@@ -58,7 +58,7 @@ static NSTimeZone     *EST = nil;
 - (id)oldApt {
   return self->oldApt;
 }
-- (void)setOldApt:(iCalEvent *)_oldApt {
+- (void)setOldApt:(iCalEntityObject *)_oldApt {
   ASSIGN(self->oldApt, _oldApt);
 }
 
@@ -66,7 +66,7 @@ static NSTimeZone     *EST = nil;
   return self->newApt;
 }
 
-- (void)setNewApt:(iCalEvent *) _newApt
+- (void)setNewApt:(iCalEntityObject *) _newApt
 {
   ASSIGN(self->newApt, _newApt);
 }