diff --git a/handbook/hw.sgml b/handbook/hw.sgml
index 405b49f09f..5660f6bf27 100644
--- a/handbook/hw.sgml
+++ b/handbook/hw.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: hw.sgml,v 1.21 1996-05-16 23:18:01 mpp Exp $ -->
+<!-- $Id: hw.sgml,v 1.22 1996-05-22 19:13:58 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- 
@@ -32,6 +32,45 @@
     FreeBSD you are using and include as many details of your
     hardware as possible.
 
+
+<sect><heading>FreeBSD on Laptop computers</heading>
+
+<p>Because laptop computers operate under a unique set of constraints,
+   they often behave differently or require more specialized knowledge
+   than their desktop and deskside PC siblings.  This section attempts to
+   list the most useful (and current) laptop specific information on the
+   net.
+
+<itemize>
+  <item>Tatsumi Hosokawa's <htmlurl
+    url="http://www.mt.cs.keio.ac.jp/person/hosokawa/freebsd-pcmcia/"
+    name="PCCARD driver"> page.
+
+    <p><htmlurl url="mailto:hosokawa@mt.cs.keio.ac.jp"
+    name="Tatsumi Hosokawa"> and the BSD Nomads have created a
+    complete subsystem for dealing with PCCARD (PCMCIA) peripherals,
+    from modems to ethernet cards to SCSI adaptors.  Much of this work
+    is now part of FreeBSD <htmlurl url="current.html" name="2.2-current">,
+    though more up-to-date experimental code snapshots may be found on
+    this page.
+  </item>
+
+  <item>FreeBSD on the <htmlurl url="http://www.cs.ruu.nl/people/edwin/FreeBSD/"
+    name="Toshiba Satellite Pro 410CDT Notebook">
+
+    <p>Here is <htmlurl url="mailto:edwin.kremer@cs.ruu.nl"
+    name="Edwin Kremer's"> report on using FreeBSD with his Toshiba 410CDT.
+  </item>
+
+  <item>FreeBSD on the <htmlurl url="http://www.kfu.com/~nsayer/zenith/"
+    name="Zenith Z-NoteFlex Laptop">
+
+    <p>Nick tells us about life with what he deems to be the ideal laptop
+    for FreeBSD.
+  </item>
+</itemize>
+</sect>
+
 <sect><heading>Sample Configurations<label id="hw:configs"></heading>
 <p>The following list of sample hardware configurations by no means
 constitutes an endorsement of a given hardware vendor or product by
diff --git a/handbook/mirrors.sgml b/handbook/mirrors.sgml
index 03a718d3ef..e7ee964120 100644
--- a/handbook/mirrors.sgml
+++ b/handbook/mirrors.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: mirrors.sgml,v 1.32 1996-05-09 23:04:47 mpp Exp $ -->
+<!-- $Id: mirrors.sgml,v 1.33 1996-05-22 19:13:59 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
@@ -10,7 +10,7 @@
 <p>The official sources for FreeBSD available via anonymous FTP from:
 <quote>
 <htmlurl url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD" 
-name="ftp://ftp.FreeBSD.org/pub/FreeBSD">
+name="ftp://ftp.FreeBSD.ORG/pub/FreeBSD">
 </quote> 
 and on CD-ROM from Walnut Creek CDROM:
 <quote>
@@ -73,6 +73,12 @@ for this domain.
 <item>
 <htmlurl url="ftp://ftp5.br.FreeBSD.ORG/pub/FreeBSD"
 	name="ftp://ftp5.br.FreeBSD.ORG/pub/FreeBSD"><newline>
+<item>
+<htmlurl url="ftp://ftp6.br.FreeBSD.ORG/pub/FreeBSD"
+	name="ftp://ftp6.br.FreeBSD.ORG/pub/FreeBSD"><newline>
+<item>
+<htmlurl url="ftp://ftp7.br.FreeBSD.ORG/pub/FreeBSD"
+	name="ftp://ftp7.br.FreeBSD.ORG/pub/FreeBSD"><newline>
 </itemize>
 
 <tag>Canada</tag>
@@ -104,13 +110,15 @@ for this domain.
 
 <tag>Finland</tag>
 
+In case of problems, please contact the
+<htmlurl url="mailto:hostmaster@fi.FreeBSD.ORG" name="hostmaster">
+for this domain.
+
 <itemize>
 
 <item>
-<htmlurl url="ftp://nic.funet.fi/pub/unix/FreeBSD"
-	name="ftp://nic.funet.fi/pub/unix/FreeBSD"><newline>
-	Contact: <htmlurl url="mailto:count@nic.funet.fi"
-	name="count@nic.funet.fi">.
+<htmlurl url="ftp://ftp.fi.freebsd.ORG/pub/FreeBSD"
+	name="ftp://ftp.fi.freebsd.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
@@ -172,6 +180,10 @@ for this domain.
 
 <tag>Ireland</tag>
 
+In case of problems, please contact the
+<htmlurl url="mailto:hostmaster@ie.FreeBSD.ORG" name="hostmaster">
+for this domain.
+
 <itemize>
 
 <item>
@@ -246,20 +258,22 @@ for this domain.
 
 <tag>Netherlands</tag>
 
+In case of problems, please contact the
+<htmlurl url="mailto:hostmaster@nl.FreeBSD.ORG" name="hostmaster">
+for this domain.
+
 <itemize>
 
 <item>
-<htmlurl url="ftp://ftp.nl.net/pub/os/FreeBSD"
-	name="ftp://ftp.nl.net/pub/os/FreeBSD"><newline>
-	Contact: <htmlurl url="mailto:archive@nl.net"
-	name="archive@nl.net">.
+<htmlurl url="ftp://ftp.nl.freebsd.ORG/pub/FreeBSD"
+	name="ftp://ftp.nl.freebsd.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
 <tag>Poland</tag>
 
 <itemize>
-     
+ 
 <item>
 <htmlurl url="ftp://SunSITE.icm.edu.pl/pub/FreeBSD"
 	name="ftp://SunSITE.icm.edu.pl/pub/FreeBSD"><newline>
@@ -311,13 +325,15 @@ for this domain.
 
 <tag>Sweden</tag>
 
+In case of problems, please contact the
+<htmlurl url="mailto:hostmaster@se.FreeBSD.ORG" name="hostmaster">
+for this domain.
+
 <itemize>
 
 <item>
-<htmlurl url="ftp://ftp.luth.se/pub/FreeBSD"
-	name="ftp://ftp.luth.se/pub/FreeBSD"><newline>
-	Contact: <htmlurl url="mailto:ragge@ludd.luth.se"
-	name="ragge@ludd.luth.se">.
+<htmlurl url="ftp://ftp.se.freebsd.ORG/pub/FreeBSD"
+	name="ftp://ftp.se.freebsd.ORG/pub/FreeBSD"><newline>
 
 </itemize>
 
@@ -384,6 +400,10 @@ for this domain.
 
 <tag>UK</tag>
 
+In case of problems, please contact the
+<htmlurl url="mailto:hostmaster@uk.FreeBSD.ORG" name="hostmaster">
+for this domain.
+
 <itemize>
 
 <item>
@@ -397,6 +417,7 @@ for this domain.
 	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)
@@ -447,4 +468,5 @@ for this domain.
 	name="count@nic.funet.fi">.
 
 </itemize>
+
 </descrip>