diff --git a/ChangeLog b/ChangeLog
index e714e3594..d8b930b4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* Main/sogod.m (main): initialize the NSTimeZone's defaultTimeZone
+	to the value of SOGoServerTimeZone or "Canada/Eastern" if not found.
+
 2006-10-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/SchedulerUI.js: added code to scroll the
diff --git a/Main/sogod.m b/Main/sogod.m
index 314a248ce..ab5c895f7 100644
--- a/Main/sogod.m
+++ b/Main/sogod.m
@@ -19,10 +19,16 @@
   02111-1307, USA.
 */
 
-#include <NGObjWeb/NGObjWeb.h>
-#include "common.h"
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSTimeZone.h>
 
-int main(int argc, char **argv, char **env) {
+#import <NGObjWeb/NGObjWeb.h>
+#import "common.h"
+
+int main(int argc, char **argv, char **env)
+{
+  NSString *tzName;
+  NSUserDefaults *ud;
   NSAutoreleasePool *pool;
 
   pool = [[NSAutoreleasePool alloc] init];
@@ -30,7 +36,13 @@ int main(int argc, char **argv, char **env) {
   [NSProcessInfo initializeWithArguments:argv count:argc environment:env];
 #endif
   [NGBundleManager defaultBundleManager];
-  
+
+  ud = [NSUserDefaults standardUserDefaults];
+  tzName = [ud stringForKey: @"SOGoServerTimeZone"];
+  if (!tzName)
+    tzName = @"Canada/Eastern";
+  [NSTimeZone setDefaultTimeZone: [NSTimeZone timeZoneWithName: tzName]];
+
   WOWatchDogApplicationMain(@"SOGo", argc, (void*)argv);
 
   [pool release];