diff --git a/appendices/glossary.xml b/appendices/glossary.xml
index b995b0ba31..017e6112ed 100644
--- a/appendices/glossary.xml
+++ b/appendices/glossary.xml
@@ -55,6 +55,9 @@ otherterm="gSMB">SMB</glossseealso></glossdef></glossentry>
 <glossentry id="gCVS"><glossterm><acronym>CVS</acronym></glossterm>
 <glossdef><para>Concurrent Versions System</para></glossdef></glossentry>
 
+<glossentry id="gDES"><glossterm><acronym>DES</acronym></glossterm>
+<glossdef><para>Data Encryption Standard</para></glossdef></glossentry>
+
 <glossentry id="gDHCP"><glossterm><acronym>DHCP</acronym></glossterm>
 <glossdef><para>Dynamic Host Configuration Protocol</para></glossdef></glossentry>
 
diff --git a/postlfs/security/pam/linux_pam-inst.xml b/postlfs/security/pam/linux_pam-inst.xml
index eb79f1ed3b..8a077abc09 100644
--- a/postlfs/security/pam/linux_pam-inst.xml
+++ b/postlfs/security/pam/linux_pam-inst.xml
@@ -5,7 +5,8 @@
 <para>Install <application>Linux-<acronym>PAM</acronym></application> by 
 running the following commands:</para>
 
-<screen><userinput><command>./configure --enable-static-libpam --with-mailspool=/var/mail \
+<screen><userinput><command>patch -Np1 -i ../Linux-PAM-0.77-linkage-1.patch &amp;&amp;
+./configure --enable-static-libpam --with-mailspool=/var/mail \
 --enable-read-both-confs --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
diff --git a/postlfs/security/pam/linux_pam-intro.xml b/postlfs/security/pam/linux_pam-intro.xml
index f22ca7cbc1..f6bf35b76a 100644
--- a/postlfs/security/pam/linux_pam-intro.xml
+++ b/postlfs/security/pam/linux_pam-intro.xml
@@ -19,6 +19,13 @@ url="&Linux_PAM-download-ftp;"/></para></listitem>
 &Linux_PAM-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional download</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch:
+<ulink url="&patch-root;/Linux-PAM-0.77-linkage-1.patch"/></para></listitem></itemizedlist>
+</sect3>
+
+
 <sect3><title><application>Linux-<acronym>PAM</acronym></application> 
 dependencies</title>
 <sect4><title>Optional</title>
diff --git a/postlfs/security/security.xml b/postlfs/security/security.xml
index be16632afa..2ad2bdc5ee 100644
--- a/postlfs/security/security.xml
+++ b/postlfs/security/security.xml
@@ -3,7 +3,7 @@
 <title>Security</title>
 
 <para>Security takes many forms in a computing environment. This chapter
-gives examples of three different types of security; access, prevention
+gives examples of three different types of security: access, prevention
 and detection.</para>
 
 <para>Access for users is usually handled by <command>login</command> or an 
@@ -14,7 +14,7 @@ can also be secured by policies set by <application>iptables</application>,
 commonly referred to as a firewall.</para>
 
 <para>Prevention of breaches, like a trojan, are assisted by applications like 
-<application>gnupg</application>, specifically the ability to confirm signed 
+<application>GnuPG</application>, specifically the ability to confirm signed 
 packages, which prevents modification of the tarball after the packager creates 
 it.</para>
 
diff --git a/postlfs/security/shadow.xml b/postlfs/security/shadow.xml
index f7dca4dbdb..16db1f634c 100644
--- a/postlfs/security/shadow.xml
+++ b/postlfs/security/shadow.xml
@@ -1,5 +1,8 @@
 <sect1 id="shadow">
 <?dbhtml filename="shadow.html" dir="postlfs"?>
+<title>Shadow-4.0.3</title>
+
+<sect2>
 <title>Configuring shadow</title>
 
 <para>Shadow's Configuration File</para>
@@ -8,13 +11,15 @@
 
 <para>Enabling MD5 Passwords</para>
 
-<para>To enable MD5 Passwords, modify the line in the login.defs file
-that reads:
+<para>To enable MD5 Passwords, modify the line in the
+<filename>login.defs</filename> file that reads:
 <screen><userinput>#MD5_CRYPT_ENAB no</userinput></screen>
 to read:
 <screen><userinput>MD5_CRYPT_ENAB yes</userinput></screen>
 Passwords created after this change will be encrypted using MD5
