diff --git a/handbook/mirrors.sgml b/handbook/mirrors.sgml
index 2d323321c2..66fe78fb4d 100644
--- a/handbook/mirrors.sgml
+++ b/handbook/mirrors.sgml
@@ -1,565 +1,570 @@
-<!-- $Id: mirrors.sgml,v 1.41 1996-10-11 12:07:43 jkh Exp $ -->
+<!-- $Id: mirrors.sgml,v 1.42 1996-12-17 01:36:37 wosch Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
 <!doctype linuxdoc public "-//FreeBSD//DTD linuxdoc//EN">
 -->
 
 <chapt><heading>Obtaining FreeBSD<label id="mirrors"></heading>
 
 <p>The official sources for FreeBSD available via anonymous FTP from:
 <quote>
 <url url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD" 
 name="ftp://ftp.FreeBSD.ORG/pub/FreeBSD">
 </quote> 
 and on CD-ROM from Walnut Creek CDROM:
 <quote>
  Walnut Creek CDROM<newline>
  1547 Palos Verdes Mall, Suite 260<newline>
  Walnut Creek CA 94596 USA<newline>
  Phone: +1 510 674-0783<newline>
  Fax: +1 510 674-0821<newline>
  Email: <url url="mailto:info@cdrom.com" name="info@cdrom.com"><newline>
  WWW: <url url="http://www.cdrom.com/" name="http://www.cdrom.com/">
 </quote>
 
 <p>Additionally, FreeBSD is available via anonymous FTP from the
       following mirror sites. If you choose to obtain FreeBSD via
       anonymous FTP, please try to use a site near you.
 
 <ref id="mirrors-au" name="Australia">, 
 <ref id="mirrors-br" name="Brazil">, 
 <ref id="mirrors-ca" name="Canada">,
 <ref id="mirrors-cz" name="Czech Republic">,
 <ref id="mirrors-ee" name="Estonia">,
 <ref id="mirrors-fi" name="Finland">,
 <ref id="mirrors-fr" name="France">,
 <ref id="mirrors-de" name="Germany">,
 <ref id="mirrors-hk" name="Hong Kong">,
 <ref id="mirrors-ie" name="Ireland">,
 <ref id="mirrors-il" name="Israel">,
 <ref id="mirrors-jp" name="Japan">,
 <ref id="mirrors-kr" name="Korea">,
 <ref id="mirrors-nl" name="Netherlands">,
 <ref id="mirrors-pl" name="Poland">,
 <ref id="mirrors-pt" name="Portugal">,
 <ref id="mirrors-ru" name="Russia">,
 <ref id="mirrors-za" name="South Africa">,
 <ref id="mirrors-se" name="Sweden">,
 <ref id="mirrors-tw" name="Taiwan">,
 <ref id="mirrors-th" name="Thailand">,
 <ref id="mirrors-us" name="USA">,
 <ref id="mirrors-uk" name="UK">.
 
 
 <descrip>
 <tag><label id="mirrors-au">Australia</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@au.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.au.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.au.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp2.au.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp2.au.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp3.au.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp3.au.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp4.au.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp4.au.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-br">Brazil</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@br.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 <item>
 <url url="ftp://ftp.br.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.br.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp2.br.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp2.br.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp3.br.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp3.br.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp4.br.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp4.br.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp5.br.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp5.br.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp6.br.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp6.br.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp7.br.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp7.br.FreeBSD.ORG/pub/FreeBSD"><newline>
 </itemize>
 
 <tag><label id="mirrors-ca">Canada</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@ca.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.ca.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.ca.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-cz">Czech Republic</tag>
 
 <itemize>
 
 <item>
 <url url="ftp://sunsite.mff.cuni.cz/OS/FreeBSD"
 	name="ftp://sunsite.mff.cuni.cz/OS/FreeBSD"><newline>
 	Contact: <url url="jj@sunsite.mff.cuni.cz"
 	name="jj@sunsite.mff.cuni.cz">.
 
 </itemize>
 
 <tag><label id="mirrors-ee">Estonia</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@ee.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.ee.freebsd.ORG/pub/FreeBSD"
 	name="ftp://ftp.ee.freebsd.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-fi">Finland</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@fi.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.fi.freebsd.ORG/pub/FreeBSD"
 	name="ftp://ftp.fi.freebsd.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-fr">France</tag>
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.ibp.fr/pub/FreeBSD"
 	name="ftp://ftp.ibp.fr/pub/FreeBSD"><newline>
 	Contact: <url url="mailto:Remy.Card@ibp.fr"
 	name="Remy.Card@ibp.fr">.
 
 </itemize>
 
 <tag><label id="mirrors-de">Germany</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@de.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.de.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.de.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp2.de.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp2.de.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp3.de.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp3.de.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp4.de.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp4.de.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp5.de.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp5.de.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp6.de.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp6.de.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp7.de.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp7.de.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-hk">Hong Kong</tag>
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.hk.super.net/pub/FreeBSD"
 	name="ftp://ftp.hk.super.net/pub/FreeBSD"><newline>
 	Contact: <url url="mailto:ftp-admin@HK.Super.NET"
 	name="ftp-admin@HK.Super.NET">.
 
 </itemize>
 
 <tag><label id="mirrors-ie">Ireland</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@ie.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.ie.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.ie.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-il">Israel</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@il.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.il.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.il.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp2.il.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp2.il.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-jp">Japan</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@jp.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.jp.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.jp.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp2.jp.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp2.jp.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp3.jp.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp3.jp.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp4.jp.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp4.jp.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp5.jp.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp5.jp.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp6.jp.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp6.jp.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-kr">Korea</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@kr.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.kr.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.kr.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp2.kr.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp2.kr.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-nl">Netherlands</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@nl.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.nl.freebsd.ORG/pub/FreeBSD"
 	name="ftp://ftp.nl.freebsd.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-pl">Poland</tag>
 
 <itemize>
  
 <item>
 <url url="ftp://SunSITE.icm.edu.pl/pub/FreeBSD"
 	name="ftp://SunSITE.icm.edu.pl/pub/FreeBSD"><newline>
 	Contact: <url url="mailto:ftp@SunSITE.icm.edu.pl"
 	name="ftp@SunSITE.icm.edu.pl">.
 
 </itemize>
 
 <tag><label id="mirrors-pt">Portugal</tag>
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.ua.pt/pub/misc/FreeBSD"
 	name="ftp://ftp.ua.pt/pub/misc/FreeBSD"><newline>
 	Contact: <url url="mailto:archie@ua.pt"
 	name="archie@ua.pt">.
 
 </itemize>
 
 <tag><label id="mirrors-ru">Russia</tag>
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.kiae.su/FreeBSD"
 	name="ftp://ftp.kiae.su/FreeBSD"><newline>
 	Contact: <url url="mailto:ftp@ftp.kiae.su"
 	name="ftp@ftp.kiae.su">.
 
 </itemize>
 
 <tag><label id="mirrors-za">South Africa</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@za.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.za.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.za.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp2.za.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp2.za.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp3.za.FreeBSD.ORG/FreeBSD"
 	name="ftp://ftp3.za.FreeBSD.ORG/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-se">Sweden</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@se.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.se.freebsd.ORG/pub/FreeBSD"
 	name="ftp://ftp.se.freebsd.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-tw">Taiwan</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@tw.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.tw.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.tw.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp2.tw.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp2.tw.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp3.tw.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp3.tw.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-th">Thailand</tag>
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.nectec.or.th/pub/FreeBSD"
 	name="ftp://ftp.nectec.or.th/pub/FreeBSD"><newline>
 	Contact: <url url="mailto:ftpadmin@ftp.nectec.or.th"
 	name="ftpadmin@ftp.nectec.or.th">.
 
 </itemize>
 
 <tag><label id="mirrors-us">USA</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp2.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp2.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp3.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp3.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp4.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp4.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp5.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp5.FreeBSD.ORG/pub/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp6.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp6.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag><label id="mirrors-uk">UK</tag>
 
 In case of problems, please contact the
 <url url="mailto:hostmaster@uk.FreeBSD.ORG" name="hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.uk.FreeBSD.ORG/packages/unix/FreeBSD"
 	name="ftp://ftp.uk.FreeBSD.ORG/packages/unix/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp2.uk.FreeBSD.ORG/pub/walnut.creek/FreeBSD"
 	name="ftp://ftp2.uk.FreeBSD.ORG/pub/walnut.creek/FreeBSD"><newline>
 <item>
 <url url="ftp://ftp3.uk.FreeBSD.ORG/pub/BSD/FreeBSD"
 	name="ftp://ftp3.uk.FreeBSD.ORG/pub/BSD/FreeBSD"><newline>
 
 </itemize>
 
 </descrip>
 
 The latest versions of export-restricted code for FreeBSD (2.0C or later)
 (eBones and secure) are being made available at the following locations.
 If you are outside the U.S. or Canada, please get secure (DES) and
 eBones (Kerberos) from one of the following foreign distribution sites:
 
 <descrip>
 
 <tag>South Africa</tag>
 
 <url url="mailto:hostmaster@internat.FreeBSD.ORG" name="Hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.internat.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.internat.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 <item>
 <url url="ftp://ftp2.internat.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp2.internat.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag>Brazil</tag>
 
 <url url="mailto:hostmaster@br.FreeBSD.ORG" name="Hostmaster">
 for this domain.
 
 <itemize>
 
 <item>
 <url url="ftp://ftp.br.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp.br.FreeBSD.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag>Finland</tag>
 
 <itemize>
 
 <item>
 <url url="ftp://nic.funet.fi/pub/unix/FreeBSD/eurocrypt"
 	name="ftp://nic.funet.fi/pub/unix/FreeBSD/eurocrypt"><newline>
 	Contact: <url url="mailto:count@nic.funet.fi"
 	name="count@nic.funet.fi">.
 
 </itemize>
 
 </descrip>
 
 <label id="mirrors-ctm">
 <p>CTM/FreeBSD is available via anonymous FTP from the
       following mirror sites. If you choose to obtain CTM via
       anonymous FTP, please try to use a site near you.
 
 In case of problems, please contact &a.phk;.
 
 <descrip>
