21 files changed, 295 insertions, 201 deletions
diff --git a/_includes/downloads/alpha.html b/_includes/downloads/alpha.html
index 7ef09cb..1e3932d 100644
--- a/_includes/downloads/alpha.html
+++ b/_includes/downloads/alpha.html
@@ -12,7 +12,7 @@
 <div class="col-xs-12 col-md-6">
   <h4>Details (contents, hashes, and signatures)</h4>
   <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/alpha/autobuilds/current-install-alpha-minimal/">Minimal Installation CD</a></li>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/alpha/autobuilds/">All files</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/alpha/autobuilds/current-install-alpha-minimal/">Minimal Installation CD</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/alpha/autobuilds/">All files</a></li>
   </ul>
 </div>
diff --git a/_includes/downloads/amd64-advanced.html b/_includes/downloads/amd64-advanced.html
index 72fb7fe..1297e0a 100644
--- a/_includes/downloads/amd64-advanced.html
+++ b/_includes/downloads/amd64-advanced.html
@@ -1,4 +1,12 @@
 <div class="col-xs-12 col-md-6">
+  <h4>Processor compatibility</h4>
+  <div class="alert alert-info">
+    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
+    <p>
+      The <em>amd64</em> architecture is intended for use on AMD 64-bit CPUs as well as 64-bit <strong>Intel Pentium/Core/Xeon</strong> processors.
+    </p>
+  </div>
+  
   <h4>Boot media</h4>
   <div class="list-group">
     {% include partials/download-link.html type="iso" arch="amd64" id="minimal" title="Minimal Installation CD" %}
