diff --git a/static/index.html b/static/index.html
index 92e0865d..71fb3ff3 100644
--- a/static/index.html
+++ b/static/index.html
@@ -97,7 +97,10 @@
 
                     <p>The <a href="/features">features page</a> provides an overview of the
                     substantial privacy and security improvements added by GrapheneOS to the
-                    Android Open Source Project.</p>
+                    Android Open Source Project (AOSP). Many of our past features were <a
+                    href="/faq#upstream">contributed to AOSP, Linux and other projects to improve
+                    privacy and security for billions of users</a> so they're no longer listed on
+                    our features page.</p>
 
                     <p>Official releases are available on the <a href="/releases">releases
                     page</a> and installation instructions are on the <a href="/install/">install
@@ -125,14 +128,6 @@
                     and Google apps.</p>
                 </section>
 
-                <section id="upstream">
-                    <h2><a href="#upstream">Upstream contributions</a></h2>
-
-                    <p>See <a href="/faq#upstream">the FAQ section on our upstream work</a>
-                    improving privacy and security for billions of users by getting a subset of
-                    our changes into core infrastructure projects.</p>
-                </section>
-
                 <section id="device-support">
                     <h2><a href="/faq#device-support">Device support</a></h2>
 
diff --git a/static/js/redirect.js b/static/js/redirect.js
index ac5f3bd2..d756ca59 100644
--- a/static/js/redirect.js
+++ b/static/js/redirect.js
@@ -13,6 +13,7 @@ const redirects = new Map([
     ["/#copyright-and-licensing", "/faq#copyright-and-licensing"],
     ["/#history", "/history"],
     ["/#roadmap", "/faq#roadmap"],
+    ["/#upstream", "/faq#upstream"],
 
     ["/usage#default-connections", "/faq#default-connections"],
     ["/faq#dns", "/faq#custom-dns"],