Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 2d817d3f8c8aa8741dbb4a60eb9e118e30aa96af)
+++ introduction/welcome/credits.xml	(revision 88fa341554a2d327e8dcf56e7499de34031f84df)
@@ -7,297 +7,460 @@
 
 <sect1 id="intro-welcome-credits" xreflabel="Credits">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="credits.html"?>
-<title>Credits</title>
-
-<para>Many people have contributed both directly and indirectly to <acronym>
-BLFS</acronym>. This page lists all of those we can think of.  We may well have
-left people out and if you feel this is the case, drop us line.  Many
-thanks to all of the <acronym>LFS</acronym> community for their assistance with 
-this project.  If you are in the list and wish to have your email address
-included, again please drop us a line to &maintainer-address; and we'll
-be happy to add it.  We don't include email addresses by default so if
-you want it included, please state so when you contact us.</para>
-
-<sect2>
-<title>Editors</title>
-<itemizedlist>
-
-<listitem><para><emphasis>Editor:</emphasis> Bruce Dubbs <ulink 
-url="mailto:&maintainer-address;">&lt;&maintainer-address;&gt;</ulink></para>
-</listitem>
-
-<listitem><para><emphasis>Co-Editors:</emphasis> Randy McMurchy, 
-Larry Lawrence, Igor Zivkovic, and DJ Lucas.</para></listitem>
-
-</itemizedlist>
-</sect2>
-
-<sect2>
-<title>Text Authors</title>
-<itemizedlist>
-
-<listitem><para>Chapter 01.  Based on the <acronym>LFS</acronym> introductory 
-text by <emphasis> Gerard Beekmans</emphasis>, modified by <emphasis>
-Mark Hymers</emphasis> for <acronym>BLFS</acronym>.</para></listitem>
-
-<listitem><para>Chapter 02: The /usr versus /usr/local debate: <emphasis>Andrew 
-McMurry</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 02: Going beyond <acronym>BLFS</acronym>: <emphasis>
-Tushar Teredesai</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 02: Package Management: <emphasis>
-Tushar Teredesai</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 03: /etc/inputrc: <emphasis>Chris Lynn</emphasis>.
-</para></listitem>
-
-<listitem><para>Chapter 03: Customizing your logon &amp; vimrc: <emphasis>Mark
-Hymers</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 03: /etc/shells: <emphasis>Igor
-Zivkovic</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 03: Random number script <emphasis>Larry Lawrence</emphasis>.
-</para></listitem>
-
-<listitem><para>Chapter 03: Creating a Custom Boot Device <emphasis>Bruce 
-Dubbs</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 03: The Bash Shell Startup Files <emphasis>James 
-Robertson</emphasis> revised by <emphasis>Bruce Dubbs</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 03: Compressed docs <emphasis>Olivier
-Peres</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 04: Firewalling: <emphasis>Henning Rohde with thanks to 
-Jeff Bauman</emphasis>. Revised by <emphasis>Bruce Dubbs</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 11: Which <emphasis>Mark Hymers</emphasis> with
-many thanks to <emphasis>Seth Klein</emphasis> and <emphasis>Jesse 
-Tie-Ten-Quee</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 25: X Window System Environment: <emphasis>Bruce Dubbs</emphasis>.</para>
-</listitem>
-
-<listitem><para>Chapter 27: Intro to Window Managers: <emphasis>Bruce Dubbs
-</emphasis>.</para></listitem>
-
-<listitem><para>Chapters 28 and 29: KDE: <emphasis>Bruce Dubbs</emphasis>.</para>
-</listitem>
-
-<listitem><para>Chapters 30, 31, and 32: GNOME: <emphasis>Larry Lawrence</emphasis>.</para>
-</listitem>
-
-</itemizedlist>
-</sect2>
-
-<sect2>
-<title>Installation Instruction Authors</title>
-<itemizedlist>
-
-<listitem><para>aalib, Alsa, ffmpeg, gocr, MPlayer, opendivx, transcode,
-xvid and xsane: <emphasis>Alex Kloss</emphasis></para></listitem>
-
-<listitem><para>AbiWord, at-spi, ATK, audiofile, avifile, bc, bonobo-activation, 
-bug-buddy, cdrdao, cdrtools, cpio, curl, dhcp, enlightenment, eog, esound, 
-fcron, fluxbox, FNLIB, gail, galeon, gconf-editor, gdbm, gedit, gimp, GLib2, 
-gmp, gnet, gnome-applets, gnome-desktop, gnome-games, gnome-icon-theme, 
-gnome-libs, gnome-media, gnome-mime-data, gnome-panel, gnome-session,
-gnome-system-monitor, gnome-terminal, gnome-themes, gnome-utils, gnome-vfs,
-gnome2-user-docs, gnumeric, GTK+2, gtk-doc, gtk-engines, gtk-thinice-engine, 
-eel, imlib, intltool, lame, libao, libart_lgpl, libbonobo, libbonoboui, 
-libgail-gnome, libglade2, libgnome, libgnomecanvas, libgnomeprint, 
-libgnomeprintui, libgnomeui, libgsf, libgtkhtml, libgtop, libIDL, libogg, 
-librep, librsvg, libvorbis, libwnck, libxml2, libxslt, linc, LPRng, Linux_PAM,
-metacity, MIT Kerberos 5,MPlayer, mutt, nautilus, nautilus-media, oaf, OpenJade, OpenSP, 
-OpenSSH, ORBit, ORBit2, pan, Pango, pccts, pcre, pkgconfig, postfix,
-procmail, Python, QT, rep-gtk, ruby, sawfish, scrollkeeper, sgml-common,
-sgml-dtd, shadow, startup-notification, unzip, vorbis-tools, vte, wget, XFce, 
-xine, xml-dtd, yelp and zip: <emphasis>Larry Lawrence</emphasis></para>
-</listitem>
-
-<listitem><para>CDParanoia, mpg123, SDL and XMMS: <emphasis>Jeroen
-Coumans</emphasis></para></listitem>
-
-<listitem><para>alsa, cvs, dhcpcd, gpm, hdparm, libjpeg, libmng, libpng, 
-libtiff, libungif, giflib, links, lynx, openssl, tcsh, which, zsch, zlib: <emphasis>
-Mark Hymers</emphasis></para></listitem>
-
-<listitem><para>traceroute: <emphasis>Jeff
-Bauman</emphasis></para></listitem>
-
-<listitem><para>db and lcms: <emphasis>Jeremy Jones and Mark Hymers</emphasis>
-</para></listitem>
-
-<listitem><para>aspell, balsa, bind, bonobo, bonobo-conf, cvs server,
-db-3.3.11, db-3.1.17, emacs, evolution, exim, expat, gal, gnome-print, GnuCash,
-gtkhtml, guppi, guile, guppi, g-wrap, leafnode, lesstif, libcapplet,
-libesmtp, libfam, libghttp, libglade, pine, portmap, PostgreSQL,
-pspell, qpopper, readline, reiserfs, Samba, sendmail, 
-slrn, soup, tex, tcp-wrappers, and xinetd: <emphasis>Billy O'Connor</emphasis>
-</para></listitem>  
-
-<listitem><para>ProFTPD and rsync: <emphasis>Daniel Baumann</emphasis></para>
-</listitem>
-
-<listitem><para>ESP Ghostscript: <emphasis>Matt Rogers</emphasis></para>
-</listitem>
-
-<listitem><para>ALSA Tools, Apache Ant, Cyrus-SASL, DejaGnu, desktop-file-utils, 
-DocBook DSSSL Stylesheets, DocBook-utils, Ethereal, Evolution Data Server, 
-Exim (many additions), Expect, FOP, GNOME Doc Utils, GnuCash (many additions), 
-Heimdal, HTML Tidy, JadeTeX, Java Access Bridge, LessTif (rewrite), 
-libgail-gnome, libgnomecups, MPlayer (extensive overhaul), PDL, Perl Modules, 
-pilot-link, Samba 3 (many additions), Shadow (rewrite), SANE (original 
-instructions by Alex Kloss), SLIB, Stunnel and Sysstat: 
-<emphasis>Randy McMurchy</emphasis></para></listitem>
-
-<listitem><para>Screen: <emphasis>Andreas Pedersen</emphasis></para></listitem>
-
-<listitem><para>PHP: <emphasis>Jeremy Utley</emphasis></para></listitem>
-
-<listitem><para>Gimp-Print, libusb: <emphasis>Alexander E. Patrakov</emphasis></para></listitem>
-
-<listitem><para>fetchmail and wvdial: <emphasis>Paul Campbell</emphasis></para>
-</listitem>
-
-<listitem><para>udftools, perl modules: <emphasis>Richard Downing</emphasis></para></listitem>
-
-<listitem><para>Epiphany, FLAC, File Roller, GNOME Magnifier,
-GNOME Netstatus, GNOME Speech, GOK, GPdf, GnomeMeeting, Gnopernicus,
-Imlib2, LZO, MC, NASM, Nautilus CD Burner, OpenQuicktime,
-Speex, XScreenSaver, Zenity, compface, freeglut, gcalctool, gucharmap, id3lib, kde-i18n,
-kdeaccessibility, kdebindings, kdesdk, kdevelop, kdewebdev, libFAME,
-liba52, libdv, libdvdcss, libdvdread, libmad, libmikmod and libmpeg3:
-<emphasis>Igor Zivkovic</emphasis></para></listitem>
-
-<listitem><para>tripwire: <emphasis>Manfred Glombowski</emphasis></para>
-</listitem>
-
-<listitem><para>ALSA Firmware, ALSA OSS, inetutils, gdk, GLib, GTK+, libxml and vim: <emphasis>
-James Iwanek</emphasis></para></listitem>
-
-<listitem><para>iptables: <emphasis>Henning Rohde</emphasis></para></listitem>
-
-<listitem><para>joe, nano, nmap, slang, w3m  and whois: <emphasis>Timothy
-Bauscher</emphasis></para></listitem>
-
-<listitem><para>MySQL: <emphasis>Jesse Tie-Ten-Quee</emphasis></para></listitem>
-
-<listitem><para>fontconfig, gcc, gcc2, jdk, mozilla, nas, openoffice, ispell, nail,
-ImageMagick, hd2u,
-STLport, tcl, tk and bind-utils: <emphasis>Tushar Teredesai</emphasis></para></listitem>
-
-<listitem><para>cracklib, libpcap, ncpfs, netfs, ppp(update), RP-PPPoE, 
-Samba-3 and Subversion: <emphasis>DJ Lucas</emphasis></para></listitem>
-
-<listitem><para>ntp: <emphasis>Eric Konopka</emphasis></para></listitem>
-
-<listitem><para>nfs-utils: <emphasis>Reinhard</emphasis></para></listitem>
-
-<listitem><para>courier: <emphasis>Jim Gifford</emphasis></para></listitem>
-
-</itemizedlist>
-</sect2>
-
-<sect2>
-<title>General Acknowledgments</title>
-
-<itemizedlist>
-
-<listitem><para><emphasis>Fernando Arbeiza</emphasis> for doing great
-quality assurance on Shadow utilizing <acronym>PAM</acronym>.  The machine 
-access he saved may have been yours.</para></listitem>
-
-<listitem><para><emphasis>Archaic</emphasis> for trouble shooting the
-mozilla section by performing multiple builds and for providing a description
-of the various mozilla extensions.</para></listitem>
-
-<listitem><para><emphasis>Gerard Beekmans</emphasis> for generally
-putting up with us and for running the whole <acronym>LFS</acronym> 
-project.</para></listitem>
-
-<listitem><para><emphasis>Oliver Brakmann</emphasis> for developing the
-dhcpcd patch for <acronym>FHS</acronym> compliance.</para></listitem>
-
-<listitem><para><emphasis>Ian Chilton</emphasis> for writing the nfs 
-hint.</para></listitem>
-
-<listitem><para><emphasis>Nathan Coulson</emphasis> for writing the new
-network bootscripts.</para></listitem>
-
-<listitem><para><emphasis>Nathan Coulson</emphasis>, 
-<emphasis>DJ Lucas</emphasis> and <emphasis>Zack Winkles</emphasis> for 
-reworking the bootscripts used throughout the book.</para></listitem>
-
-<listitem><para><emphasis>Jim Harris</emphasis> for writing the 
-dig-nslookup-host.txt hint on which the bind-utils instructions are 
-based.</para></listitem>
-
-<listitem><para><emphasis>Lee Harris</emphasis> for writing the gpm.txt
-hint on which our gpm instructions are based.</para></listitem>
-
-<listitem><para><emphasis>Marc Heerdink</emphasis> for creating patches
-for tcp_wrappers and portmap and for writing the gpm2.txt hint on which our 
-gpm instruction are based..</para></listitem>
-
-<listitem><para><emphasis>Mark Hymers</emphasis> for initiating the 
-<acronym>BLFS</acronym>project and writing many of the initial chapters
-of the book.</para></listitem>
-
-<listitem><para><emphasis>J_Man</emphasis> for submitting a gpm-1.19.3.diff 
-file on which our gpm instructions are based.</para></listitem>
-
-<listitem><para><emphasis>Jeremy Jones</emphasis> (otherwise known as
-<emphasis>mca</emphasis>) for hacking Makefiles and general assistance.</para>
-</listitem>
-
-<listitem><para><emphasis>Steffen Knollmann</emphasis> for revising the 
-JadeTeX instructions to work with Tex-3.0</para></listitem>
-
-<listitem><para><emphasis>Eric Konopka</emphasis> for writing the 
-ntp.txt hint on which the ntp section is based.</para></listitem>
-
-<!-- <listitem><para><emphasis>DJ Lucas</emphasis> for contributing to dhcpcd
-patch and many contributions while <acronym>DHCP</acronym> section was being 
-developed and beyond.</para></listitem>
+  <?dbhtml filename="credits.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Credits</title>
+
+  <para>Many people have contributed both directly and indirectly to 
+  BLFS. This page lists all of those we can think of.  We may well have
+  left people out and if you feel this is the case, drop us line.  Many
+  thanks to all of the LFS community for their assistance with 
+  this project.  If you are in the list and wish to have your email address
+  included, again please drop us a line to &maintainer-address; and we'll
+  be happy to add it.  We don't include email addresses by default so if
+  you want it included, please state so when you contact us.</para>
+
+  <sect2>
+    <title>Editors</title>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Editor:</emphasis> Bruce Dubbs <ulink 
+        url="mailto:&maintainer-address;">&lt;&maintainer-address;&gt;</ulink></para>
+      </listitem>
+      <listitem>
+        <para><emphasis>Co-Editors:</emphasis> Randy McMurchy, 
+        Larry Lawrence, Igor Zivkovic, DJ Lucas, and Manuel Canales Esparcia.</para>
+      </listitem>
+    </itemizedlist>
+
+  </sect2>
+
+  <sect2>
+    <title>Text Authors</title>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>Chapter 01.  Based on the LFS introductory text by 
+        <emphasis> Gerard Beekmans</emphasis>, modified by 
+        <emphasis>Mark Hymers</emphasis> for BLFS.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 02: The /usr versus /usr/local debate: 
+        <emphasis>Andrew McMurry</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 02: Going beyond BLFS: 
+        <emphasis>Tushar Teredesai</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 02: Package Management: 
+        <emphasis>Tushar Teredesai</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 03: /etc/inputrc: 
+        <emphasis>Chris Lynn</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 03: Customizing your logon &amp; vimrc: 
+        <emphasis>Mark Hymers</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 03: /etc/shells: 
+        <emphasis>Igor Zivkovic</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 03: Random number script 
+        <emphasis>Larry Lawrence</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 03: Creating a Custom Boot Device 
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 03: The Bash Shell Startup Files 
+        <emphasis>James Robertson</emphasis> revised by 
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 03: Compressed docs 
+        <emphasis>Olivier Peres</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 04: Firewalling: 
+        <emphasis>Henning Rohde</emphasis> with thanks to 
+        <emphasis>Jeff Bauman</emphasis>. Revised by 
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 11: Which 
+        <emphasis>Mark Hymers</emphasis> with many thanks to 
+        <emphasis>Seth Klein</emphasis> and 
+        <emphasis>Jesse Tie-Ten-Quee</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 25: X Window System Environment: 
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 27: Intro to Window Managers: 
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapters 28 and 29: KDE: 
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapters 30, 31, and 32: GNOME: 
+        <emphasis>Larry Lawrence</emphasis>.</para>
+      </listitem>
+
+    </itemizedlist>
+
+  </sect2>
+
+  <sect2>
+    <title>Installation Instruction Authors</title>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>aalib, Alsa, ffmpeg, gocr, MPlayer, opendivx, transcode,
+        xvid and xsane: 
+        <emphasis>Alex Kloss</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>AbiWord, at-spi, ATK, audiofile, avifile, bc, bonobo-activation, 
+        bug-buddy, cdrdao, cdrtools, cpio, curl, dhcp, enlightenment, eog, esound, 
+        fcron, fluxbox, FNLIB, gail, galeon, gconf-editor, gdbm, gedit, gimp, GLib2, 
+        gmp, gnet, gnome-applets, gnome-desktop, gnome-games, gnome-icon-theme, 
+        gnome-libs, gnome-media, gnome-mime-data, gnome-panel, gnome-session,
+        gnome-system-monitor, gnome-terminal, gnome-themes, gnome-utils, gnome-vfs,
+        gnome2-user-docs, gnumeric, GTK+2, gtk-doc, gtk-engines, gtk-thinice-engine, 
+        eel, imlib, intltool, lame, libao, libart_lgpl, libbonobo, libbonoboui, 
+        libgail-gnome, libglade2, libgnome, libgnomecanvas, libgnomeprint, 
+        libgnomeprintui, libgnomeui, libgsf, libgtkhtml, libgtop, libIDL, libogg, 
+        librep, librsvg, libvorbis, libwnck, libxml2, libxslt, linc, LPRng, Linux_PAM,
+        metacity, MIT Kerberos 5,MPlayer, mutt, nautilus, nautilus-media, oaf, OpenJade, 
+        OpenSP, OpenSSH, ORBit, ORBit2, pan, Pango, pccts, pcre, pkgconfig, postfix,
+        procmail, Python, QT, rep-gtk, ruby, sawfish, scrollkeeper, sgml-common,
+        sgml-dtd, shadow, startup-notification, unzip, vorbis-tools, vte, wget, XFce, 
+        xine, xml-dtd, yelp and zip: 
+        <emphasis>Larry Lawrence</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>CDParanoia, mpg123, SDL and XMMS: 
+        <emphasis>Jeroen Coumans</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>alsa, cvs, dhcpcd, gpm, hdparm, libjpeg, libmng, libpng, 
+        libtiff, libungif, giflib, links, lynx, openssl, tcsh, which, zsch, zlib: 
+        <emphasis>Mark Hymers</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>traceroute: 
+        <emphasis>Jeff Bauman</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>db and lcms: 
+        <emphasis>Jeremy Jones</emphasis> and 
+        <emphasis>Mark Hymers</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>aspell, balsa, bind, bonobo, bonobo-conf, cvs server,
+        db-3.3.11, db-3.1.17, emacs, evolution, exim, expat, gal, gnome-print, 
+        GnuCash, gtkhtml, guppi, guile, guppi, g-wrap, leafnode, lesstif, 
+        libcapplet, libesmtp, libfam, libghttp, libglade, pine, portmap, 
+        PostgreSQL, pspell, qpopper, readline, reiserfs, Samba, sendmail, 
+        slrn, soup, tex, tcp-wrappers, and xinetd: 
+        <emphasis>Billy O'Connor</emphasis></para>
+      </listitem>  
+
+      <listitem>
+        <para>ProFTPD and rsync: 
+        <emphasis>Daniel Baumann</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>ESP Ghostscript: 
+        <emphasis>Matt Rogers</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>ALSA Tools, Apache Ant, Cyrus-SASL, DejaGnu, desktop-file-utils, 
+        DocBook DSSSL Stylesheets, DocBook-utils, Ethereal, Evolution Data Server, 
+        Exim (many additions), Expect, FOP, GNOME Doc Utils, GnuCash (many additions), 
+        Heimdal, HTML Tidy, JadeTeX, Java Access Bridge, LessTif (rewrite), 
+        libgail-gnome, libgnomecups, MPlayer (extensive overhaul), PDL, Perl Modules, 
+        pilot-link, Samba 3 (many additions), Shadow (rewrite), SANE (original 
+        instructions by Alex Kloss), SLIB, Stunnel and Sysstat: 
+        <emphasis>Randy McMurchy</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>Screen: 
+        <emphasis>Andreas Pedersen</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>PHP: 
+        <emphasis>Jeremy Utley</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>Gimp-Print, libusb: 
+        <emphasis>Alexander E. Patrakov</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>fetchmail and wvdial: 
+        <emphasis>Paul Campbell</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>udftools, perl modules: 
+        <emphasis>Richard Downing</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>Epiphany, FLAC, File Roller, GNOME Magnifier,
+        GNOME Netstatus, GNOME Speech, GOK, GPdf, GnomeMeeting, Gnopernicus,
+        Imlib2, LZO, MC, NASM, Nautilus CD Burner, OpenQuicktime,
+        Speex, XScreenSaver, Zenity, compface, freeglut, gcalctool, gucharmap, id3lib, kde-i18n,
+        kdeaccessibility, kdebindings, kdesdk, kdevelop, kdewebdev, libFAME,
+        liba52, libdv, libdvdcss, libdvdread, libmad, libmikmod and libmpeg3:
+        <emphasis>Igor Zivkovic</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>tripwire: 
+        <emphasis>Manfred Glombowski</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>ALSA Firmware, ALSA OSS, inetutils, gdk, GLib, GTK+, 
+        libxml and vim: 
+        <emphasis>James Iwanek</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>iptables: 
+        <emphasis>Henning Rohde</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>joe, nano, nmap, slang, w3m  and whois: 
+        <emphasis>Timothy Bauscher</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>MySQL: 
+        <emphasis>Jesse Tie-Ten-Quee</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>fontconfig, gcc, gcc2, jdk, mozilla, nas, openoffice, ispell, 
+        nail, ImageMagick, hd2u, STLport, tcl, tk and bind-utils: 
+        <emphasis>Tushar Teredesai</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>cracklib, libpcap, ncpfs, netfs, ppp(update), RP-PPPoE, 
+        Samba-3 and Subversion: 
+        <emphasis>DJ Lucas</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>ntp: 
+        <emphasis>Eric Konopka</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>nfs-utils: 
+        <emphasis>Reinhard</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>courier: 
+        <emphasis>Jim Gifford</emphasis></para>
+      </listitem>
+
+    </itemizedlist>
+
+  </sect2>
+
+  <sect2>
+    <title>General Acknowledgments</title>
+
+    <itemizedlist>
+
+      <listitem>
+        <para><emphasis>Fernando Arbeiza</emphasis> 
+        for doing great quality assurance on Shadow utilizing PAM.  The 
+        machine access he saved may have been yours.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Archaic</emphasis> 
+        for trouble shooting the mozilla section by performing multiple builds 
+        and for providing a description of the various mozilla extensions.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Gerard Beekmans</emphasis> 
+        for generally putting up with us and for running the whole LFS 
+        project.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Oliver Brakmann</emphasis> 
+        for developing the dhcpcd patch for FHS compliance.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Ian Chilton</emphasis> 
+        for writing the nfs hint.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Nathan Coulson</emphasis> 
+        for writing the new network bootscripts.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Nathan Coulson</emphasis>, 
+        <emphasis>DJ Lucas</emphasis> and 
+        <emphasis>Zack Winkles</emphasis> 
+        for reworking the bootscripts used throughout the book.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Jim Harris</emphasis> 
+        for writing the dig-nslookup-host.txt hint on which the bind-utils 
+        instructions are based.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Lee Harris</emphasis> 
+        for writing the gpm.txt hint on which our gpm instructions 
+        are based.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Marc Heerdink</emphasis> 
+        for creating patches for tcp_wrappers and portmap and for writing 
+        the gpm2.txt hint on which our gpm instruction are based..</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Mark Hymers</emphasis> 
+        for initiating the BLFSproject and writing many of the initial chapters
+        of the book.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>J_Man</emphasis> 
+        for submitting a gpm-1.19.3.diff file on which our gpm instructions 
+        are based.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Jeremy Jones</emphasis> 
+        (otherwise known as <emphasis>mca</emphasis>) 
+        for hacking Makefiles and general assistance.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Steffen Knollmann</emphasis> 
+        for revising the JadeTeX instructions to work with Tex-3.0</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Eric Konopka</emphasis> 
+        for writing the ntp.txt hint on which the ntp section is based.</para>
+      </listitem>
+
+<!-- 
+      <listitem>
+        <para><emphasis>DJ Lucas</emphasis> 
+        for contributing to dhcpcd patch and many contributions while 
+        DHCP section was being developed and beyond.</para>
+      </listitem>
 -->
 
