diff --git a/en_US.ISO8859-1/htdocs/where.xml b/en_US.ISO8859-1/htdocs/where.xml
index 85965d573f..d6f22baa09 100644
--- a/en_US.ISO8859-1/htdocs/where.xml
+++ b/en_US.ISO8859-1/htdocs/where.xml
@@ -84,6 +84,7 @@
 	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">powerpc</a></li>
 	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel.current;/">powerpc64</a></li>
 	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">sparc64</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel.current;/">aarch64</a></li>
 	    </ul>
 	  </td>
 	  <td>
@@ -91,14 +92,19 @@
 	      <li><a href="&url.rel;/VM-IMAGES/README.txt">README</a></li>
 	      <li><a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/amd64/Latest/">amd64</a></li>
 	      <li><a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/i386/Latest/">i386</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/aarch64/Latest/">aarch64</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-BANANAPI.img.xz">BANANAPI</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-RPI2.img.xz">RPI2</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
 	    </ul>
@@ -118,6 +124,61 @@
     </table>
     <br />
 
+    <a name="download-rel0"></a>
+
+    <h1>&os; &rel0.current;-RELEASE</h1>
+
+    <table class="tblbasic tblwide tbldownload">
+      <tbody>
+	<tr>
+	  <th>Installer Images</th>
+	  <th>Virtual Machine Images</th>
+	  <th>SD Card Images</th>
+	  <th>Documentation</th>
+	</tr>
+	<tr>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel0.current;/">amd64</a></li>
+	      <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel0.current;/">i386</a></li>
+	      <li><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel0.current;/">ia64</a></li>
+	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel0.current;/">powerpc</a></li>
+	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel0.current;/">powerpc64</a></li>
+	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel0.current;/">sparc64</a></li>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <li><a href="&url.rel;/VM-IMAGES/README.txt">README</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&rel0.current;-RELEASE/amd64/Latest/">amd64</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&rel0.current;-RELEASE/i386/Latest/">i386</a></li>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdocslist">
+	      <li><a href="&base;/releases/index.html#current">Released</a>: &rel.current.date;</li>
+	      <li><a href="&u.rel.notes;">Release Notes</a></li>
+	      <li><a href="&u.rel.hardware;">Hardware Compatibility List</a></li>
+	      <li><a href="&u.rel.installation;">Installation Instructions</a></li>
+	      <li><a href="&u.rel.errata;">Errata</a></li>
+	      <li><a href="&u.rel.signatures;">Signed Checksums</a></li>
+	    </ul>
+	  </td>
+	</tr>
+      </tbody>
+    </table>
+    <br />
+
     <a name="download-rel1"></a>
 
     <h1>&os; &rel1.current;-RELEASE</h1>
diff --git a/share/xml/navibar.ent b/share/xml/navibar.ent
index 83e94f8112..5f3cb3bfd0 100644
--- a/share/xml/navibar.ent
+++ b/share/xml/navibar.ent
@@ -97,6 +97,8 @@
       <ul>
 	<li>Production Release: <br />
 	  <a href="&u.rel.announce;">&rel.current;</a></li>
+	<li>Production Release: <br />
+	  <a href="&u.rel0.announce;">&rel0.current;</a></li>
 	<li>Production Release: <br />
 	  <a href="&u.rel1.announce;">&rel1.current;</a></li>
 	<li>Production Release: <br />