diff --git a/en_US.ISO8859-1/htdocs/where.xml b/en_US.ISO8859-1/htdocs/where.xml
index f04af9b1d0..1b91724cda 100644
--- a/en_US.ISO8859-1/htdocs/where.xml
+++ b/en_US.ISO8859-1/htdocs/where.xml
@@ -290,6 +290,7 @@
 	      <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>
+	      <li><a href="&url.snapshot;/riscv/riscv64/ISO-IMAGES/&rel.head;/">riscv64</a></li>
 	    </ul>
 	  </td>
 	  <td>
@@ -297,15 +298,26 @@
 	      <li><a href="&url.snapshot;/VM-IMAGES/&rel.head;-CURRENT/amd64/Latest/">amd64</a></li>
 	      <li><a href="&url.snapshot;/VM-IMAGES/&rel.head;-CURRENT/i386/Latest/">i386</a></li>
 	      <li><a href="&url.snapshot;/VM-IMAGES/&rel.head;-CURRENT/aarch64/Latest/">aarch64</a></li>
+	      <li><a href="&url.snapshot;/VM-IMAGES/&rel.head;-CURRENT/riscv64/Latest/">riscv64</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">GENERICSD</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;/arm64/aarch64/ISO-IMAGES/&rel.head;/">RPI3</a></li>
+	      <li>aarch64</li>
+	      <li><ul class="txtdownloadlist">
+		<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;/arm64/aarch64/ISO-IMAGES/&rel.head;/">RPI3</a></li>
+	      </ul></li>
+	      <li>armv6/armv7</li>
+	      <li><ul class="txtdownloadlist">
+		<li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">GENERICSD</a></li>
+		<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.head;/">RPI-B</a></li>
+	      </ul></li>
+	      <li>riscv64</li>
+	      <li><ul class="txtdownloadlist">
+		<li><a href="&url.snapshot;/riscv/riscv64/ISO-IMAGES/&rel.head;/">GENERICSD</a></li>
+	      </ul></li>
 	    </ul>
 	  </td>
 	  <td>