diff --git a/changelogs/CHANGELOG-v2.5.rst b/changelogs/CHANGELOG-v2.5.rst
index 8062d94183c..bccf859745f 100644
--- a/changelogs/CHANGELOG-v2.5.rst
+++ b/changelogs/CHANGELOG-v2.5.rst
@@ -2,6 +2,42 @@
 Ansible 2.5 "Kashmir" Release Notes
 ===================================
 
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.8:
+
+v2.5.8
+======
+
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.8_Release Summary:
+
+Release Summary
+---------------
+
+| Release Date: 2018-08-16
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
+
+
+.. _Ansible 2.5 "Kashmir" Release Notes_v2.5.8_Bugfixes:
+
+Bugfixes
+--------
+
+- fix for the bundled selectors module (used in the ssh and local connection plugins) when a syscall is restarted after being interrupted by a signal (https://github.com/ansible/ansible/issues/41630)
+
+- Fix the mount module's handling of swap entries in fstab (https://github.com/ansible/ansible/pull/42837)
+
+- The fix for `CVE-2018-10875 <https://access.redhat.com/security/cve/cve-2018-10875>`_ prints out a warning message about skipping a config file from a world writable current working directory.  However, if the user explicitly specifies that the config file should be used via the ANSIBLE_CONFIG environment variable then Ansible would honor that but still print out the warning message.  This has been fixed so that Ansible honors the user's explicit wishes and does not print a warning message in that circumstance.
+
+- fact names that conflict with well-known connection vars are now filtered (https://github.com/ansible/ansible/issues/41684)
+
+- get_url - fix the bug that get_url does not change mode when checksum matches (https://github.com/ansible/ansible/issues/29614)
+
+- openvswitch_db - make 'key' argument optional https://github.com/ansible/ansible/issues/42108
+
+- slack callback - Fix invocation by looking up data from cli.options (https://github.com/ansible/ansible/pull/43542)
+
+- vars_prompt - properly template play level variables in vars_prompt (https://github.com/ansible/ansible/issues/37984)
+
+
 .. _Ansible 2.5 "Kashmir" Release Notes_v2.5.7:
 
 v2.5.7
diff --git a/changelogs/fragments/v2.5.8_summary.yaml b/changelogs/fragments/v2.5.8_summary.yaml
new file mode 100644
index 00000000000..545db4550f8
--- /dev/null
+++ b/changelogs/fragments/v2.5.8_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2018-08-16
+   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 67b2a3b8967..4b395f12dc5 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.5.7'
+__version__ = '2.5.8'
 __author__ = 'Ansible, Inc.'
 __codename__ = 'Kashmir'