diff --git a/ChangeLog b/ChangeLog
index ef507ef48..8fbba8079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-10-19  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* SoObjects/SOGo/NSCalendarDate+SOGo.m: lower the values of
+	secondsOfDistantFuture and secondsOfDistantPast to solve a problem
+	with 64bit environment.
+
 	* UI/Scheduler/UIxAppointmentEditor.m
 	(-startDateIsEqualToEndDate): new method that returns whether or
 	not the start date is identical to the end date (used for all-day events).
diff --git a/SoObjects/SOGo/NSCalendarDate+SOGo.m b/SoObjects/SOGo/NSCalendarDate+SOGo.m
index 46ac1f22c..e2df779bf 100644
--- a/SoObjects/SOGo/NSCalendarDate+SOGo.m
+++ b/SoObjects/SOGo/NSCalendarDate+SOGo.m
@@ -113,8 +113,9 @@ static NSString *rfc822Months[] = {@"", @"Jan", @"Feb", @"Mar", @"Apr",
 	      timeZoneShift];
 }
 
-#define secondsOfDistantFuture 63113990400.0
-#define secondsOfDistantPast -63113817600.0
+#define secondsOfDistantFuture 1073741823.0
+#define secondsOfDistantPast -1073741823.0
+
 
 + (id) distantFuture
 {