diff --git a/CHANGELOG b/CHANGELOG
index 87d955a8..27a4b2bd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,13 @@ CHANGELOG
 v4.0.0
 * Supports PHP 8.X
 
+v3.6.1
+* [#467](https://github.com/onelogin/php-saml/issues/467) Fix bug on getSelfRoutedURLNoQuery method
+
+v3.6.0
+* Add AES128_GCM encryption on generateNameId method. New setting parameter encryption_algorithm. If you set a encryption method different than AES128_CBC then the algorithm RSA_OAEP_MGF1P will be used as well instead RSA_1_5
+* PHP 8.0 support
+
 v3.5.1
 * 3.5.0 packagist/github release due a confusion were using the master (2.X branch). I'm releasing 3.5.1 to fix this issue and go back to 3.X branch
 
diff --git a/src/Saml2/version.json b/src/Saml2/version.json
index 0a50f8b8..220f250a 100644
--- a/src/Saml2/version.json
+++ b/src/Saml2/version.json
@@ -1,7 +1,7 @@
 {
     "php-saml": {
-        "version": "3.6.0-dev",
-        "released": "03/12/2020"
+        "version": "4.0.0",
+        "released": "02/03/2021"
     }
 }