diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml
index aeafc1929..f419ac393 100644
--- a/Documentation/docinfo.xml
+++ b/Documentation/docinfo.xml
@@ -1,7 +1,7 @@
-Version 2.3.5 - January 2016
-for version 2.3.5
-2016-01-05
+Version 2.3.6 - January 2016
+for version 2.3.6
+2016-01-18
Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".
diff --git a/Documentation/includes/global-attributes.asciidoc b/Documentation/includes/global-attributes.asciidoc
index e32a7d9f0..eb75231ad 100644
--- a/Documentation/includes/global-attributes.asciidoc
+++ b/Documentation/includes/global-attributes.asciidoc
@@ -13,6 +13,6 @@
// TODO have the build system take care of this
-:release_version: 2.3.5
+:release_version: 2.3.6
// vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:
diff --git a/NEWS b/NEWS
index 3612f2c2f..2d02d5718 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-2.3.6 (2016-01-XX)
+2.3.6 (2016-01-18)
------------------
New features
- now able to sync only default mail folders when using EAS
Enhancements
- - Unit testing for RTFHandler
+ - unit testing for RTFHandler
- JUnit output for sogo-tests
Bug fixes
diff --git a/Version b/Version
index 447b58a47..e7037356d 100644
--- a/Version
+++ b/Version
@@ -4,4 +4,4 @@
MAJOR_VERSION=2
MINOR_VERSION=3
-SUBMINOR_VERSION=5
+SUBMINOR_VERSION=6