diff --git a/data/Makefile b/data/Makefile
index 820f75a042..817843fee5 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.23 1998-03-15 05:00:23 jfieber Exp $
+# $Id: Makefile,v 1.24 1998-03-22 00:03:09 wosch Exp $
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
@@ -16,7 +16,7 @@ DOCS+= features.sgml gallery.sgml index-site.sgml register.sgml
 DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
 DOCS+= npgallery.sgml pgallery.sgml publish.sgml search.sgml searchhints.sgml
 DOCS+= send-pr.sgml security.sgml support.sgml where.sgml resignation.sgml
-DOCS+= y2kbug.sgml
+DOCS+= y2kbug.sgml search-mid.sgml
 
 CLEANFILES+=atoz.sgml
 
diff --git a/data/search-mid.sgml b/data/search-mid.sgml
new file mode 100644
index 0000000000..132923f085
--- /dev/null
+++ b/data/search-mid.sgml
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
+<!ENTITY date "$Date: 1998-03-22 00:03:12 $">
+<!ENTITY title "Message-ID Search">
+<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+]>
+
+<!-- Created at 1998-03-21 by Wolfram Schneider <wosch@FreeBSD.org> -->
+<!-- $Id: search-mid.sgml,v 1.1 1998-03-22 00:03:12 wosch Exp $ -->
+
+
+<html>
+&header;
+
+<h2>FreeBSD Message-ID Search</h2>
+
+<FORM ACTION="http://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>
+
+<FORM ACTION="http://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>
+
+<p>
+You can search only the mail header keywords 
+<b>Message-ID</b>, <b>Resent-Message-id</b>, <b>In-Reply-to</b>, and
+<b>References</b>. 
+A Message-ID looks like &lt;199802242058.MAA24843@monk.via.net&gt;.
+No other mail header keywords are supported. The
+Message-ID database will be updated every hour.<p>
+
+<a href="search.html#mailinglists">Full text mailing list archives</a>.
+
+<hr noshade>
+
+&footer;
+</body>
+</html>
diff --git a/data/search.sgml b/data/search.sgml
index 6ac6451067..afa28a2a43 100644
--- a/data/search.sgml
+++ b/data/search.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$Date: 1998-03-18 19:32:20 $">
+<!ENTITY date "$Date: 1998-03-22 00:03:11 $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $Id: search.sgml,v 1.26 1998-03-18 19:32:20 wosch Exp $ -->
+<!-- $Id: search.sgml,v 1.27 1998-03-22 00:03:11 wosch Exp $ -->
 
 <html>
 &header;
@@ -19,7 +19,7 @@ Ports Changes</a>
 The Source Code</a>
 <li><a href="#web">Web pages</a>
 <li><a href="#mailinglists">Mailing list archives</a>
-<li><a href="http://www.freebsd.org/~wosch/test/mid/mid.html">Message-ID</a>
+<li><a href="http://www.freebsd.org/search-mid.html">Message-ID</a>
 <li><a href="http://minnie.cs.adfa.oz.au/BSD-info/bsdnews_search.html">BSD Usenet News Searcher</a>
 </ul>
 
diff --git a/en/Makefile b/en/Makefile
index 820f75a042..817843fee5 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.23 1998-03-15 05:00:23 jfieber Exp $
+# $Id: Makefile,v 1.24 1998-03-22 00:03:09 wosch Exp $
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
@@ -16,7 +16,7 @@ DOCS+= features.sgml gallery.sgml index-site.sgml register.sgml
 DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
 DOCS+= npgallery.sgml pgallery.sgml publish.sgml search.sgml searchhints.sgml
 DOCS+= send-pr.sgml security.sgml support.sgml where.sgml resignation.sgml
-DOCS+= y2kbug.sgml
+DOCS+= y2kbug.sgml search-mid.sgml
 
 CLEANFILES+=atoz.sgml
 
diff --git a/en/search/search-mid.sgml b/en/search/search-mid.sgml
new file mode 100644
index 0000000000..132923f085
--- /dev/null
+++ b/en/search/search-mid.sgml
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
+<!ENTITY date "$Date: 1998-03-22 00:03:12 $">
+<!ENTITY title "Message-ID Search">
+<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
+]>
+
+<!-- Created at 1998-03-21 by Wolfram Schneider <wosch@FreeBSD.org> -->
+<!-- $Id: search-mid.sgml,v 1.1 1998-03-22 00:03:12 wosch Exp $ -->
+
+
+<html>
+&header;
+
+<h2>FreeBSD Message-ID Search</h2>
+
+<FORM ACTION="http://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>
+
+<FORM ACTION="http://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>
+
+<p>
+You can search only the mail header keywords 
+<b>Message-ID</b>, <b>Resent-Message-id</b>, <b>In-Reply-to</b>, and
+<b>References</b>. 
+A Message-ID looks like &lt;199802242058.MAA24843@monk.via.net&gt;.
+No other mail header keywords are supported. The
+Message-ID database will be updated every hour.<p>
+
+<a href="search.html#mailinglists">Full text mailing list archives</a>.
+
+<hr noshade>
+
+&footer;
+</body>
+</html>
diff --git a/en/search/search.sgml b/en/search/search.sgml
index 6ac6451067..afa28a2a43 100644
--- a/en/search/search.sgml
+++ b/en/search/search.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$Date: 1998-03-18 19:32:20 $">
+<!ENTITY date "$Date: 1998-03-22 00:03:11 $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $Id: search.sgml,v 1.26 1998-03-18 19:32:20 wosch Exp $ -->
+<!-- $Id: search.sgml,v 1.27 1998-03-22 00:03:11 wosch Exp $ -->
 
 <html>
 &header;
@@ -19,7 +19,7 @@ Ports Changes</a>
 The Source Code</a>
 <li><a href="#web">Web pages</a>
 <li><a href="#mailinglists">Mailing list archives</a>
-<li><a href="http://www.freebsd.org/~wosch/test/mid/mid.html">Message-ID</a>
+<li><a href="http://www.freebsd.org/search-mid.html">Message-ID</a>
 <li><a href="http://minnie.cs.adfa.oz.au/BSD-info/bsdnews_search.html">BSD Usenet News Searcher</a>
 </ul>