diff --git a/changelogs/CHANGELOG-v2.13.rst b/changelogs/CHANGELOG-v2.13.rst
index 0d4662cec90..e22493cb4e4 100644
--- a/changelogs/CHANGELOG-v2.13.rst
+++ b/changelogs/CHANGELOG-v2.13.rst
@@ -5,22 +5,28 @@ ansible-core 2.13 "Nobody's Fault but Mine" Release Notes
 .. contents:: Topics
 
 
-v2.13.6rc1
-==========
+v2.13.6
+=======
 
 Release Summary
 ---------------
 
-| Release Date: 2022-10-31
+| Release Date: 2022-11-07
 | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
 
 
+Minor Changes
+-------------
+
+- ansible-test - Improve consistency of version specific documentation links.
+
 Bugfixes
 --------
 
 - BSD network facts - Do not assume column indexes, look for ``netmask`` and ``broadcast`` for determining the correct columns when parsing ``inet`` line (https://github.com/ansible/ansible/issues/79117)
 - ansible-galaxy - make initial call to Galaxy server on-demand only when installing, getting info about, and listing roles.
 - ansible-test - Add ``wheel < 0.38.0`` constraint for Python 3.6 and earlier.
+- ansible-test - Fix broken documentation link for ``aws`` test plugin error messages.
 - copy module will no longer move 'non files' set as src when remote_src=true.
 - file lookup now handles missing files more gracefully.
 - service_facts - Use python re to parse service output instead of grep (https://github.com/ansible/ansible/issues/78541)
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index b2f12fb2da4..68d93c8916b 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1097,6 +1097,23 @@ releases:
     - plugin_loader_fix.yml
     - v2.13.5rc1_summary.yaml
     release_date: '2022-10-03'
+  2.13.6:
+    changes:
+      bugfixes:
+      - ansible-test - Fix broken documentation link for ``aws`` test plugin error
+        messages.
+      minor_changes:
+      - ansible-test - Improve consistency of version specific documentation links.
+      release_summary: '| Release Date: 2022-11-07
+
+        | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+        '
+    codename: Nobody's Fault but Mine
+    fragments:
+    - ansible-test-docs-links.yml
+    - v2.13.6_summary.yaml
+    release_date: '2022-11-07'
   2.13.6rc1:
     changes:
       bugfixes:
diff --git a/changelogs/fragments/v2.13.6_summary.yaml b/changelogs/fragments/v2.13.6_summary.yaml
new file mode 100644
index 00000000000..303516d4d9d
--- /dev/null
+++ b/changelogs/fragments/v2.13.6_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2022-11-07
+   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 04659305587..cf3d078aa7e 100644
--- a/lib/ansible/release.py
+++ b/lib/ansible/release.py
@@ -19,6 +19,6 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-__version__ = '2.13.6rc1.post0'
+__version__ = '2.13.6'
 __author__ = 'Ansible, Inc.'
 __codename__ = "Nobody's Fault but Mine"