diff --git a/en_US.ISO8859-1/htdocs/search/Makefile b/en_US.ISO8859-1/htdocs/search/Makefile
index ffed39f968..e0650629b0 100644
--- a/en_US.ISO8859-1/htdocs/search/Makefile
+++ b/en_US.ISO8859-1/htdocs/search/Makefile
@@ -1,18 +1,20 @@
 # $FreeBSD$
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 DOCS+= search.xml
 DOCS+= searchhints.xml
 DOCS+=	search-mid.xml
 
+SUBDIR+= opensearch
+
 INDEXLINK=	search.html
 
 XMLDOCS=	index-site:xsl:sitemap.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/search/opensearch/Makefile b/en_US.ISO8859-1/htdocs/search/opensearch/Makefile
new file mode 100644
index 0000000000..dbbc22745f
--- /dev/null
+++ b/en_US.ISO8859-1/htdocs/search/opensearch/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
+DOCS+= 		opensearch.xml
+INDEXLINK=	opensearch.html
+
+DATA=
+DATA+=	opensearch.js
+
+DATA+=	man.xml
+DATA+=	man-freebsd-release-ports.xml
+DATA+=	message-id.xml
+
+# external sites
+DATA+=	markmail.xml
+
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/search/opensearch/man-freebsd-release-ports.xml b/en_US.ISO8859-1/htdocs/search/opensearch/man-freebsd-release-ports.xml
new file mode 100644
index 0000000000..157c423613
--- /dev/null
+++ b/en_US.ISO8859-1/htdocs/search/opensearch/man-freebsd-release-ports.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- $FreeBSD$ -->
+
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
+xml:lang="de">
+  <ShortName>FreeBSD + Ports Manpages</ShortName>
+  <LongName>FreeBSD Manual Pages</LongName>
+  <Description>FreeBSD Release + Ports Manual Pages</Description>
+  <Url template="https://www.freebsd.org/cgi/man.cgi?manpath=freebsd-release-ports&amp;query={searchTerms}&amp;sourceid=opensearch" type="text/html" />
+  <Developer>The FreeBSD Project</Developer>
+  <Contact>https://www.freebsd.org/</Contact>
+  <Image height="16" type="image/x-icon" width="16">https://www.freebsd.org/favicon.ico</Image>
+  <Language>en</Language>
+  <InputEncoding>ISO-8859-1</InputEncoding>
+</OpenSearchDescription>
+
diff --git a/en_US.ISO8859-1/htdocs/search/opensearch/man.xml b/en_US.ISO8859-1/htdocs/search/opensearch/man.xml
new file mode 100644
index 0000000000..ea3ccea8b3
--- /dev/null
+++ b/en_US.ISO8859-1/htdocs/search/opensearch/man.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- $FreeBSD$ -->
+
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
+xml:lang="de">
+  <ShortName>FreeBSD Manpages</ShortName>
+  <LongName>FreeBSD Manual Pages</LongName>
+  <Description>FreeBSD Manual Pages</Description>
+  <Url template="https://www.freebsd.org/cgi/man.cgi?query={searchTerms}&amp;sourceid=opensearch" type="text/html" />
+  <Developer>The FreeBSD Project</Developer>
+  <Contact>https://www.freebsd.org/</Contact>
+  <Image height="16" type="image/x-icon" width="16">https://www.freebsd.org/favicon.ico</Image>
+  <Language>en</Language>
+  <InputEncoding>ISO-8859-1</InputEncoding>
+</OpenSearchDescription>
+
diff --git a/en_US.ISO8859-1/htdocs/search/opensearch/markmail.xml b/en_US.ISO8859-1/htdocs/search/opensearch/markmail.xml
new file mode 100644
index 0000000000..79d661eaeb
--- /dev/null
+++ b/en_US.ISO8859-1/htdocs/search/opensearch/markmail.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- $FreeBSD$ -->
+
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
+xml:lang="de">
+  <ShortName>MarkMail FreeBSD</ShortName>
+  <LongName>FreeBSD Mailing List Search by MarkMail</LongName>
+  <Description>FreeBSD Mailing List Search by MarkMail</Description>
+  <Url template="http://freebsd.markmail.org/search/?q={searchTerms}&amp;sourceid=opensearch" type="text/html" />
+  <Developer>The FreeBSD Project</Developer>
+  <Contact>https://www.freebsd.org/</Contact>
+  <Image height="16" type="image/x-icon" width="16">https://www.freebsd.org/favicon.ico</Image>
+  <Language>en</Language>
+</OpenSearchDescription>
+
diff --git a/en_US.ISO8859-1/htdocs/search/opensearch/message-id.xml b/en_US.ISO8859-1/htdocs/search/opensearch/message-id.xml
new file mode 100644
index 0000000000..d726252234
--- /dev/null
+++ b/en_US.ISO8859-1/htdocs/search/opensearch/message-id.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- $FreeBSD$ -->
+
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
+xml:lang="de">
+  <ShortName>FreeBSD Mail Message-ID</ShortName>
+  <LongName>FreeBSD Mail Message-ID</LongName>
+  <Description>FreeBSD Mail Message-ID</Description>
+  <Url template="https://www.freebsd.org/cgi/mid.cgi?db=mid&amp;id={searchTerms}&amp;sourceid=opensearch" type="text/html" />
+  <Developer>The FreeBSD Project</Developer>
+  <Contact>https://www.freebsd.org/</Contact>
+  <Image height="16" type="image/x-icon" width="16">https://www.freebsd.org/favicon.ico</Image>
+  <Language>en</Language>
+  <InputEncoding>ISO-8859-1</InputEncoding>
+</OpenSearchDescription>
+
diff --git a/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.js b/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.js
new file mode 100644
index 0000000000..06297b1f99
--- /dev/null
+++ b/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.js
@@ -0,0 +1,10 @@
+
+function install(link) {
+	if (typeof(window.external) != 'undefined' && typeof(window.external.AddSearchProvider) != 'undefined') {
+		window.external.AddSearchProvider(link.href);
+		return false;
+	} else {
+		return confirm("The plugin couldn’t be installed automatically.  Display it instead?");
+	}
+}
+
diff --git a/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.xml b/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.xml
new file mode 100644
index 0000000000..370fdac4a2
--- /dev/null
+++ b/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
+<!ENTITY title "FreeBSD OpenSearch Plugins">
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+      <title>&title;</title>
+
+      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+    </head>
+
+    <body>
+
+<script type="text/javascript">
+    //<![CDATA[
+
+function install(link) {
+	if (typeof(window.external) != 'undefined' && typeof(window.external.AddSearchProvider) != 'undefined') {
+		window.external.AddSearchProvider(link.href);
+		return false;
+	} else {
+		return confirm("The plugin couldn't be installed automatically.  Display it instead?");
+	}
+}
+
+    //]]>
+</script>
+        <p>Firefox put a few popular search sites in the Search Bar
+        in the upper-right corner of Firefox. Click on a item to
+        add the <i>FreeBSD Search Services</i> to your Firefox Search Bar.</p>
+
+	<h3>By the FreeBSD.org web site</h3>
+        <ul>
+          <li><a href="man.xml" onclick= "return install(this)">FreeBSD Manual Pages</a></li>
+          <li><a href="man-freebsd-release-ports.xml" onclick= "return install(this)">FreeBSD + Ports Manual Pages</a></li>
+          <li><a href="message-id.xml" onclick= "return install(this)">FreeBSD Mailing List Message-ID Search</a></li>
+	  </ul>
+
+	<h3>External Plugins</h3>
+        <ul>
+          <li><a href="markmail.xml" onclick= "return install(this)">FreeBSD Mailing List Search by MarkMail</a></li>
+	  </ul>
+
+        <p>External help links: <a href=
+        "https://addons.mozilla.org/firefox/search-engines/">Firefox
+        Search Engines</a>
+	</p>
+
+<p><a href="../">Return to the search page</a></p>
+<hr/>
+
+
+  </body>
+</html>
diff --git a/en_US.ISO8859-1/htdocs/search/search.xml b/en_US.ISO8859-1/htdocs/search/search.xml
index 1e0b1a4583..77d93c3706 100644
--- a/en_US.ISO8859-1/htdocs/search/search.xml
+++ b/en_US.ISO8859-1/htdocs/search/search.xml
@@ -1,112 +1,113 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "Search">
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body>
 
     <h2>FreeBSD Search Services</h2>
 
     <ul>
       <li><a href="#web">Web pages</a></li>
       <li><a href="#manpages">Manual pages</a></li>
       <li><a href="#ports">Ported applications</a></li>
       <li><a href="#mailinglists">Mailing list archives</a></li>
       <li><a href="search-mid.html">Message-ID</a></li>
       <li><a href="https://bugs.FreeBSD.org/search/">
 	Problem Reports (Bugs) database</a></li>
       <li><a href="&cgibase;/man.cgi">Manual Pages</a></li>
       <li><a href="&cgibase;/ports.cgi">
 	Ports Search</a></li>
     </ul>
 
     <p><!-- external search engines --></p>
     <ul>
       <li><a href="http://fxr.watson.org/">
 	The Source Code</a></li>
       <li><a href="http://freebsd.markmail.org/">MarkMail: FreeBSD mail archives search</a></li>
     </ul>
 
