diff --git a/flang/docs/ReleaseNotes.md b/flang/docs/ReleaseNotes.md
index 198ff4b15897ad..fd1db3b00eb83c 100644
--- a/flang/docs/ReleaseNotes.md
+++ b/flang/docs/ReleaseNotes.md
@@ -58,5 +58,5 @@ Flang's documentation is located in the `flang/docs/` directory in the
 LLVM monorepo.
 
 If you have any questions or comments about Flang, please feel free to
-contact us via the [mailing
-list](https://lists.llvm.org/mailman/listinfo/flang-dev).
+contact us on the [Discourse 
+forums](https://discourse.llvm.org/c/subprojects/flang/33).
diff --git a/libunwind/docs/index.rst b/libunwind/docs/index.rst
index a8315299386dcb..7126d02abd2960 100644
--- a/libunwind/docs/index.rst
+++ b/libunwind/docs/index.rst
@@ -96,7 +96,7 @@ Quick Links
 ===========
 * `LLVM Homepage <https://llvm.org/>`_
 * `LLVM Bug Tracker <https://github.com/llvm/llvm-project/labels/libunwind/>`_
-* `cfe-dev Mailing List <http://lists.llvm.org/mailman/listinfo/cfe-dev>`_
+* `Clang Discourse Forums <https://discourse.llvm.org/c/clang/6>`_
 * `cfe-commits Mailing List <http://lists.llvm.org/mailman/listinfo/cfe-commits>`_
 * `Runtimes Forum <https://discourse.llvm.org/tags/c/runtimes>`_
 * `Browse libunwind Sources <https://github.com/llvm/llvm-project/blob/main/libunwind/>`_
diff --git a/llvm/docs/HowToReleaseLLVM.rst b/llvm/docs/HowToReleaseLLVM.rst
index 2ae32e83efaac3..1c7fea781055c6 100644
--- a/llvm/docs/HowToReleaseLLVM.rst
+++ b/llvm/docs/HowToReleaseLLVM.rst
@@ -193,7 +193,8 @@ The official release managers are:
 
 The official release testers are volunteered from the community and have
 consistently validated and released binaries for their targets/OSs. To contact
-them, you should email the ``release-testers@lists.llvm.org`` mailing list.
+them, you should post on the `Discourse forums (Project 
+Infrastructure - Release Testers). <https://discourse.llvm.org/c/infrastructure/release-testers/66>`_
 
 The official testers list is in the file ``RELEASE_TESTERS.TXT``, in the ``LLVM``
 repository.
diff --git a/llvm/docs/Projects.rst b/llvm/docs/Projects.rst
index 88cb741c449f43..cbf8f5012b908d 100644
--- a/llvm/docs/Projects.rst
+++ b/llvm/docs/Projects.rst
@@ -253,5 +253,5 @@ Further Help
 
 If you have any questions or need any help creating an LLVM project, the LLVM
 team would be more than happy to help.  You can always post your questions to
-the `LLVM Developers Mailing List
-<http://lists.llvm.org/pipermail/llvm-dev/>`_.
+the `Discourse forums
+<https://discourse.llvm.org>`_.
diff --git a/llvm/docs/ReleaseNotes.rst b/llvm/docs/ReleaseNotes.rst
index 4434a9663ac155..e57e6e6c95098c 100644
--- a/llvm/docs/ReleaseNotes.rst
+++ b/llvm/docs/ReleaseNotes.rst
@@ -24,8 +24,8 @@ from the `LLVM releases web site <https://llvm.org/releases/>`_.
 
 For more information about LLVM, including information about the latest
 release, please check out the `main LLVM web site <https://llvm.org/>`_.  If you
-have questions or comments, the `LLVM Developer's Mailing List
-<https://lists.llvm.org/mailman/listinfo/llvm-dev>`_ is a good place to send
+have questions or comments, the `Discourse forums
+<https://discourse.llvm.org>`_ is a good place to ask
 them.
 
 Note that if you are reading this file from a Git checkout or the main
@@ -159,4 +159,4 @@ code.  You can access versions of these documents specific to this release by
 going into the ``llvm/docs/`` directory in the LLVM tree.
 
 If you have any questions or comments about LLVM, please feel free to contact
-us via the `mailing lists <https://llvm.org/docs/#mailing-lists>`_.
+us via the `Discourse forums <https://discourse.llvm.org>`_.
diff --git a/openmp/docs/SupportAndFAQ.rst b/openmp/docs/SupportAndFAQ.rst
index acb946cfe56d1d..212f6682a1ce33 100644
--- a/openmp/docs/SupportAndFAQ.rst
+++ b/openmp/docs/SupportAndFAQ.rst
@@ -1,7 +1,7 @@
 Support, Getting Involved, and FAQ
 ==================================
 
-Please do not hesitate to reach out to us via openmp-dev@lists.llvm.org or join
+Please do not hesitate to reach out to us on the `Discourse forums (Runtimes - OpenMP) <https://discourse.llvm.org/c/runtimes/openmp/35>`_ or join
 one of our :ref:`regular calls <calls>`. Some common questions are answered in
 the :ref:`faq`.
 
@@ -37,7 +37,7 @@ FAQ
 .. note::
    The FAQ is a work in progress and most of the expected content is not
    yet available. While you can expect changes, we always welcome feedback and
-   additions. Please contact, e.g., through ``openmp-dev@lists.llvm.org``.
+   additions. Please post on the `Discourse forums (Runtimes - OpenMP) <https://discourse.llvm.org/c/runtimes/openmp/35>`__.
 
 
 Q: How to contribute a patch to the webpage or any other part?