diff --git a/ChangeLog b/ChangeLog
index 8b541b6a5..a8cb23846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,48 @@ Please check [doc/1-about.md].
 
 ## What's New
 
+### What's New in Version 2.3.6
+
+#### Changes
+
+* Require openssl1 on sles11sp3 from Security Module repository
+  * Bug in SLES 11's OpenSSL version 0.9.8j preventing verification of generated certificates.
+  * Re-create these certificates with 2.3.6 linking against openssl1 (cli command or CSR auto-signing).
+* ITL: Add ldap, ntp_peer, mongodb and elasticsearch CheckCommand definitions
+* Bugfixes
+
+#### Features
+
+* Feature 6714: add pagerduty notification documentation
+* Feature 9172: Add "ldap" CheckCommand for "check_ldap" plugin
+* Feature 9191: Add "mongodb" CheckCommand definition
+* Feature 9415: Add elasticsearch checkcommand to itl
+* Feature 9416: snmpv3 CheckCommand: Add possibility to set securityLevel
+* Feature 9451: Merge documentation fixes from GitHub
+* Feature 9523: Add ntp_peer CheckCommand
+* Feature 9562: Add new options for ntp_time CheckCommand
+* Feature 9578: new options for smtp CheckCommand
+
+#### Bugfixes
+
+* Bug 9205: port empty when using icinga2 node wizard
+* Bug 9253: Incorrect variable name in the ITL
+* Bug 9303: Missing 'snmp_is_cisco' in Manubulon snmp-memory command definition
+* Bug 9436: Functions can't be specified as command arguments
+* Bug 9450: node setup: indent accept_config and accept_commands
+* Bug 9452: Wrong file reference in README.md
+* Bug 9456: Windows client w/ command_endpoint broken with $nscp_path$ and NscpPath detection
+* Bug 9463: Incorrect check_ping.exe parameter in the ITL
+* Bug 9476: Documentation for checks in an HA zone is wrong
+* Bug 9481: Fix stability issues in the TlsStream/Stream classes
+* Bug 9489: Add log message for discarded cluster events (e.g. from unauthenticated clients)
+* Bug 9490: Missing openssl verify in cluster troubleshooting docs
+* Bug 9513: itl/plugins-contrib.d/*.conf should point to PluginContribDir
+* Bug 9522: wrong default port documentated for nrpe
+* Bug 9549: Generated certificates cannot be verified w/ openssl 0.9.8j on SLES 11
+* Bug 9558: mysql-devel is not available in sles11sp3
+* Bug 9563: Update getting started for Debian Jessie
+
 ### What's New in Version 2.3.5
 
 #### Changes
diff --git a/doc/1-about.md b/doc/1-about.md
index bddb16972..142e10865 100644
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -54,6 +54,48 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/).
 
 ## <a id="whats-new"></a> What's New
 
+### What's New in Version 2.3.6
+
+#### Changes
+
+* Require openssl1 on sles11sp3 from Security Module repository
+  * Bug in SLES 11's OpenSSL version 0.9.8j preventing verification of generated certificates.
+  * Re-create these certificates with 2.3.6 linking against openssl1 (cli command or CSR auto-signing).
+* ITL: Add ldap, ntp_peer, mongodb and elasticsearch CheckCommand definitions
+* Bugfixes
+
+#### Features
+
+* Feature [6714](https://dev.icinga.org/issues/6714 "Feature 6714"): add pagerduty notification documentation
+* Feature [9172](https://dev.icinga.org/issues/9172 "Feature 9172"): Add "ldap" CheckCommand for "check_ldap" plugin
+* Feature [9191](https://dev.icinga.org/issues/9191 "Feature 9191"): Add "mongodb" CheckCommand definition
+* Feature [9415](https://dev.icinga.org/issues/9415 "Feature 9415"): Add elasticsearch checkcommand to itl
+* Feature [9416](https://dev.icinga.org/issues/9416 "Feature 9416"): snmpv3 CheckCommand: Add possibility to set securityLevel
+* Feature [9451](https://dev.icinga.org/issues/9451 "Feature 9451"): Merge documentation fixes from GitHub
+* Feature [9523](https://dev.icinga.org/issues/9523 "Feature 9523"): Add ntp_peer CheckCommand
+* Feature [9562](https://dev.icinga.org/issues/9562 "Feature 9562"): Add new options for ntp_time CheckCommand
+* Feature [9578](https://dev.icinga.org/issues/9578 "Feature 9578"): new options for smtp CheckCommand
+
+#### Bugfixes
+
+* Bug [9205](https://dev.icinga.org/issues/9205 "Bug 9205"): port empty when using icinga2 node wizard
+* Bug [9253](https://dev.icinga.org/issues/9253 "Bug 9253"): Incorrect variable name in the ITL
+* Bug [9303](https://dev.icinga.org/issues/9303 "Bug 9303"): Missing 'snmp_is_cisco' in Manubulon snmp-memory command definition
+* Bug [9436](https://dev.icinga.org/issues/9436 "Bug 9436"): Functions can't be specified as command arguments
+* Bug [9450](https://dev.icinga.org/issues/9450 "Bug 9450"): node setup: indent accept_config and accept_commands
+* Bug [9452](https://dev.icinga.org/issues/9452 "Bug 9452"): Wrong file reference in README.md
+* Bug [9456](https://dev.icinga.org/issues/9456 "Bug 9456"): Windows client w/ command_endpoint broken with $nscp_path$ and NscpPath detection
+* Bug [9463](https://dev.icinga.org/issues/9463 "Bug 9463"): Incorrect check_ping.exe parameter in the ITL
+* Bug [9476](https://dev.icinga.org/issues/9476 "Bug 9476"): Documentation for checks in an HA zone is wrong
+* Bug [9481](https://dev.icinga.org/issues/9481 "Bug 9481"): Fix stability issues in the TlsStream/Stream classes
+* Bug [9489](https://dev.icinga.org/issues/9489 "Bug 9489"): Add log message for discarded cluster events (e.g. from unauthenticated clients)
+* Bug [9490](https://dev.icinga.org/issues/9490 "Bug 9490"): Missing openssl verify in cluster troubleshooting docs
+* Bug [9513](https://dev.icinga.org/issues/9513 "Bug 9513"): itl/plugins-contrib.d/*.conf should point to PluginContribDir
+* Bug [9522](https://dev.icinga.org/issues/9522 "Bug 9522"): wrong default port documentated for nrpe
+* Bug [9549](https://dev.icinga.org/issues/9549 "Bug 9549"): Generated certificates cannot be verified w/ openssl 0.9.8j on SLES 11
+* Bug [9558](https://dev.icinga.org/issues/9558 "Bug 9558"): mysql-devel is not available in sles11sp3
+* Bug [9563](https://dev.icinga.org/issues/9563 "Bug 9563"): Update getting started for Debian Jessie
+
 ### What's New in Version 2.3.5
 
 #### Changes
diff --git a/icinga2.nuspec b/icinga2.nuspec
index 92a2cde2a..754f52a00 100755
--- a/icinga2.nuspec
+++ b/icinga2.nuspec
@@ -6,7 +6,7 @@
     <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
     <id>icinga2</id>
     <title>Icinga2</title>
-    <version>2.3.5</version>
+    <version>2.3.6</version>
     <authors>2015 - The Icinga Project</authors>
     <owners>Icinga Development Team</owners>
     <summary>icinga2 - Monitoring Agent for Windows</summary>
diff --git a/icinga2.spec b/icinga2.spec
index b996138e8..fa6f68bcb 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.3.5
+Version: 2.3.6
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System
diff --git a/tools/chocolateyInstall.ps1 b/tools/chocolateyInstall.ps1
index 4986b6743..cfd163d1e 100755
--- a/tools/chocolateyInstall.ps1
+++ b/tools/chocolateyInstall.ps1
@@ -1,7 +1,7 @@
 $packageName = 'icinga2'
 $installerType = 'exe'
-$url = 'http://packages.icinga.org/windows/Icinga2-v2.3.5.exe'
+$url = 'http://packages.icinga.org/windows/Icinga2-v2.3.6.exe'
 $silentArgs = '/S'
 $validExitCodes = @(0)
 
-Install-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" -validExitCodes $validExitCodes
\ No newline at end of file
+Install-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" -validExitCodes $validExitCodes