-<tag>California</tag>
-
+<tag>California, Bay Area, official source</tag>
 <itemize>
 <item>
 <url url="ftp://freefall.freebsd.org/pub/CTM"
 	name="ftp://freefall.freebsd.org/pub/CTM"><newline>
 </itemize>
 
 
-<tag>Denmark</tag>
-
+<tag>Germany, Berlin</tag>
 <itemize>
 <item>
-<url url="ftp://sunsite.auc.dk/mirrors/freefall.freebsd.org/pub/CTM"
-	name="ftp://sunsite.auc.dk/mirrors/freefall.freebsd.org/pub/CTM"><newline>
+<url url="ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/CTM"
+	name="ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/CTM"><newline>
 </itemize>
 
 
-<tag>Germany</tag>
-
+<tag>Germany, Trier</tag>
 <itemize>
 <item>
-<url url="ftp://ftp6.de.freebsd.org/pub/bsd/CTM/FreeBSD"
-	name="ftp://ftp6.de.freebsd.org/pub/bsd/CTM/FreeBSD"><newline>
+<url url="ftp://ftp.uni-trier.de/pub/unix/systems/BSD/FreeBSD/FreeBSD-current/CTM" 
+	name="ftp://ftp.uni-trier.de/pub/unix/systems/BSD/FreeBSD/FreeBSD-current/CTM"><newline>
 </itemize>
 
 
