diff --git a/compiler-rt/www/index.html b/compiler-rt/www/index.html
index 1ce379e8d101..cc772c804213 100644
--- a/compiler-rt/www/index.html
+++ b/compiler-rt/www/index.html
@@ -135,11 +135,9 @@
   command in either LLVM/Clang/compiler-rt or standalone
   compiler-rt build tree.</p>
 
-  <p>compiler-rt doesn't have its own mailing list, if you have questions please
-     email the <a
-    href="https://lists.llvm.org/mailman/listinfo/llvm-dev">llvm-dev</a> mailing
-    list.  Commits to compiler-rt are automatically sent to the
-    <a
+  <p>If you have questions, please ask on the <a href="https://discourse.llvm.org/c/runtimes/64">
+   Discourse forums</a> under the Runtime category.  Commits to compiler-rt are automatically 
+   sent to the <a
   href="https://lists.llvm.org/mailman/listinfo/llvm-commits">llvm-commits</a>
     mailing list.</p>
 </div>
diff --git a/libclc/www/index.html b/libclc/www/index.html
index 35a6aa8495ea..cf02a0a7f36f 100644
--- a/libclc/www/index.html
+++ b/libclc/www/index.html
@@ -45,9 +45,9 @@ support for more targets is welcome.
 
 <tt>git clone https://github.com/llvm/llvm-project.git</tt> (<a href="https://github.com/llvm/llvm-project/tree/libclc">View sources</a>)
 
-<h2>Mailing List</h2>
+<h2>Discourse forums</h2>
 
-libclc-dev@lists.llvm.org (<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/libclc-dev">subscribe/unsubscribe</a>, <a href="https://lists.llvm.org/pipermail/libclc-dev/">archives</a>)
+<a href="https://discourse.llvm.org/c/runtimes/opencl/65">Runtimes - OpenCL category</a>
 
 </body>
 </html>
diff --git a/libcxxabi/www/index.html b/libcxxabi/www/index.html
index 88035047dd39..198355789763 100644
--- a/libcxxabi/www/index.html
+++ b/libcxxabi/www/index.html
@@ -23,7 +23,7 @@
   <div class="submenu">
     <label>Quick Links</label>
     <a href="https://libcxx.llvm.org/">libc++</a>
-    <a href="https://lists.llvm.org/mailman/listinfo/libcxx-dev">libcxx-dev</a>
+    <a href="https://discourse.llvm.org/c/runtimes/libcxx/10">Discourse Forums</a>
     <a href="https://lists.llvm.org/mailman/listinfo/libcxx-commits">libcxx-commits</a>
     <a href="https://bugs.llvm.org/">Bug Reports</a>
     <a href="https://github.com/llvm/llvm-project/tree/main/libcxxabi/">Browse Sources</a>