diff --git a/data/search.sgml b/data/search.sgml
index 7b9e7a58cf..7074895386 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-04-27 10:07:15 $">
+<!ENTITY date "$Date: 1998-06-12 08:33:37 $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $Id: search.sgml,v 1.30 1998-04-27 10:07:15 wosch Exp $ -->
+<!-- $Id: search.sgml,v 1.31 1998-06-12 08:33:37 wosch Exp $ -->
 
 <html>
 &header;
@@ -94,6 +94,12 @@ yield inaccurate results.</em></p>
 <h3>General Archives</h3>
 
 <table>
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-advocacy"> <strong>Advocacy</strong></td>
+  <td>FreeBSD Evangelism</td>
+</tr>
+
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-announce"> <strong>Announce</strong></td>
@@ -112,6 +118,12 @@ yield inaccurate results.</em></p>
   <td>FreeBSD related job announcements and resumes</td>
 </tr>
 
+<tr>
+  <td><input type="checkbox" name="source" checked="checked"
+	value="freebsd-newbies"> <strong>newbies</strong></td>
+  <td>New FreeBSD users activities and discussion</td>
+</tr>
+
 <tr>
   <td><input type="checkbox" name="source" checked="checked"
 	value="freebsd-questions"> <strong>Questions</strong></td>
@@ -146,12 +158,6 @@ yield inaccurate results.</em></p>
   <td>Discussions for ISPs using FreeBSD</td>
 </tr>
 
-<tr>
-  <td><input type="checkbox" name="source"
-	value="freebsd-mobile"> <strong>Mobile</strong></td>
-  <td>Using FreeBSD in a mobile environment</td>
-</tr>
-
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-security"> <strong>Security</strong></td>
@@ -252,6 +258,24 @@ yield inaccurate results.</em></p>
   <td>Discussions about FreeBSD as a multimedia platform</td>
 </tr>
 
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-mobile"> <strong>Mobile</strong></td>
+  <td>Using FreeBSD in a mobile environment</td>
+</tr>
+
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-mozilla"> <strong>Mozilla</strong></td>
+  <td>Porting mozilla to FreeBSD</td>
+</tr>
+
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-net"> <strong>Net</strong></td>
+  <td>Networking discussion and TCP/IP source code</td>
+</tr>
+
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-platforms"> <strong>Platforms</strong></td>
@@ -276,6 +300,13 @@ yield inaccurate results.</em></p>
   <td>Discussions about FreeBSD's SCSI support</td>
 </tr>
 
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-small"> <strong>Small</strong></td>
+  <td>Using FreeBSD in embedded applications</td>
+</tr>
+
+
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-smp"> <strong>SMP</strong></td>
@@ -287,21 +318,28 @@ yield inaccurate results.</em></p>
 	value="freebsd-sparc"> <strong>SPARC</strong></td>
   <td>Porting FreeBSD to the SPARC</td>
 </tr>
+
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-tokenring"> <strong>Tokenring</strong></td>
+  <td>Support Token Ring in FreeBSD</td>
+</tr>
+
 </table>
 
 <!--
 <input type="checkbox" name="source" value="freebsd-hubs"> 
 	<b>Hubs:</b> Managers of FreeBSD ftp/www mirrors and mail relays<br>
 
+<input type="checkbox" name="source" value="freebsd-install"> 
+	<b>Install:</b> Installation development<br>
+
 <input type="checkbox" name="source" value="freebsd-atm"> 
 	<b>Atm:</b> <br>
 
 <input type="checkbox" name="source" value="freebsd-ircops"> 
 	<b>Ircops:</b> <br>
 
-<input type="checkbox" name="source" value="freebsd-realtime"> 
-	<b>Realtime:</b> <br>
-
 <input type="checkbox" name="source" value="freebsd-security-notifications"> 
 	<b>Security-notifications:</b> <br>
 
diff --git a/en/search/search.sgml b/en/search/search.sgml
index 7b9e7a58cf..7074895386 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-04-27 10:07:15 $">
+<!ENTITY date "$Date: 1998-06-12 08:33:37 $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $Id: search.sgml,v 1.30 1998-04-27 10:07:15 wosch Exp $ -->
+<!-- $Id: search.sgml,v 1.31 1998-06-12 08:33:37 wosch Exp $ -->
 
 <html>
 &header;