+    <p><a href="opensearch/">List of FreeBSD OpenSearch Plugins</a></p>
     <hr noshade="noshade"/>
 
     <a name="web"></a><h2>Web pages (including <a
 	href="&base;/doc/en_US.ISO8859-1/books/faq/index.html">FAQ</a> and <a
 	href="&base;/doc/en_US.ISO8859-1/books/handbook/index.html">Handbook</a>)</h2>
 
     <h3>Search within sites:</h3>
 
     <form action="https://duckduckgo.com/" method="get">
       <h2 class="blockhide"><label for="words">Search</label></h2>
       <input type="hidden" name="sites" value="www.FreeBSD.org,docs.FreeBSD.org/doc,wiki.FreeBSD.org,forums.FreeBSD.org" />
       <input type="hidden" name="ka" value="v" />
       <input type="hidden" name="kt" value="v" />
       <input type="hidden" name="kh" value="1" />
       <input type="hidden" name="kj" value="r2" />
       <input id="words" name="q" type="text" size="50" maxlength="255"/>
       <br />
       <input id="submit" name="submit" type="submit" value="Submit Query" />
       <input id="reset" type="reset" value="Reset" />
     </form>
 
     <hr noshade="noshade"/>
 
     <a name="manpages"></a><h2>Manual Pages</h2>
 
     <h3>Search for:</h3>
 
     <form action="&cgibase;/man.cgi" method="get">
       <input type="text" name="query" size="50"/><br/>
       <input type="submit" value="Submit Query"/>
       <input type="reset" value="Reset"/>
     </form>
 
     <hr noshade="noshade"/>
 
     <a name="ports"></a><h2>Ported applications</h2>
 
     <h3>Search for:</h3>
 
     <form action="&cgibase;/ports.cgi" method="get">
       <input type="text" name="query" size="50"/><br/>
       <input type="submit" value="Submit Query"/>
       <input type="reset" value="Reset"/>
     </form>
 
     <hr noshade="noshade"/>
 
     <a name="mailinglists"></a><h2>Mailing list archives</h2>
 
     <p>The <a href="https://www.FreeBSD.org/mail/">mailing list archive</a>
       indexes are now updated weekly!</p>
 
     <p>An alternative way to read the mailing lists archives is to use the
       <a href="http://lists.FreeBSD.org/mailman/listinfo">Mailman/Pipermail
       list archive</a> (note that this archive only carries messages from
       March 2003 onward).</p>
 
     <p>The mailing lists (as well as many others) have also been archived by <a
 	href="http://markmail.org/browse/?q=list:org.freebsd">MarkMail</a>.</p>
 
     <form action="https://duckduckgo.com/" method="get">
       <h2 class="blockhide"><label for="mlwords">Search</label></h2>
       <input type="hidden" name="sites" value="docs.FreeBSD.org/mail,lists.FreeBSD.org/pipermail" />
       <input type="hidden" name="ka" value="v" />
       <input type="hidden" name="kt" value="v" />
       <input type="hidden" name="kh" value="1" />
       <input type="hidden" name="kj" value="r2" />
       <input id="mlwords" name="q" type="text" size="50" maxlength="255"/>
       <br />
       <input id="mlsubmit" name="submit" type="submit" value="Submit Query" />
       <input id="mlreset" type="reset" value="Reset" />
     </form>
 
   </body>
 </html>