diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 1f31beb1..a459c4b8 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -13,6 +13,8 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co
 
 == Unreleased
 
+== 2.5.8 (2023-04-15)
+
 Improvement::
 
 * Add 'standalone' option, deprecates 'headerFooter' (#1160) (@abelsromero)
@@ -21,6 +23,7 @@ Improvement::
 Bug Fixes::
 
 * Fix destinationDir not having effect. Deprecate destinationDir in favour of toDir (#853, #941) (@abelsromero)
+* Fix ConcurrentModificationException when converting to stream concurrently (#1158) (@rocketraman)
 
 == 2.5.7 (2022-10-21)
 
@@ -30,9 +33,6 @@ Improvement::
 * Upgrade to asciidoctorj-diagram 2.2.4 (#1140)
 * Upgrade to jruby 9.3.10.0 (#1138) (@alexlevinfr)
 
-Bug Fixes::
-
-* Fix ConcurrentModificationException when converting to stream concurrently (#1158) (@rocketraman)
 
 Build / Infrastructure::
 
diff --git a/gradle.properties b/gradle.properties
index 82ca4703..2059ecf2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-version=2.5.8-SNAPSHOT
+version=2.5.8
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m