6 files changed, 18 insertions, 17 deletions

diff --git a/documentation/content/en/articles/building-products/_index.adoc b/documentation/content/en/articles/building-products/_index.adoc
index c88a93e0fb..29fca86847 100644
--- a/documentation/content/en/articles/building-products/_index.adoc
+++ b/documentation/content/en/articles/building-products/_index.adoc
@@ -223,7 +223,7 @@ The best projects to collaborate with are the ones that are __live__; i.e., with
 ** To develop a high-quality operating system for popular computer hardware, and,
 ** To make our work available to all under a liberal license.
 
-* FreeBSD enjoys an open and transparent working culture. Nearly all discussion in the project happens by email, on https://lists.freebsd.org/mailman/listinfo[public mailing lists] that are also archived for posterity. The project's policies are link:https://www.FreeBSD.org/internal/policies/[documented] and maintained under revision control. Participation in the project is open to all.
+* FreeBSD enjoys an open and transparent working culture. Nearly all discussion in the project happens by email, on link:https://lists.freebsd.org/[public mailing lists] that are also archived for posterity. The project's policies are link:https://www.FreeBSD.org/internal/policies/[documented] and maintained under revision control. Participation in the project is open to all.
 
 [[freebsd-org]]
 === Understanding FreeBSD culture
@@ -325,7 +325,7 @@ The {freebsd-jobs} is a useful communication channel to find talent.
 The FreeBSD project maintains a link:https://www.FreeBSD.org/commercial/consult_bycat/[gallery of consultants and consulting firms] undertaking FreeBSD work.
 The http://www.bsdcertification.org/[BSD Certification Group] offers certification for all the major BSD derived OSes.
 +
-For less critical needs, you can ask for help on the http://lists.FreeBSD.org/mailman/listinfo[project mailing lists].
+For less critical needs, you can ask for help on the link:https://lists.freebsd.org/[project mailing lists].
 A useful guide to follow when asking for help is given in <<Ray2004>>. 
 Publicize your involvement::
 You are not required to publicize your use of FreeBSD, but doing so helps both your effort as well as that of the project.
