diff --git a/debian/changelog b/debian/changelog
index 9db2f7031..ac287b229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+box86 (0.3.6) unstable; urgency=low
+* Wrapping: More libs and and function wrapping (gtk3, vulkan...)
+* Reworked X11 Callback handling, for better stability
+* Reworked exit and the load/unload of libs
+* Some more profiles in box86rc
+* More SSE3+ opcodes in dynarec
+* Better way to rename executable (including wine ones) so driver like mesa can apply the correct profile
+* Lots of improvments in x87 handling (virtual stack, rounding, ffree, etc.)
+* => should improve games stability
+* Better handling of large block in the dynarec
+* => should speedup dynarec, and allow use of BIGBLOCK 2 or 3 on more software
+* Added suport for BOX86_DYNAREC_CALLRET optimisation.
+* => backported from box64, can give 10% or more speed increase (but can also decrease speed in some cases). Still a bit crashy so use with care.
+
+-- Sebastien Chevalier <ptitseb@box86.org>  Thu, 31 May 2024 17:30:33 -0100
+
 box86 (0.3.4) unstable; urgency=low
 
  * X86Libs: Updated libstdc++ & libgcc_s
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index b5058f672..834e93294 100755
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,3 +1,22 @@
+v0.3.6
+======
+* Wrapping: More libs and function wrapping (gtk3, vulkan...)
+* Reworked X11 Callback handling, for better stability
+* Reworked exit and the load/unload of libs
+* Some more profiles in box86rc
+* More SSE3+ opcodes in dynarec
+* Better way to rename executable (including wine ones) so driver like mesa can apply the correct profile
+* Better handling of the Hardware Counter and TSC emulation
+* Reworked memory managment in the Dynarec, limiting amount of dynamic allocation
+* PageSize detection and handling dynamic. Larger than 4K pagesize will be handled automaticaly. Note that box64 does not emulate 4K page size, so some program might still refuse to work on larger page (like Wine for example)
+=> Linux Games can now load even on a 16K pagesize machine like a mac M1, and games (including Unity3D ones) can be played with no issues.
+* Lots of improvments in x87 handling (virtual stack, rounding, ffree, etc.)
+=> should improve games stability
+* Better handling of large block in the dynarec
+=> should speedup dynarec, and allow use of BIGBLOCK 2 or 3 on more software
+* Added suport for BOX86_DYNAREC_CALLRET optimisation.
+=> backported from box64, can give 10% or more speed increase (but can also decrease speed in some cases). Still a bit crashy so use with care.
+
 v0.3.4
 ======
 * X86Libs: Updated libstdc++ & libgcc_s
diff --git a/src/box86version.h b/src/box86version.h
index c1a48ef0c..46944d0cd 100755
--- a/src/box86version.h
+++ b/src/box86version.h
@@ -3,6 +3,6 @@
 
 #define BOX86_MAJOR 0
 #define BOX86_MINOR 3
-#define BOX86_REVISION 5
+#define BOX86_REVISION 6
 
 #endif //__BOX86_VERSION_H_
\ No newline at end of file