diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index ab97047893..975cb314f4 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -10,6 +10,9 @@ page in Chapter 1 for details on who wrote what.</para>
 
 <itemizedlist>
 
+<listitem><para>September 3rd, 2003 [larry]: xsoft: updated to
+AbiWord-1.99.6.</para></listitem>
+
 <listitem><para>September 3rd, 2003 [larry]: postlfs: added
 gnupg-1.2.3.</para></listitem>
 
diff --git a/xsoft/office/abiword.xml b/xsoft/office/abiword.xml
index 4c16ddc214..c8579e62db 100644
--- a/xsoft/office/abiword.xml
+++ b/xsoft/office/abiword.xml
@@ -4,7 +4,7 @@
 
 &AbiWord-intro;
 &AbiWord-inst;
-&AbiWord-exp;
+<!-- &AbiWord-exp; -->
 &AbiWord-desc;
 
 </sect1>
diff --git a/xsoft/office/abiword/abiword-desc.xml b/xsoft/office/abiword/abiword-desc.xml
index cdbebad057..930a22a88d 100644
--- a/xsoft/office/abiword/abiword-desc.xml
+++ b/xsoft/office/abiword/abiword-desc.xml
@@ -1,14 +1,14 @@
 <sect2>
 <title>Contents</title>
 
-<para>The AbiWord package contains <userinput>AbiWord</userinput>.</para>
+<para>The <application>AbiWord</application> package contains <command>AbiWord</command>.</para>
 
 </sect2>
 
 <sect2><title>Description</title>
 
 <sect3><title>AbiWord</title>
-<para>AbiWord or abiword are wrapper scripts for the AbiWord executable.</para></sect3>
+<para><command>AbiWord</command> or <command>abiword</command> are wrapper scripts for the AbiWord executable.</para></sect3>
 
 
 </sect2>
diff --git a/xsoft/office/abiword/abiword-exp.xml b/xsoft/office/abiword/abiword-exp.xml
index 55d1c5736f..92b2c8ea62 100644
--- a/xsoft/office/abiword/abiword-exp.xml
+++ b/xsoft/office/abiword/abiword-exp.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>--enable-gnome</userinput> : This command can be added
+<para><command>--enable-gnome</command> : This command can be added
 to the configure command for AbiWord to utilize GNOME libraries listed
 in the introduction.</para>
 
diff --git a/xsoft/office/abiword/abiword-inst.xml b/xsoft/office/abiword/abiword-inst.xml
index 82d60e43b5..1bc3621894 100644
--- a/xsoft/office/abiword/abiword-inst.xml
+++ b/xsoft/office/abiword/abiword-inst.xml
@@ -1,12 +1,12 @@
 <sect2>
-<title>Installation of AbiWord</title>
+<title>Installation of <application>AbiWord</application></title>
 
-<para>Install AbiWord by running the following commands:</para>
+<para>Install <application>AbiWord</application> by running the following commands:</para>
 
-<para><screen><userinput>cd abi &amp;&amp;
+<screen><userinput><command>cd abi &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
 
diff --git a/xsoft/office/abiword/abiword-intro.xml b/xsoft/office/abiword/abiword-intro.xml
index 01323ce6ef..97fe5a9189 100644
--- a/xsoft/office/abiword/abiword-intro.xml
+++ b/xsoft/office/abiword/abiword-intro.xml
@@ -1,21 +1,29 @@
 <sect2>
-<title>Introduction to AbiWord</title>
+<title>Introduction to <application>AbiWord</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&AbiWord-download-http;"/>
-Download location (FTP):        <ulink url="&AbiWord-download-ftp;"/>
-Version used:                   &AbiWord-version;
-Package size:                   &AbiWord-size;
-Estimated Disk space required:  &AbiWord-buildsize;</screen>
+<para>The <application>AbiWord</application> package contains a word processing application. This is useful for writing reports, letters and other formatted
+documents.</para>
 
-<para>The AbiWord package contains a word processing application. This
-is useful for writing reports, letters and other formatted documents.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&AbiWord-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&AbiWord-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &AbiWord-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&AbiWord-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&AbiWord-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>AbiWord</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libglade"/> and <ulink url="http://telia.dl.sourceforge.net/sourceforge/fribidi/fribidi-0.10.4.tar.gz">fribidi-0.10.4</ulink></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="expat"/>, <xref linkend="libpng"/>, <xref
+linkend="popt"/> and <xref linkend="aspell"/></para></sect4>
+</sect3>
 
-<screen>AbiWord depends on:
-<xref linkend="GLib"/> and <xref linkend="GTK"/>
-AbiWord will utilize:
-<xref linkend="expat"/>, <xref linkend="libpng"/>, <xref linkend="popt"/>, 
-<xref linkend="gnome-libs"/>, <xref linkend="gnome-vfs1"/>, <xref linkend="gdk"/>, 
-<xref linkend="gal"/>, <xref linkend="bonobo14"/>, <xref
-linkend="gnome-print"/> and ispell</screen>
 
 </sect2>
diff --git a/xsoft/office/abiword/abiword.ent b/xsoft/office/abiword/abiword.ent
index 969754816f..60f3b76052 100644
--- a/xsoft/office/abiword/abiword.ent
+++ b/xsoft/office/abiword/abiword.ent
@@ -4,8 +4,9 @@
 <!ENTITY AbiWord-exp SYSTEM "abiword-exp.xml">
 <!ENTITY AbiWord-desc SYSTEM "abiword-desc.xml">
 <!ENTITY AbiWord-config SYSTEM "abiword-config.xml">
-<!ENTITY AbiWord-buildsize "105.2 MB">
-<!ENTITY AbiWord-version "1.0.4">
-<!ENTITY AbiWord-download-http "http://telia.dl.sourceforge.net/sourceforge/abiword/abiword-&AbiWord-version;.tar.gz">
+<!ENTITY AbiWord-buildsize "176.2 MB">
+<!ENTITY AbiWord-version "1.99.6">
+<!ENTITY AbiWord-download-http "http://telia.dl.sourceforge.net/sourceforge/abiword/abiword-&AbiWord-version;.tar.bz2">
 <!ENTITY AbiWord-download-ftp "">
-<!ENTITY AbiWord-size "19 MB">
+<!ENTITY AbiWord-size "20.8 MB">
+<!ENTITY AbiWord-time "1.82 SBU">