Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/appendices/dependencies/common.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -420,4 +420,32 @@
       </segmentedlist>
 
+<!-- Begin Expat dependency info -->
+  <bridgehead renderas="sect2" id="expat-dep">Expat</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep,
+         Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>D-Bus</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Expect dependency info -->
   <bridgehead renderas="sect2" id="expect-dep">Expect</bridgehead>
Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/alpha-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -63,5 +63,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
Index: BOOK/final-system/common/expat.xml
===================================================================
--- BOOK/final-system/common/expat.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
+++ BOOK/final-system/common/expat.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-expat" role="wrap">
+  <?dbhtml filename="expat.html"?>
+
+  <title>Expat-&expat-version;</title>
+
+  <indexterm zone="ch-system-expat">
+    <primary sortas="a-Expat">Expat</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Expat is a stream-oriented XML parser library written in C.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Expat</title>
+
+    <para os="a">Prepare Expat for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">To test the results, issue:
+    <userinput>make check</userinput>.</para>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+    <para os="h">Install the documentation:</para>
+
+<screen os="i"><userinput>install -v -m755 -d /usr/share/doc/expat-&expat-version;
+install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput></screen>
+
+
+  </sect2>
+
+  <sect2 id="contents-expat" role="content">
+    <title>Contents of Expat</title>
+
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+      <segtitle>Installed library</segtitle>
+      <segtitle>Installed directory</segtitle>
+
+      <seglistitem>
+        <seg>xmlwf</seg>
+        <seg>libexpat.[so,a]</seg>
+        <seg>/usr/share/doc/expat-&expat-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="xmlwf">
+        <term><command>xmlwf</command></term>
+        <listitem>
+          <para>is a non-validating utility to check whether or not XML
+          documents are well formed</para>
+          <indexterm zone="ch-system-expat xmlwf">
+            <primary sortas="b-xmlwf">xmlwf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libexpat">
+        <term><filename class="libraryfile">libexpat</filename></term>
+        <listitem>
+          <para>contains API functions for parsing XML</para>
+          <indexterm zone="ch-system-expat libexpat">
+            <primary sortas="c-libexpat">libexpat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/mips-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -63,5 +63,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -63,5 +63,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/mips64-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -108,5 +108,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus-n32.xml"/>
Index: BOOK/final-system/multilib/expat-64bit.xml
===================================================================
--- BOOK/final-system/multilib/expat-64bit.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
+++ BOOK/final-system/multilib/expat-64bit.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-expat" role="wrap">
+  <?dbhtml expatname="expat-64bit.html"?>
+
+  <title>Expat-&expat-version; 64 Bit</title>
+
+  <indexterm zone="ch-system-expat">
+    <primary sortas="a-Expat">Expat</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expat.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Expat</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expat.xml"
+  xpointer="xpointer(id('contents-expat'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/expat-n32.xml
===================================================================
--- BOOK/final-system/multilib/expat-n32.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
+++ BOOK/final-system/multilib/expat-n32.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-expat-n32" role="wrap">
+  <?dbhtml expatname="expat-n32.html"?>
+
+  <title>Expat-&expat-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-expat-n32">
+    <primary sortas="a-Expat">Expat</primary>
+    <secondary>N32</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expat.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Expat</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-expat" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/expat.xml
===================================================================
--- BOOK/final-system/multilib/expat.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
+++ BOOK/final-system/multilib/expat.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-expat-32" role="wrap">
+  <?dbhtml expatname="expat.html"?>
+
+  <title>Expat-&expat-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-expat-32">
+    <primary sortas="a-Expat">Expat</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expat.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Expat</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+    --libdir=/usr/lib</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-expat" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/ppc-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -63,5 +63,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/ppc64-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -86,5 +86,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus-64bit.xml"/>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/sparc-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -63,5 +63,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -63,5 +63,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/sparc64-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -86,5 +86,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus-64bit.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/x86-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -63,5 +63,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -63,5 +63,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/final-system/x86_64-chapter.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -86,5 +86,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
-<!-- Expat -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus-64bit.xml"/>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/introduction/common/changelog.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -40,4 +40,7 @@
       <para>February 6, 2011</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Add Expat 2.0.1.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Add D-Bus 1.4.1.</para>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/materials/common/packages.xml	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -156,4 +156,13 @@
         <para>Download: <ulink url="&e2fsprogs-url;"/></para>
         <para>MD5 sum: <literal>&e2fsprogs-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Expat (&expat-version;) - <token>&expat-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&expat-home;"/></para>
+        <para>Download: <ulink url="&expat-url;"/></para>
+        <para>MD5 sum: <literal>&expat-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 27f57ec43d22c252d46609679d3741d0552d10f7)
+++ BOOK/packages.ent	(revision e59e93488143a92370af0304b76c3b67fc92f664)
@@ -142,4 +142,10 @@
 <!ENTITY elftoaout-home " ">
 
+<!ENTITY expat-version "2.0.1">
+<!ENTITY expat-size "436 KB">
+<!ENTITY expat-url "&sourceforge;expat/expat-2.0.1.tar.gz">
+<!ENTITY expat-md5 "ee8b492592568805593f81f8cdf2a04c">
+<!ENTITY expat-home " ">
+
 <!ENTITY expect-version "5.45">
 <!ENTITY expect-size "616 KB">
