Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 161691d721f1fb721d1a9849f715a46ed997749e)
+++ chapter01/changelog.xml	(revision 7e42b398615c56bc47375cb807d1246008863df3)
@@ -44,4 +44,14 @@
        -->
     <listitem>
+      <para>2020-01-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to libcap-2.30. Fixes
+          <ulink url="&lfs-ticket-root;4569">#4569</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2020-01-04</para>
       <itemizedlist>
Index: chapter06/libcap.xml
===================================================================
--- chapter06/libcap.xml	(revision 161691d721f1fb721d1a9849f715a46ed997749e)
+++ chapter06/libcap.xml	(revision 7e42b398615c56bc47375cb807d1246008863df3)
@@ -44,22 +44,11 @@
     <title>Installation of Libcap</title>
 
-    <para>Prevent two static libraries from being installed:</para>
+    <para>Prevent a static library from being installed:</para>
 
-<screen><userinput remap="pre">sed -i '/install.*STA...LIBNAME/d' libcap/Makefile</userinput></screen>
-
-    <para>Fix a file with wrong syntax:</para>
-
-<screen><userinput remap="pre">sed -i '/libpsx/,$d' libcap/libcap.pc.in</userinput></screen>
+<screen><userinput remap="pre">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput></screen>
 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make lib=lib</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make lib=lib install
-chmod -v 755 /lib/libcap.so.&libcap-version;</userinput></screen>
 
     <variablelist>
@@ -69,5 +58,5 @@
         <term><parameter>lib=lib</parameter></term>
         <listitem>
-          <para>This parameter installs the library in
+          <para>This parameter sets the library directory to
           <filename>/lib</filename> rather than
           <filename>/lib64</filename> on x86_64. It has no effect on
@@ -75,6 +64,14 @@
         </listitem>
       </varlistentry>
- 
     </variablelist>
+
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make test</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make lib=lib install
+chmod -v 755 /lib/libcap.so.&libcap-version;</userinput></screen>
 
   </sect2>
@@ -89,5 +86,5 @@
       <seglistitem>
         <seg>capsh, getcap, getpcaps, and setcap</seg>
-        <seg>libcap.so</seg>
+        <seg>libcap.so and libpsx.a</seg>
       </seglistitem>
     </segmentedlist>
@@ -149,4 +146,15 @@
       </varlistentry>
 
+      <varlistentry id="libpsx">
+        <term><filename class="libraryfile">libpsx</filename></term>
+        <listitem>
+          <para>Contains functions to support POSIX semantics for syscalls
+          associated with the pthread library</para>
+          <indexterm zone="ch-system-libcap libpsx">
+            <primary sortas="c-libpsx">libpsx</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: general.ent
===================================================================
--- general.ent	(revision 161691d721f1fb721d1a9849f715a46ed997749e)
+++ general.ent	(revision 7e42b398615c56bc47375cb807d1246008863df3)
@@ -1,12 +1,12 @@
-<!ENTITY version         "SVN-20200104">
+<!ENTITY version         "SVN-20200106">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20200104-systemd">
+<!ENTITY versiond        "20200106-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "January 4th, 2020">
+<!ENTITY releasedate     "January 6th, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
Index: packages.ent
===================================================================
--- packages.ent	(revision 161691d721f1fb721d1a9849f715a46ed997749e)
+++ packages.ent	(revision 7e42b398615c56bc47375cb807d1246008863df3)
@@ -390,10 +390,10 @@
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.29">
+<!ENTITY libcap-version "2.30">
 <!ENTITY libcap-size "96 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "dd865b8a0a13cb8e9768e832e00f9f11">
+<!ENTITY libcap-md5 "ea531f37a30a61dce8bf8544537a46e3">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
-<!ENTITY libcap-ch6-du "1.5 MB">
+<!ENTITY libcap-ch6-du "8.5 MB">
 <!ENTITY libcap-ch6-sbu "less than 0.1 SBU">
 
