diff --git a/doc/xdocs/navigation.xml b/doc/xdocs/navigation.xml
index a2d4ee8723..dceadd0737 100644
--- a/doc/xdocs/navigation.xml
+++ b/doc/xdocs/navigation.xml
@@ -30,7 +30,7 @@
     <menu name="Overview">
       <item name="Home" href="index.html"/>
       <item name="Reference" href="reference.html"/>
-      <item name="Building" href="building.html"/>
+      <item name="Building and Maven Solutions" href="building.html"/>
       <item name="Downloads" href="downloads.html"/>
       <item name="Subprojects" href="projects-overview.html"/>
     </menu>
@@ -39,6 +39,13 @@
       <item name="Core" href="multiproject/acegi-security/index.html"/>
     </menu>
 
+    <menu name="Upgrade Help">
+      <item name="Upgrading to 0.7.0" href="upgrade/upgrade-06-070.html"/>
+      <item name="Upgrading to 0.6" href="upgrade/upgrade-05-06.html"/>
+      <item name="Upgrading to 0.5" href="upgrade/upgrade-04-05.html"/>
+      <item name="Upgrading to 0.4" href="upgrade/upgrade-03-04.html"/>
+    </menu>
+
     <menu name="Adapters">
       <item name="CAS" href="multiproject/acegi-security-cas/index.html"/>
       <item name="Catalina" href="multiproject/acegi-security-catalina/index.html"/>
diff --git a/doc/xdocs/upgrade/upgrade-06-07.html b/doc/xdocs/upgrade/upgrade-06-070.html
similarity index 100%
rename from doc/xdocs/upgrade/upgrade-06-07.html
rename to doc/xdocs/upgrade/upgrade-06-070.html