diff --git a/CHANGELOG.md b/CHANGELOG.md
index c04dd3f..73da715 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [3.6.0](https://github.com/crowbar/crowbar-client/releases/tag/v3.6.0) - 2018-06-19
+
+* BUGFIX
+  * Fix node show help (bsc#1024498)
+* ENHANCEMENT
+  * Extend the clean restart flags
+  * Add an option to identify the version of product being upgraded
+  * Added support for postpone/resume upgrade actions
+
 ## [3.5.2](https://github.com/crowbar/crowbar-client/releases/tag/v3.5.2) - 2018-01-09
 
 * BUGFIX
diff --git a/lib/crowbar/client/version.rb b/lib/crowbar/client/version.rb
index d859084..3dee6d4 100644
--- a/lib/crowbar/client/version.rb
+++ b/lib/crowbar/client/version.rb
@@ -28,12 +28,12 @@ class Version
       #
       # Minor version
       #
-      MINOR = 5
+      MINOR = 6
 
       #
       # Patch version
       #
-      PATCH = 2
+      PATCH = 0
 
       #
       # Optional suffix