Index: postlfs/security/liboauth.xml
===================================================================
--- postlfs/security/liboauth.xml	(revision 22a68d051618bbf5e5186c3527613a5bdf775307)
+++ postlfs/security/liboauth.xml	(revision c627795c5ad2cc0ba0405757f5524a8194c4aade)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY liboauth-download-http "http://downloads.sourceforge.net/liboauth/liboauth-&liboauth-version;.tar.gz">
+  <!ENTITY liboauth-download-http "&sourceforge-repo;/liboauth/liboauth-&liboauth-version;.tar.gz">
   <!ENTITY liboauth-download-ftp  " ">
-  <!ENTITY liboauth-md5sum        "2a8e01914dc85f297ef69c1ab300d0ec">
-  <!ENTITY liboauth-size          "416 KB">
-  <!ENTITY liboauth-buildsize     "4.0 MB">
+  <!ENTITY liboauth-md5sum        "103ea90e3330dfcda7b6d59c4c697472">
+  <!ENTITY liboauth-size          "488 KB">
+  <!ENTITY liboauth-buildsize     "3.6 MB">
   <!ENTITY liboauth-time          "less than 0.1 SBU">
 ]>
@@ -30,31 +30,45 @@
     <title>Introduction to liboauth</title>
 
-    <para><application>Liboauth</application> is a collection of POSIX-C
-    functions implementing the OAuth Core RFC 5849 standard. Liboauth provides
-    functions to escape and encode parameters according to OAuth specification and
-    offers high-level functionality to sign requests or verify OAuth signatures as
-    well as perform HTTP requests.</para>
+    <para>
+      <application>liboauth</application> is a collection of POSIX-C functions
+      implementing the OAuth Core RFC 5849 standard. Liboauth provides functions
+      to escape and encode parameters according to OAuth specification and
+      offers high-level functionality to sign requests or verify OAuth signatures
+      as well as perform HTTP requests.
+    </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&liboauth-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&liboauth-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&liboauth-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&liboauth-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &liboauth-md5sum;</para>
+        <para>
+          Download MD5 sum: &liboauth-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &liboauth-size;</para>
+        <para>
+          Download size: &liboauth-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &liboauth-buildsize;</para>
+        <para>
+          Estimated disk space required: &liboauth-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &liboauth-time;</para>
+        <para>
+          Estimated build time: &liboauth-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -65,5 +79,6 @@
     <para role="required">
       <xref linkend="curl"/> and
-      <xref linkend="openssl"/> or <xref linkend="nss"/>
+      <xref linkend="openssl"/> or
+      <xref linkend="nss"/>
     </para>
 
@@ -74,6 +89,6 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/liboauth"/></para>
-
+      <ulink url="&blfs-wiki;/liboauth"/>
+    </para>
   </sect2>
 
@@ -81,26 +96,34 @@
     <title>Installation of liboauth</title>
 
-    <para>Install <application>liboauth</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>liboauth</application> by running the following
+      commands:
+    </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <para>If you have <xref linkend="doxygen"/>, issue <command>make dox</command>
-    to build documentation.</para>
+    <para>
+      If you have <xref linkend="doxygen"/>, issue <command>make dox</command>
+      to build documentation.
+    </para>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you have built documentation previously, install it with following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you have built documentation previously, install it with following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
 
-<screen role="root">
-<userinput>mkdir -pv /usr/share/doc/liboauth-&liboauth-version; &amp;&amp;
-cp -rv doc/html/* /usr/share/doc/liboauth-&liboauth-version;</userinput>
-</screen>
+<screen role="root"><userinput>mkdir -pv /usr/share/doc/liboauth-&liboauth-version; &amp;&amp;
+cp -rv doc/html/* /usr/share/doc/liboauth-&liboauth-version;</userinput></screen>
 
   </sect2>
@@ -109,6 +132,6 @@
     <title>Command Explanations</title>
 
-    <para><option>--disable-static</option>: This switch prevents static
-    libraries from being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
     <para><option>--enable-nss</option>: Use NSS instead of OpenSSL.</para>
@@ -120,12 +143,14 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>liboauth.{so,a}</seg>
-        <seg></seg>
+        <seg>
+          liboauth.so
+        </seg>
+        <seg>
+          /usr/share/doc/liboauth-&liboauth-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -137,12 +162,14 @@
 
       <varlistentry id="liboauth-lib">
-        <term><filename class='libraryfile'>liboauth.{so,a}</filename></term>
+        <term><filename class='libraryfile'>liboauth.so</filename></term>
         <listitem>
-          <para>provides functions to escape and encode stings according to
-          OAuth specifications and offers high-level functionality built 
-          on top to sign requests or verify signatures using either NSS or 
-          OpenSSL for calculating the hash/signatures.</para>
+          <para>
+            provides functions to escape and encode stings according to
+            OAuth specifications and offers high-level functionality built 
+            on top to sign requests or verify signatures using either NSS or 
+            OpenSSL for calculating the hash/signatures.
+          </para>
           <indexterm zone="liboauth liboauth-lib">
-            <primary sortas="c-liboauth">liboauth.{so,a}</primary>
+            <primary sortas="c-liboauth">liboauth.so</primary>
           </indexterm>
         </listitem>
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision 22a68d051618bbf5e5186c3527613a5bdf775307)
+++ postlfs/security/shadow.xml	(revision c627795c5ad2cc0ba0405757f5524a8194c4aade)
@@ -5,10 +5,9 @@
   %general-entities;
 
-  <!ENTITY shadow-download-http
-  "http://pkg-shadow.alioth.debian.org/releases/shadow-&shadow-version;.tar.bz2 ">
+  <!ENTITY shadow-download-http "http://pkg-shadow.alioth.debian.org/releases/shadow-&shadow-version;.tar.bz2">
   <!ENTITY shadow-download-ftp  " ">
-  <!ENTITY shadow-md5sum        "d5f7a588fadb79faeb4b08b1eee82e9a">
+  <!ENTITY shadow-md5sum        "a00449aa439c69287b6d472191dc2247">
   <!ENTITY shadow-size          "2.1 MB">
-  <!ENTITY shadow-buildsize     "35 MB">
+  <!ENTITY shadow-buildsize     "38 MB">
   <!ENTITY shadow-time          "0.3 SBU">
 ]>
@@ -79,14 +78,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/shadow-&shadow-version;-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Shadow Dependencies</bridgehead>
 
@@ -140,6 +129,4 @@
 sed -i -e 's@PATH=/sbin:/bin:/usr/sbin:/usr/bin@&amp;:/usr/local/sbin:/usr/local/bin@' \
        -e 's@PATH=/bin:/usr/bin@&amp;:/usr/local/bin@' etc/login.defs &amp;&amp;
-
-patch -Np1 -i ../shadow-&shadow-version;-fixes-1.patch &amp;&amp;
 
 ./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
@@ -653,4 +640,6 @@
       found at <ulink url="&lfs-root;/chapter06/shadow.html#contents-shadow"/>.
     </para>
+
   </sect2>
+
 </sect1>
