diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ad8398f..fc34ee5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## [v3.6] - [Unreleased]
+## [v3.6] - 2018-06-02
 ### Fixed
 - PHP 7 support
 - Add exceptions catches
diff --git a/core/messages.py b/core/messages.py
index fe10610a..1370e6d1 100644
--- a/core/messages.py
+++ b/core/messages.py
@@ -1,4 +1,4 @@
-version = '3.5'
+version = '3.6'
 
 class generic:
     file_s_not_found = "File '%s' not found"