diff --git a/ChangeLog b/ChangeLog
index b6b25b5de..3ce428515 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-03-25  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/Common/UIxPageFrame.m ([UIxPageFrame -siteFavicon]): new
+	method to allow the customization of the site favicon through the
+	user defaults SOGoFaviconRelativeURL.
+
 	* SoObjects/SOGo/SOGoUser.m ([SOGoUser -language]): must retain
 	the ivar language to avoid a crash if the language is retrieved
 	from the user agent header returned by the browser.
diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index e554fa22a..6f981ecb7 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index 47764de30..2175f07f7 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -21,6 +21,7 @@
 
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
+#import <Foundation/NSUserDefaults.h>
 
 #import <NGObjWeb/WOResourceManager.h>
 
@@ -31,8 +32,19 @@
 
 #import "UIxPageFrame.h"
 
+static NSString *siteFavicon = nil;
+
 @implementation UIxPageFrame
 
++ (void) initialize
+{
+  NSUserDefaults *ud;
+
+  ud = [NSUserDefaults standardUserDefaults];
+  siteFavicon = [ud stringForKey: @"SOGoFaviconRelativeURL"];
+  [siteFavicon retain];
+}
+
 - (id) init
 {
   if ((self = [super init]))
@@ -168,6 +180,11 @@
   return (isPopup ? @"popup" : @"main");
 }
 
+- (NSString *) siteFavicon
+{
+  return (!siteFavicon ? [self urlForResourceFilename: @"sogo.ico"] : siteFavicon);
+}
+
 /* page based JavaScript */
 
 - (NSString *) _stringsForFramework: (NSString *) framework
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index f3e4ca048..f60ed1e9b 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -21,7 +21,7 @@
 	<meta name="robots" content="stop" />
 	<meta name="build" var:content="buildDate" />
 	<link href="mailto:support@inverse.ca" rev="made" />
-	<link rel="shortcut icon" rsrc:href="sogo.ico" type="image/x-icon" />
+	<link rel="shortcut icon" var:href="siteFavicon" type="image/x-icon" />
 	<link type="text/css" rel="stylesheet" rsrc:href="generic.css" />
 	<link type="text/css" rel="stylesheet" rsrc:href="dtree.css" />
 	<var:if condition="hasProductSpecificCSS"