diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1323319..a3d2fd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,13 @@
 
 ## Unreleased
 
-## 3.6.b5 - 2025-02-26
+## 3.6.0 - 2025-03-11
+
+### Changed
+
+- Update API for firmware 3.6.0. See upstream changelog for details.
+
+## 3.6.0b5 - 2025-02-26
 
 ### Changed
 
diff --git a/pyproject.toml b/pyproject.toml
index 9131e6e..81715b9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pybricks"
-version = "3.6.0b5"
+version = "3.6.0"
 description = "Documentation and user-API stubs for Pybricks MicroPython"
 authors = ["The Pybricks Authors <team@pybricks.com>"]
 maintainers = ["Laurens Valk <laurens@pybricks.com>", "David Lechner <david@pybricks.com>" ]