-<!-- <listitem><para><emphasis>Randy McMurchy</emphasis> for writing the
-Heimdal hint and for proofreading the book from cover to cover for
-grammatical errors.</para></listitem>
+<!-- 
+      <listitem>
+        <para><emphasis>Randy McMurchy</emphasis> 
+        for writing the Heimdal hint and for proofreading the book from cover 
+        to cover for grammatical errors.</para>
+      </listitem>
 -->
 
-<listitem><para><emphasis>Scot McPherson</emphasis> for writing the
-gnome-1.4.txt hint from which was gathered useful information and for
-warning us that GNOME Version 2.0 may not be ready to put in the book.</para>
-</listitem>
-
-<!-- <listitem><para><emphasis>Billy O'Connor</emphasis> for building GNOME
-2.0 so many times and being very helpful with his comments on that section.
-</para></listitem>
+      <listitem>
+        <para><emphasis>Scot McPherson</emphasis> 
+        for writing the gnome-1.4.txt hint from which was gathered useful information 
+        and for warning us that GNOME Version 2.0 may not be ready to put in the 
+        book.</para>
+      </listitem>
+
+<!-- 
+      <listitem>
+        <para><emphasis>Billy O'Connor</emphasis> 
+        for building GNOME 2.0 so many times and being very helpful with 
+        his comments on that section.</para>
+      </listitem>
 -->
 
