diff --git a/ChangeLog b/ChangeLog
index 5bd1d89bf..a1eaaa4f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-18  Ludovic Marcotte <lmarcotte@inverse.ca>
+
+        * Updated the documentation for the SOGo
+	update server.
+	* Enabled support for Konqueror. We use the
+	Safari 'exceptions' in the JavaScript code.
+	* Main/SOGo.m: Corrected a small mistake in previous
+	commit wrt sogod-0.9 > sogod change
+	* Updated the NEWS file for the release
+
 2009-03-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Contacts/SOGoContactLDIFEntry.m ([SOGoContactLDIFEntry
diff --git a/Documentation/SOGo Mozilla Thunderbird Configuration.odt b/Documentation/SOGo Mozilla Thunderbird Configuration.odt
index c52b66a32..3c6be357f 100644
Binary files a/Documentation/SOGo Mozilla Thunderbird Configuration.odt and b/Documentation/SOGo Mozilla Thunderbird Configuration.odt differ
diff --git a/Main/README b/Main/README
index 42b2b2b5d..78708cf05 100644
--- a/Main/README
+++ b/Main/README
@@ -53,7 +53,7 @@ Apache Setup
 ============
 
   AliasMatch /SOGoHH/so/ControlPanel/Products/(.*)/Resources/(.*) \
-             /home/helge/GNUstep/Library/SOGo/$1.SOGo/Resources/$2
+             /home/bob/GNUstep/Library/SOGo/$1.SOGo/Resources/$2
 
   <LocationMatch "^/SOGoHH*">
     AuthName "Agenor LDAP"
diff --git a/Main/SOGo.m b/Main/SOGo.m
index abf671bd8..5cff5c648 100644
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -80,7 +80,7 @@ static BOOL debugObjectAllocation = NO;
 
   NSLog(@"starting SOGo (build %@)", SOGoBuildDate);
   
-  if ([[ud persistentDomainForName: @"sogod-0.9"] count] == 0) 
+  if ([[ud persistentDomainForName: @"sogod"] count] == 0) 
     NSLog(@"WARNING: No configuration found. SOGo will not work properly.");
     
   doCrashOnSessionCreate = [ud boolForKey:@"SOGoCrashOnSessionCreate"];
diff --git a/NEWS b/NEWS
index 9681c7d42..8dfb2d775 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,14 @@
-1.0-2009XXYY
+1.0-20090317
 -----------
 - when double-clicking in the all-day zone (day & week views), the "All Day event" checkbox is now automatically checked
 - replaced the JavaScript FastInit class by the dom:loaded event of Prototype JS
-  
+- also updated Prototype JS to fix issues with IE7
+- improvements to the underlying SOGo cache infrastructure
+- many improvements to DST handling
+- better compatibility with nginx
+- new SOGo login screen
+- added MySQL support
+
 1.0-20090130 (1.0 rc9)
 ------------------
 - added quota indicator in web mail module
diff --git a/Scripts/updates.php b/Scripts/updates.php
index 079883e82..ae49476e9 100755
--- a/Scripts/updates.php
+++ b/Scripts/updates.php
@@ -1,7 +1,7 @@
 <?php
 /* updates.php - this file is part of SOGo
  *
- *  Copyright (C) 2006-2008 Inverse inc.
+ *  Copyright (C) 2006-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -26,16 +26,16 @@
 $plugins
 = array( "sogo-connector@inverse.ca"
          => array( "application" => "thunderbird",
-                   "version" => "0.67",
-                   "filename" => "sogo-connector-0.80.xpi" ),
+                   "version" => "0.92",
+                   "filename" => "sogo-connector-0.92.xpi" ),
 	 "sogo-integrator@inverse.ca"
 	 => array( "application" => "thunderbird",
-		   "version" => "0.67",
-		   "filename" => "sogo-integrator-0.80-sogo-demo.xpi" ),
+		   "version" => "0.92",
+		   "filename" => "sogo-integrator-0.92-sogo-demo.xpi" ),
 	 "{e2fda1a4-762b-4020-b5ad-a41df1933103}" 
 	 => array( "application" => "thunderbird",
-		   "version" => "0.8",
-		   "filename" => "lightning-0.8.xpi" ));
+		   "version" => "0.9.2",
+		   "filename" => "lightning-0.9.2.xpi" ));
 
 $applications
 = array( "thunderbird" => "<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index 8eda4fcda..47764de30 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -443,7 +443,8 @@
 	      && [cc majorVersion] >= 5)
 	  || ([[cc userAgentType] isEqualToString: @"Safari"]
 	      && [cc majorVersion] >= 4)
-	  //	  ([[cc userAgentType] isEqualToString: @"Konqueror"])
+	  || ([[cc userAgentType] isEqualToString: @"Konqueror"]
+	      && [cc majorVersion] >= 4)
 	   );
 }
 
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 2c61e992f..8c79e162a 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -431,7 +431,7 @@ function isSafari() {
 	//var agt = navigator.userAgent.toLowerCase();
 	//var is_safari = ((agt.indexOf('safari')!=-1)&&(agt.indexOf('mac')!=-1))?true:false;
 
-	return (navigator.vendor == "Apple Computer, Inc.");
+	return (navigator.vendor == "Apple Computer, Inc.") || (navigator.userAgent.toLowerCase().indexOf('konqueror') != -1);
 }
 
 function isHttpStatus204(status) {