diff --git a/Apache/SOGo.conf b/Apache/SOGo.conf
index 5e835ecc0..d501ff92a 100644
--- a/Apache/SOGo.conf
+++ b/Apache/SOGo.conf
@@ -28,8 +28,14 @@ Alias /SOGO.woa/WebServerResources/ \
 AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
            /usr/GNUstep/System/Library/SOGo-0.9/$1.SOGo/Resources/$2
 
-<LocationMatch "^/SOGo*">
-  SetHandler ngobjweb-adaptor
-  SetAppPort 20000
-</LocationMatch>
+<Proxy balancer://sogocluster>
+  BalancerMember http://127.0.0.1:20000 retry=0 max=1 timeout=10
+  BalancerMember http://127.0.0.1:20001 retry=0 max=1 timeout=10
+  BalancerMember http://127.0.0.1:20001 retry=0 max=1 timeout=10
+  ProxySet lbmethod=byrequests maxattempts=1
+</Proxy>
 
+SetEnv force-proxy-request-1.0 1
+SetEnv proxy-nokeepalive 1
+ProxyRequests Off
+ProxyPass /SOGo balancer://sogocluster/SOGo
diff --git a/ChangeLog b/ChangeLog
index 0d31f1778..dd879535a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-01-22  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+        * Updated the Apache section in the installation
+	and configuration guide
+	* Apache/SOGo.conf
+	Updated to use mod_proxy and mod_proxy_balancer
+	instead of mod_ngobjweb. We now also distribute
+	requests across three sogod processes.
+	* sogo.spec
+	Removed mod_ngobjweb from the build dependancies
+
 2009-01-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index 17f4abcda..886fe00a9 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/Scripts/sogo-init.d-debian b/Scripts/sogo-init.d-debian
index 7b0e175e2..89f5d2efb 100755
--- a/Scripts/sogo-init.d-debian
+++ b/Scripts/sogo-init.d-debian
@@ -2,7 +2,7 @@
 
 # SOGo init script for Debian GNU/Linux
 #
-# Copyright (C) 2007 Inverse inc.
+# Copyright (C) 2007-2009 Inverse inc.
 #
 # Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 #         Ludovic Marcotte <ludovic@inverse.ca>
@@ -23,7 +23,7 @@
 # Boston, MA 02111-1307, USA.
 
 # specify more if you are using a load-balancer
-PREFORK=1
+PREFORK=3
 
 SOGO_ARGS=""
 
diff --git a/Scripts/sogo-init.d-redhat b/Scripts/sogo-init.d-redhat
index 7472c1f94..0c0813ea8 100755
--- a/Scripts/sogo-init.d-redhat
+++ b/Scripts/sogo-init.d-redhat
@@ -8,7 +8,7 @@
 
 # SOGo init script for RedHat
 #
-# Copyright (C) 2007-2008 Inverse inc.
+# Copyright (C) 2007-2009 Inverse inc.
 #
 # Authors: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 #          Francis Lachapelle <flachapelle@inverse.ca>
diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.m b/SoObjects/Appointments/SOGoAppointmentFolders.m
index 66c81d4f2..c64afa030 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolders.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolders.m
@@ -150,7 +150,6 @@
   return error;
 }
 
-#warning THIS CAUSES LIGHTNING TO FAIL (that is why its commented out)
 - (NSArray *) davComplianceClassesInContext: (id)_ctx
 {
   NSMutableArray *classes;
diff --git a/sogo.spec b/sogo.spec
index c3ca12bfd..6d181c9b7 100644
--- a/sogo.spec
+++ b/sogo.spec
@@ -10,7 +10,7 @@ Group:        Productivity/Groupware
 Source:       SOGo-%{sogo_version}.tar.gz
 Prefix:       %{sogo_prefix}
 AutoReqProv:  off
-Requires:     gnustep-base sope%{sope_major_version}%{sope_minor_version}-core httpd mod_ngobjweb sope%{sope_major_version}%{sope_minor_version}-core  sope%{sope_major_version}%{sope_minor_version}-appserver sope%{sope_major_version}%{sope_minor_version}-ldap sope%{sope_major_version}%{sope_minor_version}-cards sope%{sope_major_version}%{sope_minor_version}-gdl1-contentstore
+Requires:     gnustep-base sope%{sope_major_version}%{sope_minor_version}-core httpd sope%{sope_major_version}%{sope_minor_version}-core sope%{sope_major_version}%{sope_minor_version}-appserver sope%{sope_major_version}%{sope_minor_version}-ldap sope%{sope_major_version}%{sope_minor_version}-cards sope%{sope_major_version}%{sope_minor_version}-gdl1-contentstore
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}
 BuildPreReq:  gcc-objc gnustep-base gnustep-make sope%{sope_major_version}%{sope_minor_version}-appserver-devel sope%{sope_major_version}%{sope_minor_version}-core-devel sope%{sope_major_version}%{sope_minor_version}-ldap-devel sope%{sope_major_version}%{sope_minor_version}-mime-devel sope%{sope_major_version}%{sope_minor_version}-xml-devel sope%{sope_major_version}%{sope_minor_version}-gdl1-devel 
 %description