diff --git a/build.properties.default b/build.properties.default
index 35cebee95c21..f768da204778 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M8-dev
+version.suffix=.M8
 
 # ----- 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 7874d6834b7d..c74c755cf186 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 9.0.0.M8" rtext="in development">
+<section name="Tomcat 9.0.0.M8">
   <subsection name="Coyote">
     <fix>
       Remove accidentally committed debug code. (markt)