diff --git a/en_US.ISO8859-1/share/xml/release.l10n.ent b/en_US.ISO8859-1/share/xml/release.l10n.ent
index e531408961..9807cd75f7 100644
--- a/en_US.ISO8859-1/share/xml/release.l10n.ent
+++ b/en_US.ISO8859-1/share/xml/release.l10n.ent
@@ -1,140 +1,140 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
 <![%beta2.testing;[
 <!ENTITY beta.plural 's'>
 ]]>
 <!ENTITY beta.plural ''>
 
 <![%beta2.testing;[
 <!ENTITY beta.second '
     <table xmlns="http://www.w3.org/1999/xhtml" class="tblbasic">
       <thead>
         <tr style="text-align: center;">
           <td colspan="2">Version &amp; Platform</td>
           <td>Distribution</td>
           <td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
           <td>TODO List</td>
         </tr>
       </thead>
       <tbody>
 
         <tr>
           <td colspan="2">FreeBSD &betarel2.current;-&betarel2.vers;</td>
           <td colspan="2"></td>
 
           <td><a href="&base;/releases/&betarel2.current;R/todo.html">[View]</a></td>
 
           <td rowspan="7"><a href="http://wiki.freebsd.org/Releng/7.4TODO">[View]</a></td>
         </tr>
         <tr>
           <td></td>
           <td>amd64<br/>(x86-64, x64)</td>
           <td><a href="&url.rel;/amd64/amd64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
           <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
         </tr>
         <tr>
           <td></td>
           <td>i386</td>
           <td><a href="&url.rel;/i386/i386/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
           <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
         </tr>
         <tr>
           <td></td>
           <td>ia64</td>
           <td><a href="&url.rel;/ia64/ia64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
           <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
         </tr>
         <tr>
           <td></td>
           <td>powerpc</td>
           <td><a href="&url.rel;/powerpc/powerpc/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
           <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
         </tr>
         <tr>
           <td></td>
           <td>powerpc64</td>
           <td><a href="&url.rel;/powerpc/powerpc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
           <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
         </tr>
         <tr>
           <td></td>
           <td>sparc64</td>
           <td><a href="&url.rel;/sparc64/sparc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
           <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
         </tr>
       </tbody>
     </table>
 '>
 ]]>
 <!ENTITY beta.second ''>
 
 
 <![%beta.testing;[
 <!ENTITY beta.desc '
   <div xmlns="http://www.w3.org/1999/xhtml">
     <a name="helptest"></a>
     <h2>Help With The Next FreeBSD Release&beta.plural;</h2>
 
     <p>Our developers and release engineers are working on the
       the next release&beta.plural; of FreeBSD; if you wish to help with testing,
       please download the latest build&beta.plural;.  Please note that these images
       are, by their very nature, intended for testing and should not
       be used in production environments.</p>
 
     <table class="tblbasic">
       <thead>
         <tr style="text-align: center;">
           <td colspan="2">Version &amp; Platform</td>
           <td>Distribution</td>
           <td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
 	  <!--<td>Status page</td>-->
         </tr>
       </thead>
       <tbody>
         <tr>
           <td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td>
           <td colspan="2"></td>
 	  <!--<td rowspan="7"><a href="http://wiki.freebsd.org/Releng/&betarel.current;TODO">[View]</a></td>-->
         </tr>
         <tr>
           <td></td>
           <td>amd64<br/>(x86-64, x64)</td>
-          <td><a href="&url.rel;/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
         </tr>
         <tr>
           <td></td>
           <td>i386</td>
-          <td><a href="&url.rel;/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
         </tr>
         <tr>
           <td></td>
           <td>pc98</td>
-          <td><a href="&url.rel;/pc98/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/pc98/pc98/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/pc98/pc98/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
         </tr>
 	<!--
         <tr>
           <td></td>
           <td>sparc64</td>
-          <td><a href="&url.rel;/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/sparc64/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
         </tr>
         <tr>
           <td></td>
           <td>powerpc64</td>
-          <td><a href="&url.rel;/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
         </tr>
 	-->
       </tbody>
     </table>
 
     &beta.second;
   </div>
 '>
 ]]>
 
 <!ENTITY beta.desc ''>