diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 16bd023bd9..319dd9f3b9 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -1,200 +1,204 @@
 # 
 # $FreeBSD$
 #
 # Build the FreeBSD Handbook.
 #
 
 # ------------------------------------------------------------------------
 #
 # Handbook-specific variables
 #
 #	WITH_PGPKEYS	The print version of the handbook only prints PGP
 #			fingerprints by default.  If you would like for the
 #			entire key to be displayed, then set this variable.
 #			This option has no affect on the HTML formats.
 #			
 # Handbook-specific targets
 #
 #       pgpkeyring      This target will read the contents of
 #                       pgpkeys/chapter.sgml and will extract all of
 #                       the pgpkeys to standard out.  This output can then
 #                       be redirected into a file and distributed as a 
 #                       public keyring of FreeBSD developers that can
 #                       easily be imported into PGP/GPG.
 #
 # ------------------------------------------------------------------------
 
 MAINTAINER=	doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 HAS_INDEX= true
+WITH_GLOSSARY?=
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 IMAGES_EN = advanced-networking/isdn-bus.eps
 IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
 IMAGES_EN+= advanced-networking/natd.eps
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
 IMAGES_EN+= install/hdwrconf.scr
 IMAGES_EN+= install/probstart.scr
 IMAGES_EN+= install/main1.scr
 IMAGES_EN+= install/sysinstall-exit.scr
 IMAGES_EN+= install/main-doc.scr
 IMAGES_EN+= install/docmenu1.scr
 IMAGES_EN+= install/main-keymap.scr
 IMAGES_EN+= install/keymap.scr
 IMAGES_EN+= install/main-options.scr
 IMAGES_EN+= install/options.scr
 IMAGES_EN+= install/main-std.scr
 IMAGES_EN+= install/fdisk-drive1.scr
 IMAGES_EN+= install/fdisk-edit1.scr
 IMAGES_EN+= install/fdisk-edit2.scr
 IMAGES_EN+= install/boot-mgr.scr
 IMAGES_EN+= install/fdisk-drive2.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-root1.scr
 IMAGES_EN+= install/disklabel-root2.scr
 IMAGES_EN+= install/disklabel-fs.scr
 IMAGES_EN+= install/disklabel-root3.scr
 IMAGES_EN+= install/disklabel-ed2.scr
 IMAGES_EN+= install/dist-set.scr
 IMAGES_EN+= install/dist-set2.scr
 IMAGES_EN+= install/media.scr
 IMAGES_EN+= install/ed0-conf.scr
 IMAGES_EN+= install/ed0-conf2.scr
 IMAGES_EN+= install/ftp-anon1.scr
 IMAGES_EN+= install/ftp-anon2.scr
 IMAGES_EN+= install/nfs-server-edit.scr
 IMAGES_EN+= install/security.scr
 IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
 IMAGES_EN+= install/timezone1.scr
 IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/mouse1.scr
 IMAGES_EN+= install/mouse2.scr
 IMAGES_EN+= install/mouse3.scr
 IMAGES_EN+= install/mouse4.scr
 IMAGES_EN+= install/mouse5.scr
 IMAGES_EN+= install/mouse6.scr
 IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/pkg-cat.scr
 IMAGES_EN+= install/pkg-sel.scr
 IMAGES_EN+= install/pkg-install.scr
 IMAGES_EN+= install/pkg-confirm.scr
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
 IMAGES_EN+= install/mainexit.scr
 IMAGES_EN+= install/disk-layout.eps
 IMAGES_EN+= install/edit-inetd-conf.scr
 
 IMAGES_EN+= install/example-dir1.eps
 IMAGES_EN+= install/example-dir2.eps
 IMAGES_EN+= install/example-dir3.eps
 IMAGES_EN+= install/example-dir4.eps
 IMAGES_EN+= install/example-dir5.eps
 IMAGES_EN+= security/ipsec-network.pic
 IMAGES_EN+= security/ipsec-crypt-pkt.pic
 IMAGES_EN+= security/ipsec-encap-pkt.pic
 IMAGES_EN+= security/ipsec-out-pkt.pic
 IMAGES_EN+= vinum/vinum-concat.pic
 IMAGES_EN+= vinum/vinum-mirrored-vol.pic
 IMAGES_EN+= vinum/vinum-raid10-vol.pic
 IMAGES_EN+= vinum/vinum-raid5-org.pic
 IMAGES_EN+= vinum/vinum-simple-vol.pic
 IMAGES_EN+= vinum/vinum-striped-vol.pic
 IMAGES_EN+= vinum/vinum-striped.pic
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
 IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 IMAGES_LIB+= callouts/5.png
 IMAGES_LIB+= callouts/6.png
 IMAGES_LIB+= callouts/7.png
 IMAGES_LIB+= callouts/8.png
 IMAGES_LIB+= callouts/9.png
 IMAGES_LIB+= callouts/10.png
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS+=  book.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= config/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= multimedia/chapter.sgml
 SRCS+= desktop/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= users/chapter.sgml
 SRCS+= vinum/chapter.sgml
 SRCS+= x11/chapter.sgml
 SRCS+= ports/chapter.sgml
 SRCS+= preface/preface.sgml
 SRCS+= colophon.sgml
 
 # Entities
 SRCS+= chapters.ent 
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Turn on all the chapters.
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
+.if defined(WITH_GLOSSARY) && !empty(WITH_GLOSSARY)
+SGMLFLAGS+= -i chap.freebsd-glossary
+.endif
 
 # 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.
 
 PS2PDF?=	${PREFIX}/bin/ps2pdf
 
 book.tex-pdf:
 	${TOUCH} book.tex-pdf
 
 book.pdf: book.ps
 	${PS2PDF} book.ps book.pdf
 
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 #
 # Handbook-specific variables
 #
 .if defined(WITH_PGPKEYS)
 JADEFLAGS+=	-V withpgpkeys
 .endif
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index f40440bea8..0e0eba9ecb 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -1,249 +1,251 @@
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 
 <!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
 %bookinfo;
 
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
 %freebsd;
 
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
 %teams;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists;
 <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"> %newsgroups;
 <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
 %trademarks;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent"> %txtfiles;
 
 <!ENTITY % not.published "INCLUDE">
 
 <!ENTITY % chap.introduction "IGNORE">
 <!ENTITY % chap.install "IGNORE">
 <!ENTITY % chap.basics "IGNORE">
 <!ENTITY % chap.ports "IGNORE">
 <!ENTITY % chap.config "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.vinum "IGNORE">
 <!ENTITY % chap.x11 "IGNORE">
 <!ENTITY % chap.l10n "IGNORE">
 <!ENTITY % chap.multimedia "IGNORE">
 <!ENTITY % chap.desktop "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.linuxemu "IGNORE">
 <!ENTITY % chap.mirrors "IGNORE">
 <!ENTITY % chap.bibliography "IGNORE">
 <!ENTITY % chap.eresources "IGNORE">
 <!ENTITY % chap.pgpkeys "IGNORE">
 <!ENTITY % chap.index "IGNORE">