diff --git a/documentation/content/en/articles/contributing/_index.adoc b/documentation/content/en/articles/contributing/_index.adoc
index 7a1274a3ee..4472701eaf 100644
--- a/documentation/content/en/articles/contributing/_index.adoc
+++ b/documentation/content/en/articles/contributing/_index.adoc
@@ -573,7 +573,7 @@ If portlint suggests changes which seem unreasonable, consult the link:{porters-
 
 The {freebsd-ports} is for general ports-related discussion.
 It is a good place to ask for help.
-You can https://lists.freebsd.org/mailman/listinfo[subscribe, or read and search the list archives].
+You can link:https://lists.freebsd.org/[subscribe, or read and search the list archives].
 Reading the archives of the {freebsd-ports-bugs} and the {svn-ports-head} may also be of interest.
 
 https://portsfallout.com/[PortsFallout] is a place to help in searching for the https://lists.freebsd.org/archives/freebsd-pkg-fallout/[FreeBSD package-fallout archive].
diff --git a/documentation/content/en/articles/mailing-list-faq/_index.adoc b/documentation/content/en/articles/mailing-list-faq/_index.adoc
index d70b735075..c62fd0d5a8 100644
--- a/documentation/content/en/articles/mailing-list-faq/_index.adoc
+++ b/documentation/content/en/articles/mailing-list-faq/_index.adoc
@@ -66,7 +66,7 @@ The FreeBSD mailing lists serve as the primary communication channels for the Fr
 
 This depends on charter of each individual list.
 Some lists are more oriented to developers; some are more oriented towards the FreeBSD community as a whole.
-Please see http://lists.FreeBSD.org/mailman/listinfo[this list] for the current summary.
+Please see link:https://lists.FreeBSD.org/[this list] for the current summary.
 
 === Are the FreeBSD mailing lists open for anyone to participate?
 
@@ -82,7 +82,7 @@ However, due to past abuse by some individuals, certain lists now have a policy
 
 === How can I subscribe?
 
-You can use http://lists.FreeBSD.org/mailman/listinfo[the Mailman web interface] to subscribe to any of the public lists.
+You can use link:https://lists.FreeBSD.org/[the Mlmmj web interface] to subscribe to any of the public lists.
 
 === How can I unsubscribe?
 
@@ -94,11 +94,12 @@ This is a classical mistake when using mailing lists; please try to avoid it.
 
 === Are archives available?
 
-Yes. Threaded archives are available http://docs.FreeBSD.org/mail/[here].
+Yes. Threaded archives are available link:https://docs.FreeBSD.org/mail/[here].
+You can also access https://lists.freebsd.org/pipermail[mailman archive] and link:https://lists.freebsd.org/archives[mlmmj archive] directly.
 
 === Are mailing lists available in a digest format?
 
-Yes. See http://lists.FreeBSD.org/mailman/listinfo[the Mailman web interface].
+Yes. See link:https://lists.FreeBSD.org/[the Mlmmj web interface].
 
 [[etiquette]]
 == Mailing List Etiquette
diff --git a/documentation/content/en/books/handbook/eresources/_index.adoc b/documentation/content/en/books/handbook/eresources/_index.adoc
index 4fe0b598fc..08922502dd 100644
--- a/documentation/content/en/books/handbook/eresources/_index.adoc
+++ b/documentation/content/en/books/handbook/eresources/_index.adoc
@@ -594,7 +594,7 @@ To actually post to a given list, send mail to mailto:listname@FreeBSD.org[listn
 It will then be redistributed to mailing list members world-wide.
 
 To unsubscribe from a list, click on the URL found at the bottom of every email received from the list.
-It is also possible to send an email to mailto:listname-unsubscribe@FreeBSD.org[listname-unsubscribe@FreeBSD.org] to unsubscribe.
+It is also possible to send an email to mailto:listname+unsubscribe@FreeBSD.org[listname+unsubscribe@FreeBSD.org] to unsubscribe.
 
 It is important to keep discussion in the technical mailing lists on a technical track.
 To only receive important announcements, instead join the {freebsd-announce}, which is intended for infrequent traffic.
diff --git a/documentation/content/en/books/handbook/glossary.adoc b/documentation/content/en/books/handbook/glossary.adoc
index 2a6c755a35..c212640927 100644
--- a/documentation/content/en/books/handbook/glossary.adoc
+++ b/documentation/content/en/books/handbook/glossary.adoc
@@ -499,7 +499,7 @@ A run-time lock diagnostic system found in FreeBSD-CURRENT kernels (but removed
 (man:witness[4] is actually slightly conservative, so it is possible to get false positives.)
 A true positive report indicates that “if you were unlucky, a deadlock would have happened here”.
 +
-True positive LORs tend to get fixed quickly, so check http://lists.FreeBSD.org/mailman/listinfo/freebsd-current and the link:http://sources.zabbadoz.net/freebsd/lor.html[LORs Seen] page before posting to the mailing lists.
+True positive LORs tend to get fixed quickly, so check https://lists.FreeBSD.org/subscription/freebsd-current and the link:http://sources.zabbadoz.net/freebsd/lor.html[LORs Seen] page before posting to the mailing lists.
 
 [discrete]
 == M
diff --git a/documentation/content/en/books/handbook/mirrors/_index.adoc b/documentation/content/en/books/handbook/mirrors/_index.adoc
index 9e5807e1e2..b7b1535bf1 100644
--- a/documentation/content/en/books/handbook/mirrors/_index.adoc
+++ b/documentation/content/en/books/handbook/mirrors/_index.adoc
@@ -603,17 +603,17 @@ The project workflow with those mirrors are still under discussion.
 
 === Mailing lists
 
-General usage and questions about git in the FreeBSD project: https://lists.freebsd.org/mailman/listinfo/freebsd-git[freebsd-git]
+General usage and questions about git in the FreeBSD project: https://lists.freebsd.org/subscription/freebsd-git[freebsd-git]
 
 Commit messages will be sent to the following mailing lists:
 
-- https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all[dev-commits-doc-all]: All changes to the doc repository
-- https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-all[dev-commits-ports-all]: All changes to the ports repository
-- https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-main[dev-commits-ports-main]: All changes to the "main" branch of the ports repository
-- https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-branches[dev-commits-ports-branches]: All changes to the quarterly branches of the ports repository
-- https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all[dev-commits-src-all]: All changes to the src repository
-- https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main[dev-commits-src-main]: All changes to the "main" branch of the src repository (the FreeBSD-CURRENT branch)
-- https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches[dev-commits-src-branches]: All changes to all stable branches of the src repository
+- https://lists.freebsd.org/subscription/dev-commits-doc-all[dev-commits-doc-all]: All changes to the doc repository
+- https://lists.freebsd.org/subscription/dev-commits-ports-all[dev-commits-ports-all]: All changes to the ports repository
+- https://lists.freebsd.org/subscription/dev-commits-ports-main[dev-commits-ports-main]: All changes to the "main" branch of the ports repository
+- https://lists.freebsd.org/subscription/dev-commits-ports-branches[dev-commits-ports-branches]: All changes to the quarterly branches of the ports repository
+- https://lists.freebsd.org/subscription/dev-commits-src-all[dev-commits-src-all]: All changes to the src repository
+- https://lists.freebsd.org/subscription/dev-commits-src-main[dev-commits-src-main]: All changes to the "main" branch of the src repository (the FreeBSD-CURRENT branch)
+- https://lists.freebsd.org/subscription/dev-commits-src-branches[dev-commits-src-branches]: All changes to all stable branches of the src repository
 
 For more information, please refer to the "Commit message lists" section of C.2.
 "Mailing Lists" in handbook: https://docs.freebsd.org/en/books/handbook/eresources/#eresources-mail