diff --git a/FAQ/FAQ.sgml b/FAQ/FAQ.sgml
index 2aaca206f7..afdc0eef64 100644
--- a/FAQ/FAQ.sgml
+++ b/FAQ/FAQ.sgml
@@ -1,12 +1,12 @@
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN">
-<!-- $Id: FAQ.sgml,v 1.59 1997-06-15 19:56:41 jfieber Exp $ -->
+<!-- $Id: FAQ.sgml,v 1.60 1997-06-24 13:00:57 pds Exp $ -->
 
   <article>
 
 <title>Frequently Asked Questions for FreeBSD 2.X
 <author>Maintainer: Peter da Silva <tt><htmlurl url='mailto:pds@FreeBSD.ORG'
   name='&lt;pds@FreeBSD.ORG&gt;'></tt>
-<date>$Date: 1997-06-15 19:56:41 $</date>
+<date>$Date: 1997-06-24 13:00:57 $</date>
 
 <abstract>
 This is the FAQ for FreeBSD systems version 2.X  All entries are
@@ -1371,7 +1371,7 @@ options   PSM_CHECKSYNC      #checks the header byte for sync.
 	  When logged in as root.
 
        <sect1>
-        <heading>I have a laptop with a track-ball mouse.</heading>
+        <heading>How do I use the mouse/trackball/touchpad/etc... on my laptop?</heading>
 
         <p>
           Please refer to <ref id="ps2mouse" name="the answer to the previous question">.
@@ -1540,7 +1540,7 @@ options   PSM_CHECKSYNC      #checks the header byte for sync.
 	  of the handbook.
 -->
       <sect1>
-        <heading>I have a lap-top with power management.</heading>
+        <heading>I have a laptop with power management.</heading>
         <p>
           FreeBSD supports APM on certain machines.  Please look in the 
           <tt/LINT/ kernel config file under <tt/APM/.
@@ -2198,6 +2198,20 @@ pseudo-device   vn   #Vnode driver (turns a file into a device)
           DOS ``<tt>fdisk /mbr</tt>'' command after you reconfigure them to
           boot from their native partitions.
 
+      <sect1>
+        <heading>How about FreeBSD and Linux? How do I boot FreeBSD from LILO?</heading>
+        <p>
+          Theoretically you should be able to boot FreeBSD from LILO by
+          treating it as a DOS-style operating system, but I haven't been
+          able to get it to work. If you put LILO at the start of your Linux
+	  boot partition instead of in the MBR, you can boot LILO from the
+	  FreeBSD boot manager. This is what I do.
+
+	  If you're running Windows-95 and Linux this is recommended anyway,
+	  to make it simpler to get Linux booting again if you should need
+	  to reinstall Windows95 (which is a Jealous Operating System, and
+	  will bear no other Operating Systems in the Master Boot Record).
+
       <sect1>
         <heading>My printer is ridiculously slow. What can I do ?</heading>
         <p>