diff --git a/share/xml/navibar.ent b/share/xml/navibar.ent
index 3562133589..716db442ae 100644
--- a/share/xml/navibar.ent
+++ b/share/xml/navibar.ent
@@ -75,14 +75,14 @@
   </ul>
 </div> <!-- SIDENAV -->'>
 
-<![ %beta.testing; [
+<![ %beta.upcoming; [
 <!ENTITY beta.listitem '
   <li xmlns="http://www.w3.org/1999/xhtml">Upcoming Release:<br /><a href="&enbase;/&u.betarel.schedule;">&betarel.current;</a></li>
 '>
 ]]>
 <!ENTITY beta.listitem ''>
 
-<![ %beta2.testing; [
+<![ %beta2.upcoming; [
 <!ENTITY beta2.listitem '
   <li xmlns="http://www.w3.org/1999/xhtml">Upcoming Release:<br /><a href="&u.betarel2.schedule;">&betarel2.current;</a></li>
 '>
diff --git a/share/xml/release.ent b/share/xml/release.ent
index f90c3dbfa1..98da2c8ba8 100644
--- a/share/xml/release.ent
+++ b/share/xml/release.ent
@@ -35,6 +35,7 @@
 
 <!-- Set to 'INCLUDE' when the schedule is available. -->
 <!ENTITY beta.upcoming "INCLUDE">
+<!ENTITY % beta.upcoming "INCLUDE">
 
 <!-- Set to 'INCLUDE' when the installation images are available. -->
 <!ENTITY beta.testing "INCLUDE">
@@ -48,6 +49,7 @@
 
 <!-- Set to 'INCLUDE' when the schedule is available. -->
 <!ENTITY beta2.upcoming "INCLUDE">
+<!ENTITY % beta2.upcoming "INCLUDE">
 
 <!-- Set to 'INCLUDE' when the installation images are available. -->
 <!ENTITY beta2.testing "INCLUDE">