diff --git a/docs/conf.py b/docs/conf.py
index ffbf40e3cc..3aca49155f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -24,7 +24,7 @@
 copyright = "2002-2022, Translate"
 
 # The short X.Y version.
-version = "3.5.3"
+version = "3.6.0"
 
 # The full version, including alpha/beta/rc tags
 release = version
diff --git a/docs/developers/releasing.rst b/docs/developers/releasing.rst
index 7d3335df17..cb81c96ca7 100644
--- a/docs/developers/releasing.rst
+++ b/docs/developers/releasing.rst
@@ -52,14 +52,14 @@ done generically like this:
 
 .. code-block:: console
 
-    $ git log $previous_version..HEAD > docs/releases/$version.rst
+    $ git log $(git describe --tags --abbrev=0)..HEAD > docs/releases/$version.rst
 
 
 Or a more specific example:
 
 .. code-block:: console
 
-    $ git log 1.10.0..HEAD > docs/releases/1.11.0-rc1.rst
+    $ git log $(git describe --tags --abbrev=0)..HEAD > docs/releases/3.6.0.rst
 
 
 Edit this file.  You can use the commits as a guide to build up the release
@@ -86,7 +86,7 @@ We create a list of contributors using this command:
 
 .. code-block:: console
 
-    $ git log 1.10.0..HEAD --format='%aN, ' | awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn | cut -d\  -f2-
+    $ git log $(git describe --tags --abbrev=0)..HEAD --format='%aN, ' | awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn | cut -d\  -f2-
 
 
 .. _releasing#up-version-numbers:
diff --git a/docs/releases/3.6.0.rst b/docs/releases/3.6.0.rst
new file mode 100644
index 0000000000..5ef0b94e83
--- /dev/null
+++ b/docs/releases/3.6.0.rst
@@ -0,0 +1,48 @@
+Translate Toolkit 3.6.0
+***********************
+
+*Released on 25 February 2022*
+
+This release contains improvements and bug fixes.
+
+Changes
+=======
+
+Formats and Converters
+----------------------
+
+- PO
+
+  - Fixed line wrapping with full width characters
+
+- JSON
+
+  - Improved nested files serialization and parsing
+
+- Properties
+
+  - Improved handling of [] in gwt
+
+- XLIFF
+
+  - Improved element cleanup on update
+
+- Base
+    
+  - Switch to charset-normalizer from chardet for more reliable detection
+
+General
+-------
+
+- Code cleanups
+- Dropped support for Python 3.6
+- Added support for Python 3.10
+- Cleanup of external links in the documentation
+
+Contributors
+============
+
+This release was made possible by the following people:
+
+Michal Čihař, Nick Schonning
+
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index 949f114119..a55806f274 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -17,6 +17,7 @@ Final releases
 .. toctree::
    :maxdepth: 1
 
+   3.6.0 <3.6.0>
    3.5.3 <3.5.3>
    3.5.2 <3.5.2>
    3.5.1 <3.5.1>
diff --git a/tests/cli/data/test_pofilter_manpage/stdout.txt b/tests/cli/data/test_pofilter_manpage/stdout.txt
index ae55f94ab0..913f243024 100644
--- a/tests/cli/data/test_pofilter_manpage/stdout.txt
+++ b/tests/cli/data/test_pofilter_manpage/stdout.txt
@@ -1,5 +1,5 @@
 .\" Autogenerated manpage
-.TH pofilter 1 "Translate Toolkit 3.5.3" "" "Translate Toolkit 3.5.3"
+.TH pofilter 1 "Translate Toolkit 3.6.0" "" "Translate Toolkit 3.6.0"
 .SH NAME
 pofilter \- Perform quality checks on Gettext PO, XLIFF and TMX localization files.
 .SH SYNOPSIS
diff --git a/translate/__version__.py b/translate/__version__.py
index 4522037364..e11fe9a4af 100644
--- a/translate/__version__.py
+++ b/translate/__version__.py
@@ -18,7 +18,7 @@
 
 """This file contains the version of the Translate Toolkit."""
 
-ver = (3, 5, 3)
+ver = (3, 6, 0)
 """Machine readable version number. Used by tools that need to adjust code
 paths based on a Translate Toolkit release number."""