diff --git a/CHANGELOG.md b/CHANGELOG.md
index 324b35ba8e9..ded4fe274e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
-## [3.6] - TBD
+## [3.6] - 2024-09-09
+
+See the [release announcement](https://godotengine.org/article/godot-3-6-finally-released) for details.
 
 ### Added
 
@@ -2949,6 +2951,7 @@ See the [release announcement](https://godotengine.org/article/maintenance-relea
   - Only WebAssembly is supported now, since all browsers supporting WebGL 2.0 also support WebAssembly.
 
 
+[3.6]: https://downloads.tuxfamily.org/godotengine/3.5/Godot_v3.6-stable_changelog_chrono.txt
 [3.5]: https://downloads.tuxfamily.org/godotengine/3.5/Godot_v3.5-stable_changelog_chrono.txt
 [3.4]: https://downloads.tuxfamily.org/godotengine/3.4/Godot_v3.4-stable_changelog_chrono.txt
 [3.3]: https://downloads.tuxfamily.org/godotengine/3.3/Godot_v3.3-stable_changelog_chrono.txt
diff --git a/version.py b/version.py
index 2a6d0e3d2f2..c27211b1c20 100644
--- a/version.py
+++ b/version.py
@@ -3,7 +3,7 @@ name = "Godot Engine"
 major = 3
 minor = 6
 patch = 0
-status = "rc"
+status = "stable"
 module_config = ""
 year = 2024
 website = "https://godotengine.org"