diff --git a/CHANGELOG b/CHANGELOG
index e670d79d..4a51aa78 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 CHANGELOG
 =========
+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
diff --git a/src/Saml2/version.json b/src/Saml2/version.json
index 5db8ae85..2367ebec 100644
--- a/src/Saml2/version.json
+++ b/src/Saml2/version.json
@@ -1,7 +1,7 @@
 {
     "php-saml": {
-        "version": "3.6.0",
-        "released": "19/02/2021"
+        "version": "3.6.1",
+        "released": "02/03/2021"
     }
 }