+<!ENTITY % chap.freebsd-glossary "IGNORE">
 
 <!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 ]>
 
 <book>
   <bookinfo>
     <title>FreeBSD Handbook</title>
     
     <corpauthor>The FreeBSD Documentation Project</corpauthor>
     
     <pubdate>February 1999</pubdate>
     
     <copyright>
       <year>1995</year>
       <year>1996</year>
       <year>1997</year>
       <year>1998</year>
       <year>1999</year>
       <year>2000</year>
       <year>2001</year>
       <year>2002</year>
       <year>2003</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
     &bookinfo.legalnotice;
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.3com;
       &tm-attrib.3ware;
       &tm-attrib.arm;
       &tm-attrib.adaptec;
       &tm-attrib.adobe;
       &tm-attrib.apple;
       &tm-attrib.corel;
       &tm-attrib.creative;
       &tm-attrib.heidelberger;
       &tm-attrib.ibm;
       &tm-attrib.ieee;
       &tm-attrib.intel;
       &tm-attrib.intuit;
       &tm-attrib.linux;
       &tm-attrib.lsilogic;
       &tm-attrib.m-systems;
       &tm-attrib.macromedia;
       &tm-attrib.microsoft;
       &tm-attrib.netscape;
       &tm-attrib.opengroup;
       &tm-attrib.oracle;
       &tm-attrib.powerquest;
       &tm-attrib.realnetworks;
       &tm-attrib.redhat;
       &tm-attrib.sap;
       &tm-attrib.sun;
       &tm-attrib.symantec;
       &tm-attrib.themathworks;
       &tm-attrib.thomson;
       &tm-attrib.usrobotics;
       &tm-attrib.vmware;
       &tm-attrib.waterloomaple;
       &tm-attrib.wolframresearch;
       &tm-attrib.xfree86;
       &tm-attrib.xiph;
       &tm-attrib.general;
     </legalnotice>
     
     <abstract>
       <para>Welcome to FreeBSD! This handbook covers the installation and day
 	to day use of <emphasis>FreeBSD &rel2.current;-RELEASE</emphasis>
 	and <emphasis>FreeBSD &rel.current;-RELEASE</emphasis>.
 	This manual is a <emphasis>work in progress</emphasis> and is the work
 	of many individuals.  Many sections do not yet exist and some of those
 	that do exist need to be updated.  If you are interested in helping
 	with this project, send email to the &a.doc;.  The latest version of
 	this document is always available from the <ulink
 	  url="../../../../index.html">FreeBSD web site</ulink>.
 	It may also be downloaded in a variety of formats and compression
 	options from the <ulink 
           url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP 
           server</ulink> or one of the numerous <link
 	  linkend="mirrors-ftp">mirror sites</link>.  If you would prefer
 	  to have a hard copy of the handbook, you can purchase one at the
 	  <ulink
 	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.  You
 	  may also want to <ulink
 	  url="../../../../search/index.html">search the
 	  handbook</ulink>.</para>
     </abstract>
   </bookinfo>
 
   &chap.preface;
 
   <part id="getting-started">
     <title>Getting Started</title>
     
     <partintro>
       <para>This part of the FreeBSD Handbook is for users and
 	administrators who are new to FreeBSD.  These chapters:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>Introduce you to FreeBSD.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Guide you through the installation process.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Teach you &unix; basics and fundamentals.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Show you how to install the wealth of third party
 	    applications available for FreeBSD.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Introduce you to X, the &unix; windowing system, and
 	    detail how to configure a desktop environment that makes you
 	    more productive.</para>
 	</listitem>
       </itemizedlist>
 
       <para>We have tried to keep the number of forward references in
 	the text to a minimum so that you can read this section of the
 	Handbook from front to back with the minimum page flipping
 	required.</para>
     </partintro>
 
     <![ %chap.introduction;             [ &chap.introduction;         ]]>
     <![ %chap.install;                  [ &chap.install;              ]]>
     <![ %chap.basics;                   [ &chap.basics;               ]]>
     <![ %chap.ports;                    [ &chap.ports;                ]]>
     <![ %chap.x11;                      [ &chap.x11;                  ]]>
   </part>
   
   <part id="system-administration">
     <title>System Administration</title>
 
     <partintro>
       <para>The remaining chapters of the FreeBSD Handbook cover all
 	aspects of FreeBSD system administration.  Each chapter
 	starts by describing what you will learn as a result of reading
 	the chapter, and also details what you are expected to know
 	before tackling the material.</para>
 
       <para>These chapters are designed to be read when
 	you need the information.  You do not have to read them in any
 	particular order, nor do you need to read all of them before you
 	can begin using FreeBSD.</para>
     </partintro>
 
     <![ %chap.config;                   [ &chap.config;               ]]>
     <![ %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.vinum;                    [ &chap.vinum;                ]]>
     <![ %chap.l10n;                     [ &chap.l10n;                 ]]>
     <![ %chap.desktop;                  [ &chap.desktop;              ]]>
     <![ %chap.multimedia;               [ &chap.multimedia;           ]]>
     <![ %chap.serialcomms;              [ &chap.serialcomms;          ]]>
     <![ %chap.ppp-and-slip;             [ &chap.ppp-and-slip;         ]]>
     <![ %chap.advanced-networking;      [ &chap.advanced-networking;  ]]>
     <![ %chap.mail;                     [ &chap.mail;                 ]]>
     <![ %chap.cutting-edge;             [ &chap.cutting-edge;         ]]>
     <![ %chap.linuxemu;                 [ &chap.linuxemu;             ]]>
   </part>
   
   <part id="appendices">
     <title>Appendices</title>
     
     <![ %chap.mirrors;                  [ &chap.mirrors;              ]]>
     <![ %chap.bibliography;             [ &chap.bibliography;         ]]>
     <![ %chap.eresources;               [ &chap.eresources;           ]]>
     <![ %chap.pgpkeys;                  [ &chap.pgpkeys;              ]]>
