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 dca20c6186..fb8b406fa9 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="&cgibase;/mid.cgi" method="get">
+<form action="https://www.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 8c723719e1..0becb844c8 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="&cgibase;/mid.cgi" method="get">
+<form action="https://www.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>