Tag 8.5.58
diff --git a/build.properties.default b/build.properties.default
index 2ad68c1..40be075 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@
 version.minor=5
 version.build=58
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # ----- Source control flags -----
 git.branch=8.5.x
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 600caa4..b578206 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-<section name="Tomcat 8.5.58 (markt)" rtext="in development">
+<section name="Tomcat 8.5.58 (markt)">
   <subsection name="Catalina">
     <changelog>
       <fix>