diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92ed2f8ac8..277daf3098 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,22 @@ vNext
 -
 -
 
+0.6.4
+-----
+New features:
+- Our [ReadTheDoc](https://flax.readthedocs.io/en/latest/index.html) site is a lot more organized now! More improvements on the way.
+- Flax auto-SPMD parallelism API to work seamlessly with `jax.pjit`: https://flax.readthedocs.io/en/latest/guides/flax_on_pjit.html
+- Added new `zeros_init` and `ones_init` initializers.
+- Adds standardize initializer.
+- Allowed specifying method as a string.
+- Allowed runtime overwrite of `flax.config` flags.
+
+Bug fixes:
+- Added missing `dataclass.fields` from `__repr__`.
+- Renamed ConvLSTM to ConvLSTMCell.
+- Fix some tiny inconsistencies between scope.py and module.py.
+- Improved many many docstrings, comments and error messages.
+
 0.6.3
 -----
 New features:
diff --git a/README.md b/README.md
index 3159e27e14..75d8f6793a 100644
--- a/README.md
+++ b/README.md
@@ -191,8 +191,8 @@ To cite this repository:
   author = {Jonathan Heek and Anselm Levskaya and Avital Oliver and Marvin Ritter and Bertrand Rondepierre and Andreas Steiner and Marc van {Z}ee},
   title = {{F}lax: A neural network library and ecosystem for {JAX}},
   url = {http://github.com/google/flax},
-  version = {0.6.3},
-  year = {2020},
+  version = {0.6.4},
+  year = {2023},
 }
 ```
 
diff --git a/flax/version.py b/flax/version.py
index d9f1df5a5f..3d1039e94d 100644
--- a/flax/version.py
+++ b/flax/version.py
@@ -13,5 +13,5 @@
 # limitations under the License.
 
 """Current Flax version at head on Github."""
-__version__ = "0.6.3"
+__version__ = "0.6.4"