Index: postlfs/security/libcap2.xml
===================================================================
--- postlfs/security/libcap2.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ postlfs/security/libcap2.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -165,9 +165,9 @@
 
       <varlistentry id="libcap2-lib">
-        <term><filename class='libraryfile'>libcap2.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libcap.{so,a}</filename></term>
         <listitem>
           <para>contains the <application>libcap2</application> API functions.</para>
           <indexterm zone="libcap2 libcap2-lib">
-            <primary sortas="c-libcap2">libcap2.{so,a}</primary>
+            <primary sortas="c-libcap2">libcap.{so,a}</primary>
           </indexterm>
         </listitem>
Index: postlfs/security/openssh.xml
===================================================================
--- postlfs/security/openssh.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ postlfs/security/openssh.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -9,7 +9,7 @@
   <!ENTITY openssh-download-ftp
     "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
-  <!ENTITY openssh-md5sum        "7b2d9dd75b5cf267ea1737ec75500316">
+  <!ENTITY openssh-md5sum        "be46174dcbb77ebb4ea88ef140685de1">
   <!ENTITY openssh-size          "1.2 MB">
-  <!ENTITY openssh-buildsize     "32 MB (plus 10MB if running the tests)">
+  <!ENTITY openssh-buildsize     "31 MB (additional 10 MB if running the tests)">
   <!ENTITY openssh-time          "0.4 SBU (running the tests takes at least 10 minutes, irrespective of processor speed)">
 ]>
@@ -127,8 +127,9 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr             \
-            --sysconfdir=/etc/ssh     \
-            --datadir=/usr/share/sshd \
-            --with-md5-passwords      \
+<screen><userinput>./configure --prefix=/usr                     \
+            --libexecdir=/usr/lib/openssh     \
+            --sysconfdir=/etc/ssh             \
+            --datadir=/usr/share/sshd         \
+            --with-md5-passwords              \
             --with-privsep-path=/var/lib/sshd &amp;&amp;
 make</userinput></screen>
@@ -143,5 +144,5 @@
 
     <para>
-      To test the results, issue: <command>make test</command>.
+      To test the results, issue: <command>make tests</command>.
     </para>
 
@@ -164,4 +165,6 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+install -v -m755 contrib/ssh-copy-id /usr/bin &amp;&amp;
+install -v -m644 contrib/ssh-copy-id.1 /usr/share/man/man1 &amp;&amp;
 install -v -m755 -d /usr/share/doc/openssh-&openssh-version; &amp;&amp;
 install -v -m644 INSTALL LICENCE OVERVIEW README* \
@@ -329,5 +332,6 @@
         <seg>
           scp, sftp, sftp-server, slogin, ssh, sshd, ssh-add, ssh-agent,
-          ssh-keygen, ssh-keyscan and ssh-keysign
+          ssh-copy-id, ssh-keygen, ssh-keyscan, ssh-keysign and
+          ssh-pkcs11-helper
         </seg>
         <seg>
@@ -447,4 +451,16 @@
       </varlistentry>
 
+      <varlistentry id="ssh-copy-id">
+        <term><command>ssh-copy-id</command></term>
+        <listitem>
+          <para>
+            is a script that enables logins on remote machine using local keys.
+          </para>
+          <indexterm zone="openssh ssh-copy-id">
+            <primary sortas="b-ssh-copy-id">ssh-copy-id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="ssh-keygen">
         <term><command>ssh-keygen</command></term>
@@ -485,4 +501,17 @@
         </listitem>
       </varlistentry>
+
+      <varlistentry id="ssh-pkcs11-helper">
+        <term><command>ssh-pkcs11-helper</command></term>
+        <listitem>
+          <para>
+            is a <command>ssh-agent</command> helper program for PKCS#11 support.
+          </para>
+          <indexterm zone="openssh ssh-pkcs11-helper">
+            <primary sortas="b-ssh-pkcs11-helper">ssh-pkcs11-helper</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
   </sect2>
Index: postlfs/security/sudo.xml
===================================================================
--- postlfs/security/sudo.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ postlfs/security/sudo.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -7,8 +7,8 @@
   <!ENTITY sudo-download-http "http://www.sudo.ws/sudo/dist/sudo-&sudo-version;.tar.gz">
   <!ENTITY sudo-download-ftp  "ftp://ftp.twaren.net/Unix/Security/Sudo/sudo-&sudo-version;.tar.gz">
-  <!ENTITY sudo-md5sum        "a7b5c39a904721956eccddd30689250f">
+  <!ENTITY sudo-md5sum        "6dac48c73c8e0932980efcddafa569af">
   <!ENTITY sudo-size          "1.8 MB">
-  <!ENTITY sudo-buildsize     "19 MB">
-  <!ENTITY sudo-time          "0.2 SBU">
+  <!ENTITY sudo-buildsize     "23 MB">
+  <!ENTITY sudo-time          "0.3 SBU">
 ]>
 
@@ -102,11 +102,9 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                   \
-            --libexecdir=/usr/lib/sudo      \
+<screen><userinput>./configure --prefix=/usr                        \
+            --libexecdir=/usr/lib/sudo           \
             --docdir=/usr/share/doc/sudo-&sudo-version; \
-            --with-all-insults              \
-            --with-env-editor               \
-            --without-pam                   \
-            --without-sendmail &amp;&amp;
+            --with-all-insults                   \
+            --with-env-editor                    &amp;&amp;
 make</userinput></screen>
 
@@ -136,6 +134,7 @@
     </para>
 
-    <para>
-      <option>--without-pam</option>: This switch disables the use of
+<!--
+    <para>
+      <option>-&#45;without-pam</option>: This switch disables the use of
       <application>PAM</application> authentication. Omit if you have
       <application>Linux PAM</application> installed.
@@ -143,8 +142,9 @@
 
     <para>
-      <option>--without-sendmail</option>: This switch disables the use of
+      <option>-&#45;without-sendmail</option>: This switch disables the use of
       sendmail. Remove if you have a sendmail compatible MTA.
    </para>
 
+-->
     <note>
       <para>