-instead of using DES encryption.</para>
+(Message-Degest Algroithm) instead of using <acronym>DES</acronym> encryption.
+</para>
+</sect2>
 
 &shadow-inst;
 &shadow-exp;
diff --git a/postlfs/security/shadow/shadow-inst.xml b/postlfs/security/shadow/shadow-inst.xml
index 0dad324e20..7fa83f50cb 100644
--- a/postlfs/security/shadow/shadow-inst.xml
+++ b/postlfs/security/shadow/shadow-inst.xml
@@ -15,8 +15,8 @@
 
 <para>Reinstall shadow by running the following commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../shadow-4.0.3-pamfix-1.patch &amp;&amp;
-LDFLAGS="-lpam -lpam_misc" ./configure --prefix=/usr --libdir=/usr/lib \
+<screen><userinput><command>patch -Np1 -i ../shadow-4.0.3-pam-2.patch &amp;&amp;
+./configure --prefix=/usr --libdir=/usr/lib \
 --enable-shared --with-libpam &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
diff --git a/x/lib/freetype2.xml b/x/lib/freetype2.xml
index 561a60b183..f6c9603d0f 100644
--- a/x/lib/freetype2.xml
+++ b/x/lib/freetype2.xml
@@ -1,6 +1,6 @@
-<sect1 id="freetype2" xreflabel="freetype-&freetype2-version;">
+<sect1 id="freetype2" xreflabel="FreeType-&freetype2-version;">
 <?dbhtml filename="freetype2.html" dir="x"?>
-<title>freetype-&freetype2-version;</title>
+<title>FreeType-&freetype2-version;</title>
 
 &freetype2-intro;
 &freetype2-inst;
diff --git a/x/lib/freetype2/freetype2-config.xml b/x/lib/freetype2/freetype2-config.xml
index 5d6e3f3bff..de53ef5fcf 100644
--- a/x/lib/freetype2/freetype2-config.xml
+++ b/x/lib/freetype2/freetype2-config.xml
@@ -1,5 +1,5 @@
 <sect2>
-<title>Configuring <application>freetype2</application></title>
+<title>Configuring <application>FreeType2</application></title>
 
 <sect3><title>Configuration Information</title>
 
diff --git a/x/lib/freetype2/freetype2-desc.xml b/x/lib/freetype2/freetype2-desc.xml
index 2e21f379e9..38d3ea3c57 100644
--- a/x/lib/freetype2/freetype2-desc.xml
+++ b/x/lib/freetype2/freetype2-desc.xml
@@ -1,15 +1,15 @@
 <sect2>
 <title>Contents</title>
 
-<para>The <application>freetype2</application> package contains <filename>
+<para>The <application>FreeType2</application> package contains <filename>
 libfreetype</filename> libraries.</para>
 </sect2>
 
 <sect2><title>Description</title>
 
 <sect3><title>freetype2 libraries</title>
-<para><application>freetype2</application> libraries add TrueType font capabilities to
-<application>XFree86</application>.</para></sect3>
+<para><application>freetype2</application> libraries add TrueType font 
+capabilities to <application>XFree86</application>.</para></sect3>
 
 </sect2>
 
diff --git a/x/lib/freetype2/freetype2-inst.xml b/x/lib/freetype2/freetype2-inst.xml
index b18b418d25..f925f446cb 100644
--- a/x/lib/freetype2/freetype2-inst.xml
+++ b/x/lib/freetype2/freetype2-inst.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of <application>freetype2</application></title>
+<title>Installation of <application>FreeType2</application></title>
 
-<para>Install <application>freetype2</application> by running the following 
+<para>Install <application>FreeType2</application> by running the following 
 commands:</para>
 
 <screen><userinput><command>cp include/freetype/config/ftoption.h include/freetype/config/ftoption.h.orig &amp;&amp;
diff --git a/x/lib/freetype2/freetype2-intro.xml b/x/lib/freetype2/freetype2-intro.xml
index ad008caba8..b955d18599 100644
--- a/x/lib/freetype2/freetype2-intro.xml
+++ b/x/lib/freetype2/freetype2-intro.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>freetype2</application></title>
+<title>Introduction to <application>FreeType2</application></title>
 
-<para>The <application>freetype2</application> package contains a library to 
+<para>The <application>FreeType2</application> package contains a library to 
 allow <application>XFree86</application> to properly render TrueType fonts.</para>
 
 <sect3><title>Package information</title>