diff --git a/build.properties.default b/build.properties.default
index 9a5016cb212e..d268c2d2937b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=15
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # ----- Build control flags -----
 # Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f60ff8f78835..a824364d447e 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.15 (markt)" rtext="in development">
+<section name="Tomcat 8.5.15 (markt)">
   <subsection name="General">
     <changelog>
       <add>