diff --git a/Apache/SOGo.conf b/Apache/SOGo.conf
index c5f2ffeee..f36fbbe8f 100644
--- a/Apache/SOGo.conf
+++ b/Apache/SOGo.conf
@@ -42,12 +42,13 @@ ProxyPreserveHost On
 
 ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 
-#
-# Enable to use Microsoft Active Sync support
-# Note that you MUST have many sogod workers to use Active Sync.
+# Enable to use Microsoft ActiveSync support
+# Note that you MUST have many sogod workers to use ActiveSync.
 # See the SOGo Installation and Configuration guide for more details.
 #
-#ProxyPass /Microsoft-Server-ActiveSync http://127.0.0.1:20000/SOGo/Microsoft-Server-ActiveSync retry=60 connectiontimeout=5 timeout=360
+#ProxyPass /Microsoft-Server-ActiveSync \
+# http://127.0.0.1:20000/SOGo/Microsoft-Server-ActiveSync \
+# retry=60 connectiontimeout=5 timeout=360
 
 <Proxy http://127.0.0.1:20000/SOGo>
 ## adjust the following to your configuration
@@ -67,7 +68,7 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
   Allow from all
 </Proxy>
 
-# For apple autoconfiguration
+# For Apple autoconfiguration
 <IfModule rewrite_module>
   RewriteEngine On
   RewriteRule ^/.well-known/caldav/?$ /SOGo/dav [R=301]
diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index a72c11dfb..f7dd2f676 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/Documentation/SOGo Mobile Devices Configuration.odt b/Documentation/SOGo Mobile Devices Configuration.odt
index f50348e19..bb85b0b93 100644
Binary files a/Documentation/SOGo Mobile Devices Configuration.odt and b/Documentation/SOGo Mobile Devices Configuration.odt differ
diff --git a/Documentation/SOGo Mozilla Thunderbird Configuration.odt b/Documentation/SOGo Mozilla Thunderbird Configuration.odt
index b47b7f312..5f73e81c1 100644
Binary files a/Documentation/SOGo Mozilla Thunderbird Configuration.odt and b/Documentation/SOGo Mozilla Thunderbird Configuration.odt differ
diff --git a/Documentation/SOGo Native Microsoft Outlook Configuration.odt b/Documentation/SOGo Native Microsoft Outlook Configuration.odt
index 316c99c59..944f3a64d 100644
Binary files a/Documentation/SOGo Native Microsoft Outlook Configuration.odt and b/Documentation/SOGo Native Microsoft Outlook Configuration.odt differ
diff --git a/Documentation/architecture.png b/Documentation/architecture.png
index 116059c9a..ef5cbf446 100644
Binary files a/Documentation/architecture.png and b/Documentation/architecture.png differ
diff --git a/Documentation/openchange.png b/Documentation/openchange.png
index 30e3df855..75c8f3036 100644
Binary files a/Documentation/openchange.png and b/Documentation/openchange.png differ
diff --git a/NEWS b/NEWS
index 8c4ea357b..a9e6fb41c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-2.1.2 (2014-01-XX)
+2.2.0 (2014-02-XX)
 ------------------
 
 New features
diff --git a/Scripts/updates.php b/Scripts/updates.php
index b49910cff..057d74353 100755
--- a/Scripts/updates.php
+++ b/Scripts/updates.php
@@ -28,22 +28,22 @@ $plugins
 = array(
         "sogo-connector@inverse.ca"
          => array( "application" => "thunderbird",
-                   "version" => "17.0.3",
-                   "filename" => "sogo-connector-17.0.3.xpi" ),
+                   "version" => "24.0.4",
+                   "filename" => "sogo-connector-24.0.4.xpi" ),
         "sogo-integrator@inverse.ca"
          => array( "application" => "thunderbird",
-                   "version" => "17.0.3",
-                   "filename" => "sogo-integrator-17.0.3.xpi" ),
+                   "version" => "24.0.4",
+                   "filename" => "sogo-integrator-24.0.4.xpi" ),
 	"{e2fda1a4-762b-4020-b5ad-a41df1933103}"
 	=> array( "application" => "thunderbird",
-		   "version" => "1.9",
-		   "filename" => "lightning-1.9.xpi" )
+		   "version" => "2.6.4",
+		   "filename" => "lightning-2.6.4.xpi" )
 );
 
 $applications
 = array( "thunderbird" => "<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-                <em:minVersion>17.0</em:minVersion>
-                <em:maxVersion>17.*</em:maxVersion>" );
+                <em:minVersion>24.0</em:minVersion>
+                <em:maxVersion>24.*</em:maxVersion>" );
 
 $pluginname = $_GET["plugin"];
 $plugin =& $plugins[$pluginname];
diff --git a/Version b/Version
index 2e7fd0f5a..f260ac612 100644
--- a/Version
+++ b/Version
@@ -3,5 +3,5 @@
 # of the executable.
 
 MAJOR_VERSION=2
-MINOR_VERSION=1
-SUBMINOR_VERSION=2
+MINOR_VERSION=2
+SUBMINOR_VERSION=0