diff --git a/CHANGELOG.md b/CHANGELOG.md
index aeb68fbc32f..8f359d0f346 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+Paparazzi v6.3.0_stable
+=======================
+
+Stable version release v6.3.
+The main changes are the improvement of the modules dependency mananagement,
+an in-depth rewrite of the navigation/guidance layer for rotorcraft allowing
+a better integration of hybrid airframes, the support for STM32H7 and some new
+drivers, the rework of hardware in the loop (HITL) simulation
+and the replacement of legacy ocaml sim by a NPS-based version.
+
+- documentation (#2981) (#2980) (#2979) (#2978) (#2973) (#2972)
+- python plotter (#2997)
+- new navigation for rotorcraft (#2964) (#3004)(#3006) (#3108)
+- new boards with STM32H7 (#3001) (#3017) (#3199)
+- improve modules dependency algorithm (#3005) (#3009)
+- new navigation and sensors modules (#3010) (#3021) (#3039) (#3067) (#3074) (#3088) (#3077)
+- PyBullet backend for NPS (#3024)
+- Mavlink update to v2
+- Improvements to INDI stabilization and guidance
+
+And also many other improvements and corrections...
+
+
 Paparazzi v6.2.0_stable
 =======================
 
diff --git a/doc/sphinx/source/quickstart/install.rst b/doc/sphinx/source/quickstart/install.rst
index a89358396c2..a74ffbf1481 100644
--- a/doc/sphinx/source/quickstart/install.rst
+++ b/doc/sphinx/source/quickstart/install.rst
@@ -54,7 +54,7 @@ Clone the repository:
 
 .. code-block:: bash
 
-    git checkout -b v6.2 upstream/v6.2
+    git checkout -b v6.4 upstream/v6.3
 
 Get the submodules and build Paparazzi. This step might take a long time the first time you launch it:
 
diff --git a/paparazzi_version b/paparazzi_version
index 8e33ba4e5bc..52aef77201d 100755
--- a/paparazzi_version
+++ b/paparazzi_version
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEF_VER=v6.3_unstable
+DEF_VER=v6.4.0_stable
 
 # First try git describe (if running on a git repo),
 # then use default version from above (for release tarballs).