diff --git a/website/themes/beastie/layouts/shortcodes/form-search-mid-id.html b/website/themes/beastie/layouts/shortcodes/form-search-mid-id.html
index fb8b406fa9..0f7cdf46a1 100644
--- a/website/themes/beastie/layouts/shortcodes/form-search-mid-id.html
+++ b/website/themes/beastie/layouts/shortcodes/form-search-mid-id.html
@@ -1,6 +1,6 @@
-<form action="https://www.freebsd.org/cgi/mid.cgi" method="get">
+<form action="https://mail-archive.freebsd.org/cgi/mid.cgi" method="get">
   <b>Message-ID:</b><br/>
   <input name="id" type="text" size="50"/>
   <input name="db" value="mid" type="hidden"/>
   <input type="submit" value="Search"/>
 </form>
diff --git a/website/themes/beastie/layouts/shortcodes/form-search-mid-message.html b/website/themes/beastie/layouts/shortcodes/form-search-mid-message.html
index 0becb844c8..35d0d8d197 100644
--- a/website/themes/beastie/layouts/shortcodes/form-search-mid-message.html
+++ b/website/themes/beastie/layouts/shortcodes/form-search-mid-message.html
@@ -1,6 +1,6 @@
-<form action="https://www.freebsd.org/cgi/mid.cgi" method="get">
+<form action="https://mail-archive.freebsd.org/cgi/mid.cgi" method="get">
   <b>Answers to a Message-ID:</b><br/>
   <input name="db" value="irt" type="hidden"/>
   <input type="text" name="id" size="50"/>
   <input type="submit" value="Search"/>
 </form>
diff --git a/website/themes/beastie/static/opensearch/message-id.xml b/website/themes/beastie/static/opensearch/message-id.xml
index 1682f24e79..9f55365cf6 100644
--- a/website/themes/beastie/static/opensearch/message-id.xml
+++ b/website/themes/beastie/static/opensearch/message-id.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
   <ShortName>FreeBSD M-ID</ShortName>
   <Description>FreeBSD Mail Message-ID</Description>
   <InputEncoding>UTF-8</InputEncoding>
   <Image width="16" height="16" type="image/x-icon">https://docs.freebsd.org/favicon.ico</Image>
-  <Url type="text/html" method="get" template="https://docs.freebsd.org/cgi/mid.cgi?db=mid&amp;id={searchTerms}&amp;sourceid=opensearch"/>
-  <moz:SearchForm>https://docs.freebsd.org/cgi/mid.cgi</moz:SearchForm>
+  <Url type="text/html" method="get" template="https://mail-archive.freebsd.org/cgi/mid.cgi?db=mid&amp;id={searchTerms}&amp;sourceid=opensearch"/>
+  <moz:SearchForm>https://mail-archive.freebsd.org/cgi/mid.cgi</moz:SearchForm>
 </OpenSearchDescription>