-    <![ %chap.index;                    [ &chap.index;                ]]>
   </part>
+  <![ %chap.freebsd-glossary;         [ &bookinfo.freebsd-glossary; ]]>
+  <![ %chap.index;                    [ &chap.index;                ]]>
   &chap.colophon;
 </book>
 
 <!-- 
      Local Variables:
      mode: sgml
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      End:
 -->
diff --git a/en_US.ISO8859-1/share/sgml/bookinfo.ent b/en_US.ISO8859-1/share/sgml/bookinfo.ent
index 8164aa889d..91df573fe3 100644
--- a/en_US.ISO8859-1/share/sgml/bookinfo.ent
+++ b/en_US.ISO8859-1/share/sgml/bookinfo.ent
@@ -1,14 +1,16 @@
 <!--
      References to other files that can be included within a DocBook
      BookInfo element.
 
      Entity names take the form "bookinfo.<element>", where <element> is
      the name of the outermost element in the entity.  Examples would
      be "bookinfo.legalnotice", and "bookinfo.preface".
 
      $FreeBSD$
 -->
 
 <!ENTITY bookinfo.legalnotice SYSTEM "legalnotice.sgml">
 
 <!ENTITY bookinfo.trademarks SYSTEM "trademarks.sgml">
+
+<!ENTITY bookinfo.freebsd-glossary SYSTEM "glossary/freebsd-glossary.sgml">
diff --git a/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml b/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml
new file mode 100644
index 0000000000..be3df0d1bc
--- /dev/null
+++ b/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml
@@ -0,0 +1,64 @@
+<!-- 
+    FreeBSD Specific Glossary Terms
+	Please keep this file sorted.
+
+    $FreeBSD$
+-->
+
+<glossary status="draft" id="freebsd-glossary">
+  <title>&os; Glossary</title>
+  <para>This glossary contains terms and acronyms specific to &os;.</para>
+
+  <glossdiv>
+    <title>B</title>
+
+    <glossentry id="bikeshed">
+      <glossterm>Bikeshed Building</glossterm>
+      <glossdef>
+	<para>A phenomenon whereby many people will give an opinion on
+	  an uncomplicated topic, whilst a complex topic receives little
+	  or no discussion.  See the
+	  <ulink url="../faq/misc.html#BIKESHED-PAINTING">FAQ</ulink> for
+	  the origin of the term.</para>
+      </glossdef>
+    </glossentry>
+  </glossdiv>
+
+  <glossdiv>
+    <title>M</title>
+
+    <glossentry id="mfc">
+      <glossterm>Merge From Current</glossterm>
+      <acronym>MFC</acronym>
+      <glossdef>
+	<para>To merge functionality or a patch from the -CURRENT
+	  branch to another, most often -STABLE.</para>
+      </glossdef>
+    </glossentry>
+
+    <glossentry id="mfs">
+      <glossterm>Merge From Stable</glossterm>
+      <acronym>MFS</acronym>
+      <glossdef>
+	<para>In the normal course of FreeBSD development, a change will
+	  be committed to the -CURRENT branch for testing before being
+	  merged to -STABLE.  On rare occassions, a change will go into
+	  -STABLE first and then be merged to -CURRENT.</para>
+	<glossseealso otherterm="mfc">
+      </glossdef>
+    </glossentry>
+
+    <glossentry>
+      <glossterm>MFC</glossterm>
+      <glosssee otherterm="mfc">
+    </glossentry>
+
+    <glossentry>
+      <glossterm>MFS</glossterm>
+      <glosssee otherterm="mfs">
+    </glossentry>
+
+  </glossdiv>
+
+</glossary>
+