@@ -94,6 +94,12 @@ yield inaccurate results.</em></p>
 <h3>General Archives</h3>
 
 <table>
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-advocacy"> <strong>Advocacy</strong></td>
+  <td>FreeBSD Evangelism</td>
+</tr>
+
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-announce"> <strong>Announce</strong></td>
@@ -112,6 +118,12 @@ yield inaccurate results.</em></p>
   <td>FreeBSD related job announcements and resumes</td>
 </tr>
 
+<tr>
+  <td><input type="checkbox" name="source" checked="checked"
+	value="freebsd-newbies"> <strong>newbies</strong></td>
+  <td>New FreeBSD users activities and discussion</td>
+</tr>
+
 <tr>
   <td><input type="checkbox" name="source" checked="checked"
 	value="freebsd-questions"> <strong>Questions</strong></td>
@@ -146,12 +158,6 @@ yield inaccurate results.</em></p>
   <td>Discussions for ISPs using FreeBSD</td>
 </tr>
 
-<tr>
-  <td><input type="checkbox" name="source"
-	value="freebsd-mobile"> <strong>Mobile</strong></td>
-  <td>Using FreeBSD in a mobile environment</td>
-</tr>
-
 <tr>
   <td><input type="checkbox" name="source"
 	value="freebsd-security"> <strong>Security</strong></td>
@@ -252,6 +258,24 @@ yield inaccurate results.</em></p>
   <td>Discussions about FreeBSD as a multimedia platform</td>
 </tr>
 
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-mobile"> <strong>Mobile</strong></td>
+  <td>Using FreeBSD in a mobile environment</td>
+</tr>
+
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-mozilla"> <strong>Mozilla</strong></td>
+  <td>Porting mozilla to FreeBSD</td>
+</tr>
+
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-net"> <strong>Net</strong></td>
+  <td>Networking discussion and TCP/IP source code</td>
+</tr>
+
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-platforms"> <strong>Platforms</strong></td>
@@ -276,6 +300,13 @@ yield inaccurate results.</em></p>
   <td>Discussions about FreeBSD's SCSI support</td>
 </tr>
 
+<tr>
+  <td><input type="checkbox" name="source"
+	value="freebsd-small"> <strong>Small</strong></td>
+  <td>Using FreeBSD in embedded applications</td>
+</tr>
+
+
 <tr>
   <td><input type="checkbox" name="source" 
 	value="freebsd-smp"> <strong>SMP</strong></td>
@@ -287,21 +318,28 @@ yield inaccurate results.</em></p>
 	value="freebsd-sparc"> <strong>SPARC</strong></td>
   <td>Porting FreeBSD to the SPARC</td>
 </tr>
+
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-tokenring"> <strong>Tokenring</strong></td>
+  <td>Support Token Ring in FreeBSD</td>
+</tr>
+
 </table>
 
 <!--
 <input type="checkbox" name="source" value="freebsd-hubs"> 
 	<b>Hubs:</b> Managers of FreeBSD ftp/www mirrors and mail relays<br>
 
+<input type="checkbox" name="source" value="freebsd-install"> 
+	<b>Install:</b> Installation development<br>
+
 <input type="checkbox" name="source" value="freebsd-atm"> 
 	<b>Atm:</b> <br>
 
 <input type="checkbox" name="source" value="freebsd-ircops"> 
 	<b>Ircops:</b> <br>
 
-<input type="checkbox" name="source" value="freebsd-realtime"> 
-	<b>Realtime:</b> <br>
-
 <input type="checkbox" name="source" value="freebsd-security-notifications"> 
 	<b>Security-notifications:</b> <br>
 

Advocacy	FreeBSD Evangelism
Announce	FreeBSD related job announcements and resumes
newbies	New FreeBSD users activities and discussion
Questions	Discussions for ISPs using FreeBSD
Mobile	Using FreeBSD in a mobile environment
Security	Discussions about FreeBSD as a multimedia platform
Mobile	Using FreeBSD in a mobile environment
Mozilla	Porting mozilla to FreeBSD
Net	Networking discussion and TCP/IP source code
Platforms	Discussions about FreeBSD's SCSI support
Small	Using FreeBSD in embedded applications
SMP	Porting FreeBSD to the SPARC
Tokenring	Support Token Ring in FreeBSD