diff --git a/en_US.ISO8859-1/htdocs/where.xml b/en_US.ISO8859-1/htdocs/where.xml
index d66c2d523c..26678f1239 100644
--- a/en_US.ISO8859-1/htdocs/where.xml
+++ b/en_US.ISO8859-1/htdocs/where.xml
@@ -275,8 +275,8 @@
 	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel.head;/">i386</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel.head;/">powerpc</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel.head;/">powerpc64</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpcspe/ISO-IMAGES/&rel.head;/">powerpcspe</a></li>
 	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel.head;/">sparc64</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.head;/">arm</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.head;/">armv6</a></li>
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">armv7</a></li>
 	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">aarch64</a></li>
@@ -296,9 +296,10 @@
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">CUBIEBOARD</a></li>
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">CUBIEBOARD2</a></li>
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">CUBOX/HUMMINGBOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.head;/">GUMSTIX</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">GENERICSD</a></li>
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">PANDABOARD</a></li>
 	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">PINE64</a></li>
+	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">PINE64-LTS</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.head;/">RPI-B</a></li>
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">RPI2</a></li>
 	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">RPI3</a></li>
@@ -334,7 +335,6 @@
 	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">powerpc</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel.current;/">powerpc64</a></li>
 	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">sparc64</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.current;/">arm</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">armv6</a></li>
 	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.current;/">aarch64</a></li>
 	    </ul>
@@ -353,7 +353,6 @@
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">CUBIEBOARD</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">CUBIEBOARD2</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">CUBOX/HUMMINGBOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.current;/">GUMSTIX</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">PANDABOARD</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">RPI2</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">RPI-B</a></li>
@@ -390,7 +389,6 @@
 	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel2.current;/">powerpc</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel2.current;/">powerpc64</a></li>
 	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel2.current;/">sparc64</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel2.current;/">arm</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">armv6</a></li>
 	    </ul>
 	  </td>
@@ -404,7 +402,6 @@
 	    <ul class="txtdownloadlist">
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">BEAGLEBONE</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">CUBOX/HUMMINGBOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel2.current;/">GUMSTIX</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">PANDABOARD</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">RPI-B</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">WANDBOARD</a></li>
diff --git a/en_US.ISO8859-1/share/xml/release.l10n.ent b/en_US.ISO8859-1/share/xml/release.l10n.ent
index 985f5268ce..56c21861ed 100644
--- a/en_US.ISO8859-1/share/xml/release.l10n.ent
+++ b/en_US.ISO8859-1/share/xml/release.l10n.ent
@@ -42,7 +42,6 @@
 	      <ul class="txtdownloadlist">
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
-		<li><a href="&url.rel;/arm/arm/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-GUMSTIX.img.xz">GUMSTIX</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
@@ -93,9 +92,11 @@
 	      <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">amd64</a></li>
 	      <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">i386</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/">armv6</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/">armv7</a></li>
 	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&betarel.current;/">aarch64</a></li>
 	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">powerpc</a></li>
 	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">powerpc64</a></li>
+	      <li><a href="&url.rel;/powerpc/powerpcspe/ISO-IMAGES/&betarel.current;/">powerpcspe</a></li>
 	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">sparc64</a></li>
 	    </ul>
 	  </td>
@@ -109,16 +110,19 @@
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-BANANAPI.img.xz">BANANAPI</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX/HUMMINGBOARD</a></li>
-	      <li><a href="&url.rel;/arm/arm/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-GUMSTIX.img.xz">GUMSTIX</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-RPI2.img.xz">RPI2</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-BANANAPI.img.xz">BANANAPI</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-CUBOX-HUMMINGBOARD.img.xz">CUBOX/HUMMINGBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-GENERICSD.img.xz">GENERICSD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-PANDABOARD.img.xz">PANDABOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-RPI2.img.xz">RPI2</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-WANDBOARD.img.xz">WANDBOARD</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm64-aarch64-PINE64-LTS.img.xz">PINE64-LTS</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm64-aarch64-PINE64.img.xz">PINE64</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm64-aarch64-RPI3.img.xz">RPI3</a></li>
 	    </ul>
 	  </td>
 	  <td>
@@ -129,8 +133,8 @@
 	      <?ignore
 	      <li><a href="&enbase;/releases/&betarel.current;R/installation.html">Installation Instructions</a></li>
 	      <li><a href="&enbase;/releases/&betarel.current;R/todo.html">TODO List</a></li>
-	      ?>
 	      <li><a href="&enbase;/releases/&betarel.current;R/signatures.html">Signed Checksums</a></li>
+	      ?>
 	      <li><a href="&enbase;/relnotes/11-STABLE/relnotes/article.html">Release Notes</a></li>
 	    </ul>
 	  </td>
diff --git a/share/xml/release.ent b/share/xml/release.ent
index 268d831955..ea8a96a7fb 100644
--- a/share/xml/release.ent
+++ b/share/xml/release.ent
@@ -35,7 +35,7 @@
 
 <!-- Set to 'INCLUDE' when the schedule is available. -->
 <!ENTITY beta.upcoming "INCLUDE">
-<!ENTITY % beta.upcoming "IGNORE">
+<!ENTITY % beta.upcoming "INCLUDE">
 
 <!-- Set to 'INCLUDE' when the installation images are available. -->
 <!ENTITY beta.testing "IGNORE">