diff --git a/en_US.ISO8859-1/htdocs/search/search.xml b/en_US.ISO8859-1/htdocs/search/search.xml
--- a/en_US.ISO8859-1/htdocs/search/search.xml
+++ b/en_US.ISO8859-1/htdocs/search/search.xml
@@ -39,19 +39,22 @@
     <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>
+	href="&base;/doc/en_US.ISO8859-1/books/faq/index.html">FAQ</a>, <a
+	href="&base;/doc/en_US.ISO8859-1/books/handbook/index.html">Handbook</a>, <a
+	href="https://lists.freebsd.org">Mailing Lists</a>, <a
+	href="https://wiki.freebsd.org">Wiki</a> and <a
+	href="https://forums.freebsd.org">Forums</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" />
+    <form action="https://duckduckgo.com/" method="get"
+        onsubmit="document.getElementById('words2').value+=' (site:www.FreeBSD.org OR site:docs.FreeBSD.org OR site:lists.FreeBSD.org OR site:wiki.FreeBSD.org OR site:forums.FreeBSD.org)'">
+      <h2 class="blockhide"><label for="words2">Search</label></h2>
       <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"/>
+      <input id="words2" 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" />