-<listitem><para><emphasis>Alexander E. Patrakov</emphasis> for patches and
-suggestions to improve the book content and increasing the 
-<acronym>l10n</acronym> awareness.</para></listitem>
-
-<listitem><para><emphasis>Ted Riley</emphasis> for writing the 
-Linux-<acronym>PAM</acronym> + CrackLib + Shadow hint on which reinstalling 
-shadow to use <acronym>PAM</acronym> is based.</para></listitem>
+      <listitem>
+        <para><emphasis>Alexander E. Patrakov</emphasis> 
+        for patches and suggestions to improve the book content and increasing 
+        the l10n awareness.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Ted Riley</emphasis> 
+        for writing the Linux-PAM + CrackLib + Shadow hint on which 
+        reinstalling shadow to use PAM is based.</para>
+      </listitem>
 
 <!--
-<listitem><para><emphasis>Tushar Teredesai</emphasis> for writing the
-Compiling Java 2 SDK from Scratch hint on which jdk is based and for writing 
-the docbook hint used throughout the typesetting chapter.</para></listitem>
+      <listitem>
+        <para><emphasis>Tushar Teredesai</emphasis> 
+        for writing the Compiling Java 2 SDK from Scratch hint on which jdk is 
+        based and for writing the docbook hint used throughout the typesetting 
+        chapter.</para>
+      </listitem>
 -->
 
-</itemizedlist>
-</sect2>
+    </itemizedlist>
+
+  </sect2>
 
 </sect1>