@@ -14,49 +22,45 @@
     {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-desktop-systemd" title="Stage 3" tag="desktop profile | systemd" %}
     {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-nomultilib-openrc" title="Stage 3" tag="no multilib | openrc" %}
     {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-nomultilib-systemd" title="Stage 3" tag="no multilib | systemd" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-clang-openrc" title="Stage 3" tag="clang | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-clang-systemd" title="Stage 3" tag="clang | systemd" %}
     {% include partials/download-link.html type="stage3" arch="amd64" id="x32-openrc" title="Stage 3" tag="x32 | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="x32-systemd" title="Stage 3" tag="x32 | systemd" %}
   </div>
 
-  <h4>Hardened stage archives</h4>
+  <h4>LLVM-based stage archives</h4>
   <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-openrc" title="Hardened stage 3" tag="openrc" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-nomultilib-openrc" title="Hardened stage 3" tag="no multilib | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-selinux-openrc" title="H/SELinux stage 3" tag="openrc" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-nomultilib-selinux-openrc" title="H/SELinux stage 3" tag="no multilib | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-llvm-openrc" title="Stage 3" tag="llvm | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-llvm-systemd" title="Stage 3" tag="llvm | systemd" %}
   </div>
 </div>
 <div class="col-xs-12 col-md-6">
-  <h4>Processor compatibility</h4>
-  <div class="alert alert-info">
-    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
-    <p>
-      The <em>amd64</em> architecture is intended for use on AMD 64-bit CPUs as well as 64-bit <strong>Intel Pentium/Core/Xeon</strong> processors.
-    </p>
+  <h4>Hardened stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-openrc" title="Hardened stage 3" tag="openrc" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-selinux-openrc" title="H/SELinux stage 3" tag="openrc" %}
   </div>
-  
+
   <h4>Musl stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-musl" title="Stage 3" tag="musl | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-musl-clang" title="Stage 3" tag="musl | clang | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-musl-llvm" title="Stage 3" tag="musl | llvm | openrc" %}
     {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-musl-hardened" title="Hardened stage 3" tag="musl | openrc" %}
   </div>
   <div class="alert alert-info">
-    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages: consider the musl overlay</strong>
+    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages</strong>
     <p>
-      While the core system packages within the stage files work fine in the main gentoo repository, 
-      musl-specific fixes for additional packages can be found in the <a href="https://gitweb.gentoo.org/proj/musl.git/">musl overlay</a>.
-      If you encounter problems, you may want to consider adding this overlay to your installation.
-      Instructions how to do so can be found, e.g., on the <a href="https://wiki.gentoo.org/wiki/Project:Hardened_musl">page 
-      of the Hardened musl project</a>. Please file bugs!
+      For additional information on using musl based Gentoo systems please see the <a href="https://wiki.gentoo.org/wiki/Musl_usage_guide">Musl usage guide</a>.
     </p>
   </div>
 
+  <h4>Split-usr stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-openrc-splitusr" title="Stage 3" tag="openrc | split-usr" %}
+  </div>
+
   <h4>Details (contents, hashes, and signatures)</h4>
   <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/current-install-amd64-minimal/">Minimal Installation CD</a></li>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/current-stage3-amd64-openrc/">Stage 3</a></li>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/">All stages</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/amd64/autobuilds/current-install-amd64-minimal/">Minimal Installation CD</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/amd64/autobuilds/current-stage3-amd64-openrc/">Stage 3</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/amd64/autobuilds/">All stages</a></li>
   </ul>
 </div>
diff --git a/_includes/downloads/amd64.html b/_includes/downloads/amd64.html
index 9752397..67d6307 100644
--- a/_includes/downloads/amd64.html
+++ b/_includes/downloads/amd64.html
@@ -14,6 +14,6 @@
 
 <h4>Details (contents, hashes, and signatures)</h4>
 <p>
-  <a href="https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/current-install-amd64-minimal/">Minimal Installation CD</a>,
-  <a href="https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/current-stage3-amd64-openrc/">Stage 3</a>
+  <a href="https://distfiles.gentoo.org/releases/amd64/autobuilds/current-install-amd64-minimal/">Minimal Installation CD</a>,
+  <a href="https://distfiles.gentoo.org/releases/amd64/autobuilds/current-stage3-amd64-openrc/">Stage 3</a>
 </p>
diff --git a/_includes/downloads/arm.html b/_includes/downloads/arm.html
index 7fa1482..9cf8265 100644
--- a/_includes/downloads/arm.html
+++ b/_includes/downloads/arm.html
@@ -1,21 +1,43 @@
 <div class="col-xs-12 col-md-6">
-  <h4>Stage archives</h4>
+  <h4>Processor compatibility</h4>
+  <div class="alert alert-info">
+    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
+    <p>
+      For details of the <em>arm</em> architecture, please see <a href="https://en.wikipedia.org/wiki/ARM_architecture_family">the
+      corresponding wikipedia page</a>. Note that in Gentoo <em>arm</em> refers to 32bit variants; the 64bit variants
+      can be found as <em>arm64</em>.
+    </p>
+  </div>
+
+  <h4>ARMv4tl stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="arm" id="armv4tl-openrc" title="Stage 3" tag="ARMv4tl | openrc" %}
     {% include partials/download-link.html type="stage3" arch="arm" id="armv4tl-systemd" title="Stage 3" tag="ARMv4tl | systemd" %}
+  </div>
+
+  <h4>ARMv5tel stage archives</h4>
+  <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="arm" id="armv5tel-openrc" title="Stage 3" tag="ARMv5tel | openrc" %}
     {% include partials/download-link.html type="stage3" arch="arm" id="armv5tel-systemd" title="Stage 3" tag="ARMv5tel | systemd" %}
-    {% include partials/download-link.html type="stage3" arch="arm" id="armv6j-openrc" title="Stage 3" tag="ARMv6j | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="arm" id="armv6j-systemd" title="Stage 3" tag="ARMv6j | systemd" %}
+  </div>
+
+  <h4>ARMv6j stage archives</h4>
+  <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="arm" id="armv6j_hardfp-openrc" title="Stage 3" tag="ARMv6j | HardFP | openrc" %}
     {% include partials/download-link.html type="stage3" arch="arm" id="armv6j_hardfp-systemd" title="Stage 3" tag="ARMv6j | HardFP | systemd" %}
-    {% include partials/download-link.html type="stage3" arch="arm" id="armv7a-openrc" title="Stage 3" tag="ARMv7a | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="arm" id="armv7a-systemd" title="Stage 3" tag="ARMv7a | systemd" %}
-    {% include partials/download-link.html type="stage3" arch="arm" id="armv7a_hardfp-openrc" title="Stage 3" tag="ARMv7a | HardFP | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="arm" id="armv7a_hardfp-systemd" title="Stage 3" tag="ARMv7a | HardFP | systemd" %}
+    {% include partials/download-link.html type="stage3" arch="arm" id="armv6j-openrc" title="Stage 3" tag="ARMv6j | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="arm" id="armv6j-systemd" title="Stage 3" tag="ARMv6j | systemd" %}
   </div>
 </div>
 <div class="col-xs-12 col-md-6">
+  <h4>ARMv7a stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="arm" id="armv7a_hardfp-openrc" title="Stage 3" tag="ARMv7a | HardFP | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="arm" id="armv7a_hardfp-systemd" title="Stage 3" tag="ARMv7a | HardFP | systemd" %}
+    {% include partials/download-link.html type="stage3" arch="arm" id="armv7a-openrc" title="Stage 3" tag="ARMv7a | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="arm" id="armv7a-systemd" title="Stage 3" tag="ARMv7a | systemd" %}
+  </div>
+
   <h4>Musl stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="arm" id="armv6j_hardfp_musl-openrc" title="Stage 3" tag="ARMv6j | HardFP | openrc | musl" %}
@@ -25,18 +47,14 @@
   </div>
 
   <div class="alert alert-info">
-    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages: consider the musl overlay</strong>
+    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages</strong>
     <p>
-      While the core system packages within the stage files work fine in the main gentoo repository, 
-      musl-specific fixes for additional packages can be found in the <a href="https://gitweb.gentoo.org/proj/musl.git/">musl overlay</a>.
-      If you encounter problems, you may want to consider adding this overlay to your installation.
-      Instructions how to do so can be found, e.g., on the <a href="https://wiki.gentoo.org/wiki/Project:Hardened_musl">page 
-      of the Hardened musl project</a>. Please file bugs!
+      For additional information on using musl based Gentoo systems please see the <a href="https://wiki.gentoo.org/wiki/Musl_usage_guide">Musl usage guide</a>.
     </p>
   </div>
 
   <h4>Details (contents, hashes, and signatures)</h4>
   <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/arm/autobuilds/">All files</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/arm/autobuilds/">All files</a></li>
   </ul>
 </div>
diff --git a/_includes/downloads/arm64-advanced.html b/_includes/downloads/arm64-advanced.html
index c0bb67a..8da1722 100644
--- a/_includes/downloads/arm64-advanced.html
+++ b/_includes/downloads/arm64-advanced.html
@@ -11,27 +11,41 @@
     {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-systemd" title="Stage 3" tag="systemd" %}
     {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-desktop-systemd" title="Stage 3" tag="desktop profile | systemd" %}
   </div>
+
+  <h4>LLVM-based stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-llvm-openrc" title="Stage 3" tag="llvm | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-llvm-systemd" title="Stage 3" tag="llvm | systemd" %}
+  </div>
 </div>
 <div class="col-xs-12 col-md-6">
   <h4>Musl stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-musl" title="Stage 3" tag="musl | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-musl-llvm" title="Stage 3" tag="musl | llvm | openrc" %}
     {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-musl-hardened" title="Hardened Stage 3" tag="musl | openrc" %}
   </div>
 
+  <h4>Big-Endian Stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="arm64" id="aarch64_be-openrc" title="Stage 3" tag="eb | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="arm64" id="aarch64_be-systemd" title="Stage 3" tag="eb | systemd" %}
+  </div>
+
+  <h4>Split-usr stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-openrc-splitusr" title="Stage 3" tag="openrc | split-usr" %}
+  </div>
+
   <div class="alert alert-info">
-    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages: consider the musl overlay</strong>
+    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages</strong>
     <p>
-      While the core system packages within the stage files work fine in the main gentoo repository, 
-      musl-specific fixes for additional packages can be found in the <a href="https://gitweb.gentoo.org/proj/musl.git/">musl overlay</a>.
-      If you encounter problems, you may want to consider adding this overlay to your installation.
-      Instructions how to do so can be found, e.g., on the <a href="https://wiki.gentoo.org/wiki/Project:Hardened_musl">page 
-      of the Hardened musl project</a>. Please file bugs!
+      For additional information on using musl based Gentoo systems please see the <a href="https://wiki.gentoo.org/wiki/Musl_usage_guide">Musl usage guide</a>.
     </p>
   </div>
 
   <h4>Details (contents, hashes, and signatures)</h4>
   <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/arm64/autobuilds/">All files</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/arm64/autobuilds/">All files</a></li>
   </ul>
 </div>
diff --git a/_includes/downloads/arm64.html b/_includes/downloads/arm64.html
index fec6634..5ade14a 100644
--- a/_includes/downloads/arm64.html
+++ b/_includes/downloads/arm64.html
@@ -1,6 +1,6 @@
 <h4>Boot media</h4>
 <div class="list-group">
-  {% include partials/download-link.html type="iso" arch="arm64" id="minimal" title="Minimal Installation CD" %}
+  {% include partials/download-link.html type="iso" arch="arm64" id="minimal" title="Minimal Installation CD" tag="EFI" %}
   <a href="" class="list-group-item download-link">&nbsp;</a>
 </div>
 
@@ -14,6 +14,6 @@
 
 <h4>Details (contents, hashes, and signatures)</h4>
 <p>
-  <a href="https://bouncer.gentoo.org/fetch/root/all/releases/arm64/autobuilds/current-install-arm64-minimal/">Minimal Installation CD</a>,
-  <a href="https://bouncer.gentoo.org/fetch/root/all/releases/arm64/autobuilds/current-stage3-arm64-openrc/">Stage 3</a>
+  <a href="https://distfiles.gentoo.org/releases/arm64/autobuilds/current-install-arm64-minimal/">Minimal Installation CD</a>,
+  <a href="https://distfiles.gentoo.org/releases/arm64/autobuilds/current-stage3-arm64-openrc/">Stage 3</a>
 </p>
diff --git a/_includes/downloads/hppa.html b/_includes/downloads/hppa.html
index b225ef7..e689587 100644
--- a/_includes/downloads/hppa.html
+++ b/_includes/downloads/hppa.html
@@ -5,17 +5,20 @@
     {% include partials/download-link.html type="iso" arch="hppa" id="netboot-hppa32" title="Netboot" tag="HPPA32" %}
     {% include partials/download-link.html type="iso" arch="hppa" id="netboot-hppa64" title="Netboot" tag="HPPA64" %}
   </div>
-  <h4>Stage archives</h4>
+  <h4>HPPA 1.1 stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="hppa" id="hppa1.1-openrc" title="Stage 3" tag="HPPA 1.1 | openrc" %}
     {% include partials/download-link.html type="stage3" arch="hppa" id="hppa1.1-systemd" title="Stage 3" tag="HPPA 1.1 | systemd" %}
-    {% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0-openrc" title="Stage 3" tag="HPPA 2.0 | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0-systemd" title="Stage 3" tag="HPPA 2.0 | systemd" %}
   </div>
 </div>
 <div class="col-xs-12 col-md-6">
+  <h4>HPPA 2.0 stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0-openrc" title="Stage 3" tag="HPPA 2.0 | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0-systemd" title="Stage 3" tag="HPPA 2.0 | systemd" %}
+  </div>
   <h4>Details (contents, hashes, and signatures)</h4>
   <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/hppa/autobuilds/">All files</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/hppa/autobuilds/">All files</a></li>
   </ul>
 </div>
diff --git a/_includes/downloads/ia64.html b/_includes/downloads/ia64.html
index e9b36c0..11dd7f5 100644
--- a/_includes/downloads/ia64.html
+++ b/_includes/downloads/ia64.html
@@ -1,27 +1,28 @@
 <div class="col-xs-12 col-md-6">
+  <h4>Processor compatibility</h4>
+  <div class="alert alert-info">
+    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
+    <p>
+      The <em>ia64</em> architecture is intended for use on <strong>Intel Itanium</strong> processors only.<br />
+      If you have a 64-bit <strong>Intel Pentium/Core/Xeon</strong> processor, you need to use the <a href="#amd64" class="alert-link"><em>amd64</em></a> architecture.
+    </p>
+  </div>
+
   <h4>Boot media</h4>
   <div class="list-group">
     {% include partials/download-link.html type="iso" arch="ia64" id="minimal" title="Minimal Installation CD" %}
   </div>
+</div>
+<div class="col-xs-12 col-md-6">
   <h4>Stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="ia64" id="ia64-openrc" title="Stage 3" tag="openrc" %}
     {% include partials/download-link.html type="stage3" arch="ia64" id="ia64-systemd" title="Stage 3" tag="systemd" %}
   </div>
-</div>
-<div class="col-xs-12 col-md-6">
-  <h4>Processor compatibility</h4>
-  <div class="alert alert-info">
-    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
-    <p>
-      The <em>ia64</em> architecture is intended for use on <strong>Intel Itanium</strong> processors only.<br />
-      If you have a 64-bit <strong>Intel Pentium/Core/Xeon</strong> processor, you need to use the <a href="#amd64" class="alert-link"><em>amd64</em></a> architecture.
-    </p>
-  </div>
 
   <h4>Details (contents, hashes, and signatures)</h4>
   <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/ia64/autobuilds/current-install-ia64-minimal/">Minimal Installation CD</a></li>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/ia64/autobuilds/">All files</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/ia64/autobuilds/current-install-ia64-minimal/">Minimal Installation CD</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/ia64/autobuilds/">All files</a></li>
   </ul>
 </div>
diff --git a/_includes/downloads/loong.html b/_includes/downloads/loong.html
new file mode 100644
index 0000000..b144d31
--- /dev/null
+++ b/_includes/downloads/loong.html
@@ -0,0 +1,13 @@
+<div class="col-xs-12 col-md-6">
+  <h4>Stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="loong" id="loong-openrc" title="Stage 3" tag="openrc" %}
+    {% include partials/download-link.html type="stage3" arch="loong" id="loong-systemd" title="Stage 3" tag="systemd" %}
+  </div>
+</div>
+<div class="col-xs-12 col-md-6">
+  <h4>Details (contents, hashes, and signatures)</h4>
+  <ul>
+    <li><a href="https://distfiles.gentoo.org/releases/loong/autobuilds/">All files</a></li>
+  </ul>
+</div>
diff --git a/_includes/downloads/m68k.html b/_includes/downloads/m68k.html
index b47a657..e9f7329 100644
--- a/_includes/downloads/m68k.html
+++ b/_includes/downloads/m68k.html
@@ -4,10 +4,21 @@
     {% include partials/download-link.html type="stage3" arch="m68k" id="m68k-openrc" title="Stage 3" tag="openrc" %}
     {% include partials/download-link.html type="stage3" arch="m68k" id="m68k-systemd" title="Stage 3" tag="systemd" %}
   </div>
+  <h4>Musl stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="m68k" id="m68k_musl" title="Stage 3" tag="musl | openrc" %}
+  </div>
 </div>
 <div class="col-xs-12 col-md-6">
+  <div class="alert alert-info">
+    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages</strong>
+    <p>
+      For additional information on using musl based Gentoo systems please see the <a href="https://wiki.gentoo.org/wiki/Musl_usage_guide">Musl usage guide</a>.
+    </p>
+  </div>
+
   <h4>Details (contents, hashes, and signatures)</h4>
   <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/m68k/autobuilds/">All files</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/m68k/autobuilds/">All files</a></li>
   </ul>
 </div>
diff --git a/_includes/downloads/mips.html b/_includes/downloads/mips.html
index a3b2a00..f6c4ef9 100644
--- a/_includes/downloads/mips.html
+++ b/_includes/downloads/mips.html
@@ -1,34 +1,39 @@
 <div class="col-xs-12 col-md-6">
-
-<h4>Stage archives, big-endian O32</h4>
-<div class="list-group">
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips2-openrc" title="Stage 3" tag="mips2 | o32 | eb | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips32-openrc" title="Stage 3" tag="mips32 | o32 | eb | openrc" %}
-</div>
+  <h4>Processor compatibility</h4>
+  <div class="alert alert-info">
+    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
+    <p>
+      For details of the <em>mips</em> architecture, please see <a href="https://en.wikipedia.org/wiki/MIPS_architecture">the
+      corresponding wikipedia page</a>.
+    </p>
+  </div>
 
 <h4>Stage archives, little-endian O32</h4>
 <div class="list-group">
+  {% include partials/download-link.html type="stage3" arch="mips" id="mipsel2_softfloat-openrc" title="Stage 3" tag="mips2 | o32 | sf | el | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mipsel2_softfloat-systemd" title="Stage 3" tag="mips2 | o32 | sf | el | systemd" %}
   {% include partials/download-link.html type="stage3" arch="mips" id="mipsel2-openrc" title="Stage 3" tag="mips2 | o32 | el | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips32el-openrc" title="Stage 3" tag="mips32 | o32 | el | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="mips" id="mipsel3-openrc" title="Stage 3" tag="mips3 | o32 | el | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mipsel2-systemd" title="Stage 3" tag="mips2 | o32 | el | systemd" %}
 </div>
 
-<h4>Stage archives, big-endian N32</h4>
+<h4>Stage archives, big-endian O32</h4>
 <div class="list-group">
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips3_n32-openrc" title="Stage 3" tag="mips3 | n32 | eb | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips64_n32-openrc" title="Stage 3" tag="mips64 | n32 | eb | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mips2_softfloat-openrc" title="Stage 3" tag="mips2 | o32 | sf | eb | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mips2_softfloat-systemd" title="Stage 3" tag="mips2 | o32 | sf | eb | systemd" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mips2-openrc" title="Stage 3" tag="mips2 | o32 | eb | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mips2-systemd" title="Stage 3" tag="mips2 | o32 | eb | systemd" %}
 </div>
 
 <h4>Stage archives, little-endian N32</h4>
 <div class="list-group">
   {% include partials/download-link.html type="stage3" arch="mips" id="mipsel3_n32-openrc" title="Stage 3" tag="mips3 | n32 | el | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips64el_n32-openrc" title="Stage 3" tag="mips64 | n32 | el | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mipsel3_n32-systemd" title="Stage 3" tag="mips3 | n32 | el | systemd" %}
 </div>
 
-<h4>Stage archives, big-endian N64</h4>
+<h4>Stage archives, big-endian N32</h4>
 <div class="list-group">
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips3_n64-openrc" title="Stage 3" tag="mips3 | n64 | eb | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips64_n64-openrc" title="Stage 3" tag="mips64 | n64 | eb | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mips3_n32-openrc" title="Stage 3" tag="mips3 | n32 | eb | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mips3_n32-systemd" title="Stage 3" tag="mips3 | n32 | eb | systemd" %}
 </div>
 
 </div>
@@ -38,25 +43,43 @@
 <div class="list-group">
   {% include partials/download-link.html type="stage3" arch="mips" id="mipsel3_n64-openrc" title="Stage 3" tag="mips3 | n64 | el | openrc" %}
   {% include partials/download-link.html type="stage3" arch="mips" id="mipsel3_n64-systemd" title="Stage 3" tag="mips3 | n64 | el | systemd" %}
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips64el_n64-openrc" title="Stage 3" tag="mips64 | n64 | el | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips64el_n64-systemd" title="Stage 3" tag="mips64 | n64 | el | systemd" %}
 </div>
 
-<h4>Stage archives, big-endian multilib</h4>
+<h4>Stage archives, big-endian N64</h4>
 <div class="list-group">
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips3_multilib-openrc" title="Stage 3" tag="mips3 | n32 | multilib | eb | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips64_multilib-openrc" title="Stage 3" tag="mips64 | n32 | multilib | eb | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mips3_n64-openrc" title="Stage 3" tag="mips3 | n64 | eb | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mips3_n64-systemd" title="Stage 3" tag="mips3 | n64 | eb | systemd" %}
 </div>
 
 <h4>Stage archives, little-endian multilib</h4>
 <div class="list-group">
   {% include partials/download-link.html type="stage3" arch="mips" id="mipsel3_multilib-openrc" title="Stage 3" tag="mips3 | n32 | multilib | el | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="mips" id="mips64el_multilib-openrc" title="Stage 3" tag="mips64 | n32 | multilib | el | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mipsel3_multilib-systemd" title="Stage 3" tag="mips3 | n32 | multilib | el | systemd" %}
 </div>
 
+<h4>Stage archives, big-endian multilib</h4>
+<div class="list-group">
+  {% include partials/download-link.html type="stage3" arch="mips" id="mips3_multilib-openrc" title="Stage 3" tag="mips3 | n32 | multilib | eb | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mips3_multilib-systemd" title="Stage 3" tag="mips3 | n32 | multilib | eb | systemd" %}
+</div>
+
+
+<h4>Musl stage archives</h4>
+<div class="list-group">
+  {% include partials/download-link.html type="stage3" arch="mips" id="mipsel2_musl" title="Stage 3" tag="mips2 | o32 | musl | el | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="mips" id="mips2_musl" title="Stage 3" tag="mips2 | o32 | musl | eb | openrc" %}
+</div>
+
+  <div class="alert alert-info">
+    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages</strong>
+    <p>
+      For additional information on using musl based Gentoo systems please see the <a href="https://wiki.gentoo.org/wiki/Musl_usage_guide">Musl usage guide</a>.
+    </p>
+  </div>
+
 <h4>Details (contents, hashes, and signatures)</h4>
 <p>
-  <a href="https://bouncer.gentoo.org/fetch/root/all/releases/mips/autobuilds/">All files</a>
+  <a href="https://distfiles.gentoo.org/releases/mips/autobuilds/">All files</a>
 </p>
 
 </div>
diff --git a/_includes/downloads/ppc.html b/_includes/downloads/ppc.html
index 7d76d64..24918cc 100644
--- a/_includes/downloads/ppc.html
+++ b/_includes/downloads/ppc.html
@@ -1,53 +1,59 @@
 <div class="col-xs-12 col-md-6">
+  <h4>Processor compatibility</h4>
+  <div class="alert alert-info">
+    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
+      <p>
+      	PowerPC CPUs can operate in two modes: <em>big-endian</em> and <em>little-endian</em>.
+        <ul>
+        <li>The <strong>ppc</strong> and <strong>ppc64</strong> stages are <em>big-endian</em> stages and can be used with <em>any PowerPC</em> CPU, including some old Apple&trade; hardware.</li>
+        <li>The <strong>ppc64le</strong> stages are <em>little-endian</em> stages and are created for running on <em>POWER8 and newer</em> CPUs.</li>
+        <li>The <strong>power9le</strong> stages are <em>little-endian</em> stages optimized exclusively for <em>POWER9</em> CPUs.</li>
+        </ul>
+      </p>
+  </div>
+
   <h4>Boot media</h4>
   <div class="list-group">
     {% include partials/download-link.html type="iso" arch="ppc" id="install-powerpc-minimal" title="PPC/PPC64 Minimal Installation CD" %}
     {% include partials/download-link.html type="iso" arch="ppc" id="install-ppc64le-minimal" title="PPC64LE Minimal Installation CD" %}
   </div>
-  <h4>Stage archives</h4>
+
+  <h4>Stage archives, big-endian ppc and ppc64</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="ppc" id="ppc-openrc" title="PPC stage 3" tag="openrc" %}
+    {% include partials/download-link.html type="stage3" arch="ppc" id="ppc-systemd" title="PPC stage 3" tag="systemd" %}
     {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-openrc" title="PPC64 stage 3" tag="openrc" %}
     {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-systemd" title="PPC64 stage 3" tag="systemd" %}
-    {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64le-openrc" title="PPC64LE stage 3" tag="openrc" %}
-    {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64le-systemd" title="PPC64LE stage 3" tag="systemd" %}
-    {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-openrc" title="PPC64LE stage 3" tag="openrc | power9" %}
-    {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-systemd" title="PPC64LE stage 3" tag="systemd | power9" %}
   </div>
-
-  <h4>Details (contents, hashes, and signatures)</h4>
-  <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/ppc/autobuilds/">All files</a></li>
-  </ul>
 </div>
 <div class="col-xs-12 col-md-6">
-  <h4>Processor compatibility</h4>
-  <div class="alert alert-info">
-    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
-      <p>
-      	PowerPC CPUs can operate in two modes: <em>big-endian</em> and <em>little-endian</em>.
-        <ul>
-        <li>The <strong>ppc</strong> and <strong>ppc64</strong> stages are <em>big-endian</em> stages and can be used with <em>any PowerPC</em> CPU, including some old Apple&trade; hardware.</li>
-        <li>The <strong>ppc64le</strong> stages are <em>little-endian</em> stages and are created for running on <em>POWER8 and newer</em> CPUs.</li>
-        <li>The <strong>power9le</strong> stages are <em>little-endian</em> stages optimized exclusively for <em>POWER9</em> CPUs.</li>
-        </ul>
-      </p>
+  <h4>Stage archives, little-endian ppc64le</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64le-openrc" title="PPC64LE stage 3" tag="openrc" %}
+    {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64le-systemd" title="PPC64LE stage 3" tag="systemd" %}
+    {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-openrc" title="PPC64LE stage 3" tag="power9 | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-desktop-openrc" title="PPC64LE stage 3" tag="power9 | desktop profile | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-systemd" title="PPC64LE stage 3" tag="power9 | systemd" %}
+    {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-desktop-systemd" title="PPC64LE stage 3" tag="power9 | desktop profile | systemd" %}
   </div>
+
   <h4>Hardened / musl stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="ppc" id="ppc-musl-hardened-openrc" title="PPC stage 3" tag="musl | openrc" %}
     {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-musl-hardened-openrc" title="PPC64 stage 3" tag="musl | openrc" %}
     {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64le-musl-hardened-openrc" title="PPC64LE stage 3" tag="musl | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-musl-hardened-openrc" title="PPC64LE stage 3" tag="musl | openrc | power9" %}
   </div>
 
   <div class="alert alert-info">
-    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages: consider the musl overlay</strong>
+    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages</strong>
     <p>
-      While the core system packages within the stage files work fine in the main gentoo repository, 
-      musl-specific fixes for additional packages can be found in the <a href="https://gitweb.gentoo.org/proj/musl.git/">musl overlay</a>.
-      If you encounter problems, you may want to consider adding this overlay to your installation.
-      Instructions how to do so can be found, e.g., on the <a href="https://wiki.gentoo.org/wiki/Project:Hardened_musl">page 
-      of the Hardened musl project</a>. Please file bugs!
+      For additional information on using musl based Gentoo systems please see the <a href="https://wiki.gentoo.org/wiki/Musl_usage_guide">Musl usage guide</a>.
     </p>
   </div>
+
+  <h4>Details (contents, hashes, and signatures)</h4>
+  <ul>
+    <li><a href="https://distfiles.gentoo.org/releases/ppc/autobuilds/">All files</a></li>
+  </ul>
 </div>
diff --git a/_includes/downloads/riscv.html b/_includes/downloads/riscv.html
index d70ce37..06e38b9 100644
--- a/_includes/downloads/riscv.html
+++ b/_includes/downloads/riscv.html
@@ -1,47 +1,53 @@
 <div class="col-xs-12 col-md-6">
-<h4>Stage archives</h4>
-<div class="list-group">
-  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64d-openrc" title="Stage 3" tag="lp64d | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64d-systemd" title="Stage 3" tag="lp64d | systemd" %}
-  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64-openrc" title="Stage 3" tag="lp64 | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64-systemd" title="Stage 3" tag="lp64 | systemd" %}
+<h4>Processor compatibility</h4>
+<div class="alert alert-info">
+  <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
+  <p>
+    The <em>lp64d</em> stages can be used on all 64-bit RISC-V processors supporting the <strong>double-precision floating point</strong> instruction set.
+    The <em>lp64</em> stages can be used on all 64-bit RISC-V processors; they require no hardware support for floating point arithmetics.
+    Multilib stages include toolchain support for all 64-bit and 32-bit ABI and are based on lp64d. They are mostly useful for development and testing purposes.
+    <br>
+    The <em>ilp32d</em> stages can be used on all 32-bit RISC-V processors supporting the <strong>double-precision floating point</strong> instruction set.
+    The <em>ilp32</em> stages can be used on all 32-bit RISC-V processors; they require no hardware support for floating point arithmetics.
+  </p>
 </div>
 
-<h4>Experimental multilib stage archives</h4>
+<h4>Stage archives (RV64)</h4>
 <div class="list-group">
-  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_multilib-openrc" title="Stage 3" tag="multilib | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_multilib-systemd" title="Stage 3" tag="multilib | systemd" %}
+  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64d-openrc" title="Stage 3" tag="rv64gc | lp64d | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64d-systemd" title="Stage 3" tag="rv64gc | lp64d | systemd" %}
+  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64-openrc" title="Stage 3" tag="rv64gc | lp64 | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64-systemd" title="Stage 3" tag="rv64gc | lp64 | systemd" %}
+  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_multilib-openrc" title="Stage 3" tag="rv64gc | multilib | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_multilib-systemd" title="Stage 3" tag="rv64gc | multilib | systemd" %}
 </div>
-
-<h4>Processor compatibility</h4>
-  <div class="alert alert-info">
-    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
-    <p>
-      The <em>lp64d</em> stages can be used on all 64-bit RISC-V processors supporting the <strong>double-precision floating point</strong> instruction set.
-      The <em>lp64</em> stages can be used on all 64-bit RISC-V processors; they require no hardware support for floating point arithmetics.
-    </p>
-  </div>
 </div>
 
 <div class="col-xs-12 col-md-6">
+<h4>Stage archives (RV32)</h4>
+<div class="list-group">
+  {% include partials/download-link.html type="stage3" arch="riscv" id="rv32_ilp32d-openrc" title="Stage 3" tag="rv32gc | ilp32d | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="riscv" id="rv32_ilp32d-systemd" title="Stage 3" tag="rv32gc | ilp32d | systemd" %}
+  {% include partials/download-link.html type="stage3" arch="riscv" id="rv32_ilp32-openrc" title="Stage 3" tag="rv32gc | ilp32 | openrc" %}
+  {% include partials/download-link.html type="stage3" arch="riscv" id="rv32_ilp32-systemd" title="Stage 3" tag="rv32gc | ilp32 | systemd" %}
+</div>
+
   <h4>Musl stage archives</h4>
   <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64d_musl" title="Stage 3" tag="lp64d | musl | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64_musl" title="Stage 3" tag="lp64 | musl | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64d_musl" title="Stage 3" tag="rv64gc | lp64d | musl | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64_musl" title="Stage 3" tag="rv64gc | lp64 | musl | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="riscv" id="rv32_ilp32d_musl" title="Stage 3" tag="rv32gc | ilp32d | musl | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="riscv" id="rv32_ilp32_musl" title="Stage 3" tag="rv32gc | ilp32 | musl | openrc" %}
   </div>
   <div class="alert alert-info">
-    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages: consider the musl overlay</strong>
+    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages</strong>
     <p>
-      While the core system packages within the stage files work fine in the main gentoo repository, 
-      musl-specific fixes for additional packages can be found in the <a href="https://gitweb.gentoo.org/proj/musl.git/">musl overlay</a>.
-      If you encounter problems, you may want to consider adding this overlay to your installation.
-      Instructions how to do so can be found, e.g., on the <a href="https://wiki.gentoo.org/wiki/Project:Hardened_musl">page 
-      of the Hardened musl project</a>. Please file bugs!
+      For additional information on using musl based Gentoo systems please see the <a href="https://wiki.gentoo.org/wiki/Musl_usage_guide">Musl usage guide</a>.
     </p>
   </div>
 
 <h4>Details (contents, hashes, and signatures)</h4>
-  <p>
-    <a href="https://bouncer.gentoo.org/fetch/root/all/releases/riscv/autobuilds/">All files</a>
-  </p>
+<p>
+  <a href="https://distfiles.gentoo.org/releases/riscv/autobuilds/">All files</a>
+</p>
 </div>
diff --git a/_includes/downloads/s390.html b/_includes/downloads/s390.html
index d235091..3d9c686 100644
--- a/_includes/downloads/s390.html
+++ b/_includes/downloads/s390.html
@@ -1,12 +1,4 @@
 <div class="col-xs-12 col-md-6">
-  <h4>Stage archives</h4>
-  <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="s390" id="s390-openrc" title="Stage 3" tag="s390 | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="s390" id="s390-systemd" title="Stage 3" tag="s390 | systemd" %}
-    {% include partials/download-link.html type="stage3" arch="s390" id="s390x-openrc" title="Stage 3" tag="s390x | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="s390" id="s390x-systemd" title="Stage 3" tag="s390x | systemd" %}
-  </div>
-
   <h4>Boot media</h4>
   <div class="list-group">
     {% include partials/download-link.html type="iso" arch="s390" id="netboot-s390-initramfs" title="Netboot initramfs" tag="s390" %}
@@ -14,11 +6,19 @@
     {% include partials/download-link.html type="iso" arch="s390" id="netboot-s390x-initramfs" title="Netboot initramfs" tag="s390x" %}
     {% include partials/download-link.html type="iso" arch="s390" id="netboot-s390x-kernel" title="Netboot kernel" tag="s390x" %}
   </div>
+
+  <h4>Stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="s390" id="s390-openrc" title="Stage 3" tag="s390 | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="s390" id="s390-systemd" title="Stage 3" tag="s390 | systemd" %}
+    {% include partials/download-link.html type="stage3" arch="s390" id="s390x-openrc" title="Stage 3" tag="s390x | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="s390" id="s390x-systemd" title="Stage 3" tag="s390x | systemd" %}
+  </div>
 </div>
 
 <div class="col-xs-12 col-md-6">
   <h4>Details (contents, hashes, and signatures)</h4>
   <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/s390/autobuilds/">All files</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/s390/autobuilds/">All files</a></li>
   </ul>
 </div>
diff --git a/_includes/downloads/sparc.html b/_includes/downloads/sparc.html
index 6da7cf4..ad31cb3 100644
--- a/_includes/downloads/sparc.html
+++ b/_includes/downloads/sparc.html
@@ -5,16 +5,16 @@
   </div>
   <h4>Stage archives</h4>
   <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="sparc" id="sparc64" title="Stage 3 (64-bit userland)" tag="openrc" %}
+    {% include partials/download-link.html type="stage3" arch="sparc" id="sparc64-openrc" title="Stage 3 (64-bit userland)" tag="openrc" %}
     {% include partials/download-link.html type="stage3" arch="sparc" id="sparc64-systemd" title="Stage 3 (64-bit userland)" tag="systemd" %}
-    {% include partials/download-link.html type="stage3" arch="sparc" id="sparc" title="Stage 3 (32-bit userland)" tag="openrc" %}
+    {% include partials/download-link.html type="stage3" arch="sparc" id="sparc-openrc" title="Stage 3 (32-bit userland)" tag="openrc" %}
     {% include partials/download-link.html type="stage3" arch="sparc" id="sparc-systemd" title="Stage 3 (32-bit userland)" tag="systemd" %}
   </div>
 </div>
 <div class="col-xs-12 col-md-6">
   <h4>Details (contents, hashes, and signatures)</h4>
   <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/sparc/autobuilds/current-install-sparc64-minimal/">Minimal Installation CD</a></li>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/sparc/autobuilds/">All files</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/sparc/autobuilds/current-install-sparc64-minimal/">Minimal Installation CD</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/sparc/autobuilds/">All files</a></li>
   </ul>
 </div>
diff --git a/_includes/downloads/x86.html b/_includes/downloads/x86.html
index 8aa4b11..7ecfa83 100644
--- a/_includes/downloads/x86.html
+++ b/_includes/downloads/x86.html
@@ -1,4 +1,13 @@
 <div class="col-xs-12 col-md-6">
+  <h4>Processor compatibility</h4>
+  <div class="alert alert-info">
+    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
+    <p>
+      There are two builds of the <em>x86</em> architecture: <em>i486</em> and <em>i686</em>.<br />
+      Processors prior to the <strong>Intel Pentium Pro</strong> or <strong>Pentium II</strong> require the <em>i486</em> variant to be used.
+    </p>
+  </div>
+
   <h4>Boot media</h4>
   <div class="list-group">
     {% include partials/download-link.html type="iso" arch="x86" id="minimal" title="Minimal Installation CD" %}
@@ -10,42 +19,30 @@
     {% include partials/download-link.html type="stage3" arch="x86" id="i686-openrc" title="Stage 3" tag="i686 | openrc" %}
     {% include partials/download-link.html type="stage3" arch="x86" id="i686-systemd" title="Stage 3" tag="i686 | systemd" %}
     {% include partials/download-link.html type="stage3" arch="x86" id="i486-openrc" title="Stage 3" tag="i486 | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="x86" id="i486-systemd" title="Stage 3" tag="i486 | systemd" %}
   </div>
-
+</div>
+<div class="col-xs-12 col-md-6">
   <h4>Hardened stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="x86" id="i686-hardened-openrc" title="Hardened stage 3" tag="i686 | openrc" %}
   </div>
 
-  <h4>Details (contents, hashes, and signatures)</h4>
-  <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/x86/autobuilds/current-install-x86-minimal/">Minimal Installation CD</a></li>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/x86/autobuilds/">All files</a></li>
-  </ul>
-</div>
-<div class="col-xs-12 col-md-6">
-  <h4>Processor compatibility</h4>
-  <div class="alert alert-info">
-    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
-    <p>
-      There are two builds of the <em>x86</em> architecture: <em>i486</em> and <em>i686</em>.<br />
-      Processors prior to the <strong>Intel Pentium Pro</strong> or <strong>Pentium II</strong> require the <em>i486</em> variant to be used.
-    </p>
-  </div>
-
   <h4>Musl stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="x86" id="i686-musl" title="Stage 3" tag="i686 | openrc | musl" %}
   </div>
 
   <div class="alert alert-info">
-    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages: consider the musl overlay</strong>
+    <strong><i class="fa fa-fw fa-info-circle"></i> Musl stages</strong>
     <p>
-      While the core system packages within the stage files work fine in the main gentoo repository, 
-      musl-specific fixes for additional packages can be found in the <a href="https://gitweb.gentoo.org/proj/musl.git/">musl overlay</a>.
-      If you encounter problems, you may want to consider adding this overlay to your installation.
-      Instructions how to do so can be found, e.g., on the <a href="https://wiki.gentoo.org/wiki/Project:Hardened_musl">page 
-      of the Hardened musl project</a>. Please file bugs!
+      For additional information on using musl based Gentoo systems please see the <a href="https://wiki.gentoo.org/wiki/Musl_usage_guide">Musl usage guide</a>.
     </p>
   </div>
+
+  <h4>Details (contents, hashes, and signatures)</h4>
+  <ul>
+    <li><a href="https://distfiles.gentoo.org/releases/x86/autobuilds/current-install-x86-minimal/">Minimal Installation CD</a></li>
+    <li><a href="https://distfiles.gentoo.org/releases/x86/autobuilds/">All files</a></li>
+  </ul>
 </div>
diff --git a/_includes/layout/footer.html b/_includes/layout/footer.html
index 9b6e909..4802dfd 100644
--- a/_includes/layout/footer.html
+++ b/_includes/layout/footer.html
@@ -31,9 +31,9 @@
       <div class="col-xs-8 col-md-8">
         <strong>&copy; 2001-{% render_current_year %} Gentoo Authors</strong><br>
         <small>
-          Gentoo is a trademark of the Gentoo Foundation, Inc.
+          Gentoo is a trademark of the Gentoo Foundation, Inc. and of Förderverein Gentoo e.V.
           The contents of this document, unless otherwise expressly stated, are licensed under the
-          <a href="https://creativecommons.org/licenses/by-sa/3.0/" rel="license">CC-BY-SA-3.0</a> license.
+          <a href="https://creativecommons.org/licenses/by-sa/4.0/" rel="license">CC-BY-SA-4.0</a> license.
           The <a href="/inside-gentoo/foundation/name-logo-guidelines.html">Gentoo Name and Logo Usage Guidelines</a> apply.
         </small>
       </div>
diff --git a/_includes/layout/header.html b/_includes/layout/header.html
index 6747a26..b80b84e 100644
--- a/_includes/layout/header.html
+++ b/_includes/layout/header.html
@@ -10,27 +10,25 @@
                 <span class="fa fa-fw fa-map-o"></span> <span class="hidden-xs">gentoo.org sites</span> <span class="caret"></span>
               </a>
               <ul class="dropdown-menu dropdown-menu-right">
-                <li><a href="https://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li>
+                <li><a href="https://www.gentoo.org/" title="Gentoo's main website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li>
                 <li><a href="https://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text-o fa-fw"></span> Wiki</a></li>
-                <li><a href="https://bugs.gentoo.org/" title="Report issues and find common issues"><span class="fa fa-bug fa-fw"></span> Bugs</a></li>
-                <li><a href="https://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li>
-                <li><a href="https://devmanual.gentoo.org/" title="Read the development guide"><span class="fa fa-book fa-fw"></span> Devmanual</a></li>
+                <li><a href="https://bugs.gentoo.org/" title="Discover and report issues with Gentoo"><span class="fa fa-bug fa-fw"></span> Bugs</a></li>
+                <li><a href="https://packages.gentoo.org/" title="Find software to install"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li>
                 <li><a href="https://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li>
                 <li class="divider"></li>
-                <li><a href="https://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li>
+                <li><a href="https://planet.gentoo.org/" title="Find out what's going on in the dev community"><span class="fa fa-rss fa-fw"></span> Planet</a></li>
                 <li><a href="https://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li>
+                <li><a href="https://devmanual.gentoo.org/" title="Read the development guide"><span class="fa fa-book fa-fw"></span> Devmanual</a></li>
                 <li><a href="https://gitweb.gentoo.org/" title="Browse our source code in Gitweb"><span class="fa fa-code fa-fw"></span> Gitweb</a></li>
                 <li class="divider"></li>
-                <li><a href="https://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-server fa-fw"></span> Infra status</a></li>
+                <li><a href="https://infra-status.gentoo.org/" title="Get updates on the services provided by the Gentoo infra team"><span class="fa fa-server fa-fw"></span> Infra status</a></li>
               </ul>
             </div>
           </div>
         </div>
         <div class="logo">
           <a href="/" title="Back to the homepage" class="site-logo">
-            <object data="{{ site.cdnurl }}/site-logo.svg" type="image/svg+xml">
-            <img src="{{ site.cdnurl }}/site-logo.png" alt="Gentoo Linux logo">
-            </object>
+            <img src="{{ site.cdnurl }}/site-logo.png" alt="Gentoo Linux logo" srcset="{{ site.cdnurl }}/site-logo.svg">
           </a>
           {% if page.sitelabel %}<span class="site-label">{{ page.sitelabel }}</span>{% endif %}
         </div>
diff --git a/_includes/partials/download-link.html b/_includes/partials/download-link.html
index 380760d..04dac81 100644
--- a/_includes/partials/download-link.html
+++ b/_includes/partials/download-link.html
@@ -1,4 +1,4 @@
 {% capture url %}{{ include.arch }}/autobuilds/{{ site.data.downloads[include.arch][include.type][include.id].filename }}{% endcapture %}
 {% assign date = site.data.downloads[include.arch][include.type][include.id].date %}
 {% assign size = site.data.downloads[include.arch][include.type][include.id].size %}
-{% include partials/download-link-raw.html title=include.title tag=include.tag url=url urlprefix='https://bouncer.gentoo.org/fetch/root/all/releases/' date=date size=size %}
+{% include partials/download-link-raw.html title=include.title tag=include.tag url=url urlprefix='https://distfiles.gentoo.org/releases/' date=date size=size %}
diff --git a/_includes/partials/irc-channel.html b/_includes/partials/irc-channel.html
index b7e6dba..64c74f2 100644
--- a/_includes/partials/irc-channel.html
+++ b/_includes/partials/irc-channel.html
@@ -1,6 +1,6 @@
 <tr>
   <th>
-    <a href="irc://irc.gentoo.org/{{ channel.name }}"><tt>#{{ channel.name }}</tt></a>
+    <a href="irc://irc.gentoo.org/{{ channel.name }}"><tt>#{{ channel.name }}</tt></a> (<a href="https://web.libera.chat/#{{ channel.name }}"><tt>webchat</tt></a>)
   </th>
   <td>
     {{ channel.description }}
diff --git a/_includes/partials/mailinglist.html b/_includes/partials/mailinglist.html
index b074690..3f2e9fa 100644
--- a/_includes/partials/mailinglist.html
+++ b/_includes/partials/mailinglist.html
@@ -1,8 +1,8 @@
 <tr>
-  <th>
+  <th id="{{ list.name }}">
     {{ list.name }}
     {% if list.moderated %}
-      <span class="label label-warning pull-right" title="This list is moderated"><span class="fa fa-fw fa-lock"></span></span>
+      <span class="label label-warning pull-right" title="This list is moderated."><span class="fa fa-fw fa-lock"></span></span>
     {% endif %}
   </th>
   <td>
@@ -15,10 +15,10 @@
     {% if list.private != true %}
     <div class="btn-group btn-group-xs" role="group" aria-label="Mailing list actions for {{ list.name }}@lists.gentoo.org">
       {% if include.archived != true %}
-      <a href="mailto:{{ list.name }}@lists.gentoo.org" title="Post to this list" class="btn btn-default"><span class="fa fa-fw fa-send"></span></a>
-      <a href="mailto:{{ list.name }}%2Bsubscribe@lists.gentoo.org" title="Subscribe to this list" class="btn btn-default"><span class="fa fa-fw fa-plus-square"></span></a>
+      <a href="mailto:{{ list.name }}@lists.gentoo.org" title="Post messages to this list." class="btn btn-default"><span class="fa fa-fw fa-send"></span></a>
+      <a href="mailto:{{ list.name }}%2Bsubscribe@lists.gentoo.org" title="Subscribe to this list." class="btn btn-default"><span class="fa fa-fw fa-plus-square"></span></a>
       {% endif %}
-      <a href="https://archives.gentoo.org/{{ list.name }}/" title="Archives of this list" class="btn btn-default"><span class="fa fa-fw fa-archive"></span></a>
+      <a href="https://archives.gentoo.org/{{ list.name }}/" title="View archives of this list." class="btn btn-default"><span class="fa fa-fw fa-archive"></span></a>
     </div>
     {% endif %}
   </td>