diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 33aadfacf2..de703cfb07 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -1,5 +1,5 @@
 # 
-# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.33 2001/06/21 03:38:14 chris Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.34 2001/06/23 22:46:14 murray Exp $
 #
 # Build the FreeBSD Handbook.
 #
@@ -13,7 +13,7 @@ FORMATS?= html-split
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-# IMAGES= advanced-networking/natd.png advanced-networking/natd.eps
+#IMAGES= advanced-networking/natd.eps
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
@@ -59,6 +59,11 @@ SRCS+= chapters.ent
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
+# Turn on all the chapters.
+CHAPTERS?= ${SRCS:M*chapter.sgml}
+
+JADEFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
+
 # XXX The Handbook build currently overflows some internal, hardcoded 
 # limits in pdftex.  Until we split the Handbook up, build the PDF 
 # version using ps2pdf instead of pdftex.
diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index 1a34aa368c..fe13138ec6 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.100 2001/06/08 02:56:35 dd Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.101 2001/06/21 03:38:14 chris Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -25,6 +25,37 @@
      create some links on web sites and such, so do NOT change it until
      it's really release time -->
 <!ENTITY rel.current CDATA "4.3">
+
+<!ENTITY % chap.introduction "IGNORE">
+<!ENTITY % chap.install "IGNORE">
+<!ENTITY % chap.basics "IGNORE">
+<!ENTITY % chap.ports "IGNORE">
+<!ENTITY % chap.boot "IGNORE">
+<!ENTITY % chap.users "IGNORE">
+<!ENTITY % chap.kernelconfig "IGNORE">
+<!ENTITY % chap.security "IGNORE">
+<!ENTITY % chap.printing "IGNORE">
+<!ENTITY % chap.disks "IGNORE">
+<!ENTITY % chap.backups "IGNORE">
+<!ENTITY % chap.x11 "IGNORE">
+<!ENTITY % chap.l10n "IGNORE">
+<!ENTITY % chap.sound "IGNORE">
+<!ENTITY % chap.serialcomms "IGNORE">
+<!ENTITY % chap.ppp-and-slip "IGNORE">
+<!ENTITY % chap.advanced-networking "IGNORE">
+<!ENTITY % chap.mail "IGNORE">
+<!ENTITY % chap.cutting-edge "IGNORE">
+<!ENTITY % chap.contrib "IGNORE">
+<!ENTITY % chap.policies "IGNORE">
+<!ENTITY % chap.kerneldebug "IGNORE">
+<!ENTITY % chap.linuxemu "IGNORE">
+<!ENTITY % chap.mirrors "IGNORE">
+<!ENTITY % chap.bibliography "IGNORE">
+<!ENTITY % chap.eresources "IGNORE">
+<!ENTITY % chap.staff "IGNORE">
+<!ENTITY % chap.pgpkeys "IGNORE">
+<!ENTITY % chap.hw "IGNORE">
+
 ]>
 
 <book>
@@ -74,55 +105,55 @@
   <part>
     <title>Getting Started</title>
     
-    &chap.introduction;
-    &chap.install;
-    &chap.basics;
-    &chap.ports;
+    <![ %chap.introduction;             [ &chap.introduction;         ]]>
+    <![ %chap.install;                  [ &chap.install;              ]]>
+    <![ %chap.basics;                   [ &chap.basics;               ]]>
+    <![ %chap.ports;                    [ &chap.ports;                ]]>
   </part>
   
   <part>
     <title>System Administration</title>
     
-    &chap.boot;
-    &chap.users;
-    &chap.kernelconfig;
-    &chap.security;
-    &chap.printing;
-    &chap.disks;
-    &chap.backups;
-    &chap.x11;
-    &chap.l10n;
-    &chap.sound;
+    <![ %chap.boot;                     [ &chap.boot;                 ]]>
+    <![ %chap.users;                    [ &chap.users;                ]]>
+    <![ %chap.kernelconfig;             [ &chap.kernelconfig;         ]]>
+    <![ %chap.security;                 [ &chap.security;             ]]>
+    <![ %chap.printing;                 [ &chap.printing;             ]]>
+    <![ %chap.disks;                    [ &chap.disks;                ]]>
+    <![ %chap.backups;                  [ &chap.backups;              ]]>
+    <![ %chap.x11;                      [ &chap.x11;                  ]]>
+    <![ %chap.l10n;                     [ &chap.l10n;                 ]]>
+    <![ %chap.sound;                    [ &chap.sound;                ]]>
   </part>
   
   <part>
     <title>Network Communications</title>
     
-    &chap.serialcomms;
-    &chap.ppp-and-slip;
-    &chap.advanced-networking;
-    &chap.mail;
+    <![ %chap.serialcomms;              [ &chap.serialcomms;          ]]>
+    <![ %chap.ppp-and-slip;             [ &chap.ppp-and-slip;         ]]>
+    <![ %chap.advanced-networking;      [ &chap.advanced-networking;  ]]>
+    <![ %chap.mail;                     [ &chap.mail;                 ]]>
   </part>
   
   <part>
     <title>Advanced topics</title>
     
-    &chap.cutting-edge;
-    &chap.contrib;
-    &chap.policies;
-    &chap.kerneldebug;
-    &chap.linuxemu;
+    <![ %chap.cutting-edge;             [ &chap.cutting-edge;         ]]>
+    <![ %chap.contrib;                  [ &chap.contrib;              ]]>
+    <![ %chap.policies;                 [ &chap.policies;             ]]>
+    <![ %chap.kerneldebug;              [ &chap.kerneldebug;          ]]>
+    <![ %chap.linuxemu;                 [ &chap.linuxemu;             ]]>
   </part>
   
   <part>
     <title>Appendices</title>
     
-    &chap.mirrors;
-    &chap.bibliography;
-    &chap.eresources;
-    &chap.staff;
-    &chap.pgpkeys;
-    &chap.hw;
+    <![ %chap.mirrors;                  [ &chap.mirrors;              ]]>
+    <![ %chap.bibliography;             [ &chap.bibliography;         ]]>
+    <![ %chap.eresources;               [ &chap.eresources;           ]]>
+    <![ %chap.staff;                    [ &chap.staff;                ]]>
+    <![ %chap.pgpkeys;                  [ &chap.pgpkeys;              ]]>
+    <![ %chap.hw;                       [ &chap.hw;                   ]]>
   </part>
 </book>