-<tag>Taiwan</tag>
+<tag>South Africa, backup server for old deltas</tag>
+<itemize>
+<item>
+<url url="ftp://ftp.internat.freebsd.org/pub/FreeBSD/CTM"
+	name="ftp://ftp.internat.freebsd.org/pub/FreeBSD/CTM"><newline>
+</itemize>
+
 
+<tag>Taiwan/R.O.C, Chiayi</tag>
 <itemize>
 <item>
-<url url="ftp://ftp.iii.org.tw/OS/FreeBSD/00MIRROR/freefall.freebsd.org/CTM"
-	name="ftp://ftp.iii.org.tw/OS/FreeBSD/00MIRROR/freefall.freebsd.org/CTM"><newline>
+<url url="ftp://ftp.ccu.edu.tw/pub/freebsd/CTM"
+	name="ftp://ftp.ccu.edu.tw/pub/freebsd/CTM"><newline>
 </itemize>
 
 </descrip>
 
 
 If you did not find a mirror near to you or the mirror is incomplete,
 try 
 <url url="http://ftpsearch.ntnu.no/" name="FTP search"> at
 <url url="http://ftpsearch.ntnu.no/ftpsearch/"
 	name="http://ftpsearch.ntnu.no/ftpsearch">. 
 FTP search is a great free archie server in Trondheim, Norway.
+