diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91468945c6..600066762d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,6 @@ Changelog
 
 vNext
 ------
-
 (Add your change to a random empty line to avoid merge conflicts)
 - 
 - 
@@ -14,23 +13,25 @@ vNext
 - 
 - 
 - 
-- Add experimental checkpoint policy argument. See `flax.linen.checkpoint`
-- 
 - 
 - 
 - 
 - 
-- Add lifted versions of jvp and vjp.
-- 
-- 
-- 
-- 
-- Add lifted transformation for mapping variables. See `flax.linen.map_variables`.
 - 
 - 
 - 
 
 
+0.3.6
+------
+Breaking changes:
+- Move `flax.nn` to `flax.deprecated.nn`.
+
+New features:
+- Add experimental checkpoint policy argument. See `flax.linen.checkpoint`
+- Add lifted versions of jvp and vjp.
+- Add lifted transformation for mapping variables. See `flax.linen.map_variables`.
+
 
 0.3.5
 ------
diff --git a/flax/version.py b/flax/version.py
index 6663b8b024..4d7595bae3 100644
--- a/flax/version.py
+++ b/flax/version.py
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.3.5"
+__version__ = "0.3.6"