Index: general/graphlib/babl.xml
===================================================================
--- general/graphlib/babl.xml	(revision 34484cfee7140fb4dc39e6e6ec0dbd17d1f91c64)
+++ general/graphlib/babl.xml	(revision 8b319a8cbe167dab804a22ed7ec4f65dd75e8994)
@@ -10,7 +10,7 @@
 <!--  <!ENTITY babl-download-ftp
   "ftp://ftp.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.bz2">-->
-  <!ENTITY babl-md5sum        "b66682d1c3e209001eabf1294b72d841">
-  <!ENTITY babl-size          "600 KB">
-  <!ENTITY babl-buildsize     "12 MB (with tests)">
+  <!ENTITY babl-md5sum        "c32245f90a0b59e4714b546308d2ee34">
+  <!ENTITY babl-size          "602 KB">
+  <!ENTITY babl-buildsize     "15 MB (with tests)">
   <!ENTITY babl-time          "0.2 SBU (with tests)">
 ]>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 34484cfee7140fb4dc39e6e6ec0dbd17d1f91c64)
+++ introduction/welcome/changelog.xml	(revision 8b319a8cbe167dab804a22ed7ec4f65dd75e8994)
@@ -47,4 +47,20 @@
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Update to gimp-2.8.20. Fixes
+          <ulink url="&blfs-ticket-root;8836">#8836</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to xkeyboard-config-2.20. Fixes
+          <ulink url="&blfs-ticket-root;8835">#8835</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to babl-0.1.24. Fixes
+          <ulink url="&blfs-ticket-root;8833">#8833</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to tripwire-2.4.3.2. Fixes
+          <ulink url="&blfs-ticket-root;8832">#8832</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Update to Thunderbird-45.7.0. Fixes
           <ulink url="&blfs-ticket-root;8806">#8806</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 34484cfee7140fb4dc39e6e6ec0dbd17d1f91c64)
+++ packages.ent	(revision 8b319a8cbe167dab804a22ed7ec4f65dd75e8994)
@@ -42,5 +42,5 @@
 <!ENTITY stunnel-version              "5.40">
 <!ENTITY sudo-version                 "1.8.19p2">
-<!ENTITY tripwire-version             "2.4.3.1">
+<!ENTITY tripwire-version             "2.4.3.2">
 
 <!-- Chapter 5 -->
@@ -173,5 +173,5 @@
 <!-- Chapter 10 -->
 <!ENTITY aalib-version                "1.4rc5">
-<!ENTITY babl-version                 "0.1.22">
+<!ENTITY babl-version                 "0.1.24">
 <!ENTITY exiv2-version                "0.25">
 <!ENTITY freetype2-version            "2.7.1">
@@ -493,5 +493,5 @@
 <!ENTITY xbitmaps-version             "1.1.1">
 <!ENTITY xcursor-themes-version       "1.0.4">
-<!ENTITY xkeyboard-config-version     "2.19">
+<!ENTITY xkeyboard-config-version     "2.20">
 <!ENTITY mesa-version                 "13.0.4">
 <!ENTITY xcb-util-version             "0.4.0">
@@ -704,5 +704,5 @@
 <!ENTITY fontforge-version            "20161004">
 <!ENTITY gparted-version              "0.27.0">
-<!ENTITY gimp-version                 "2.8.18">
+<!ENTITY gimp-version                 "2.8.20">
 <!ENTITY hexchat-version              "2.12.4">
 <!ENTITY icedtea-web-version          "1.6.2">
Index: postlfs/security/tripwire.xml
===================================================================
--- postlfs/security/tripwire.xml	(revision 34484cfee7140fb4dc39e6e6ec0dbd17d1f91c64)
+++ postlfs/security/tripwire.xml	(revision 8b319a8cbe167dab804a22ed7ec4f65dd75e8994)
@@ -7,8 +7,8 @@
   <!ENTITY tripwire-download-http "https://github.com/Tripwire/tripwire-open-source/archive/&tripwire-version;.tar.gz">
   <!ENTITY tripwire-download-ftp  " ">
-  <!ENTITY tripwire-md5sum        "36c7f1beb5431db870506d5604c0d060">
-  <!ENTITY tripwire-size          "812 KB">
-  <!ENTITY tripwire-buildsize     "27 MB">
-  <!ENTITY tripwire-time          "1.6 SBU (includes interactive time during install)">
+  <!ENTITY tripwire-md5sum        "4ec693b96112e4933235f75908695951">
+  <!ENTITY tripwire-size          "945 KB">
+  <!ENTITY tripwire-buildsize     "33 MB">
+  <!ENTITY tripwire-time          "1.2 SBU (scripting install)">
 ]>
 
@@ -93,8 +93,12 @@
 <screen><userinput>sed -e 's|TWDB="${prefix}|TWDB="/var|'   \
     -e '/TWMAN/ s|${prefix}|/usr/share|' \
-    -e '/TWDOCS/s|${prefix}/doc/tripwire|/usr/share/doc/tripwire-&tripwire-version;| \
-    -i   install/install.cfg                         &amp;&amp;                     
-
-./configure --prefix=/usr --sysconfdir=/etc/tripwire &amp;&amp;
+    -e '/TWDOCS/s|${prefix}/doc/tripwire|/usr/share/doc/tripwire-&tripwire-version;|' \
+    -i installer/install.cfg                               &amp;&amp;
+find . -name Makefile.am | xargs                           \
+    sed -i 's/^[[:alpha:]_]*_HEADERS.*=/noinst_HEADERS =/' &amp;&amp;
+sed '/dist/d' -i man/man?/Makefile.am                      &amp;&amp;
+autoreconf -fi                                             &amp;&amp;
+
+./configure --prefix=/usr --sysconfdir=/etc/tripwire       &amp;&amp;
 make</userinput></screen>
 
@@ -111,4 +115,20 @@
 cp -v policy/*.txt /usr/share/doc/tripwire-&tripwire-version;</userinput></screen>
 
+    <note>
+      <para>
+        During <command>make install</command>, several questions
+        are asked, including passwords. If you want to make a script, you have
+        to apply a <application>sed</application> before running
+        <command>make install</command>:
+      </para>
+
+<screen><userinput>sed -i -e 's@installer/install.sh@&amp; -n -s <replaceable>&lt;site-password&gt;</replaceable> -l <replaceable>&lt;local-password&gt;</replaceable>@' Makefile</userinput></screen>
+
+      <para>
+        Of course, you should do this with dummy passwords and change them
+	later.
+      </para>
+    </note>
+
   </sect2>
 
@@ -116,29 +136,30 @@
     <title>Command Explanations</title>
 
-    <para><command>sed ... install/install.cfg</command>: This command tells the 
-    package to install the program database and reports in
-    <filename class="directory">/var/lib/tripwire</filename> and sets the
-    proper location for man pages and documentation.</para>
-
-    <para><command>make install</command>: This command creates the
-    <application>Tripwire</application> security keys as well as installing
-    the binaries. There are two keys: a site key and a local key which are
-    stored in <filename class="directory">/etc/tripwire/</filename>.</para>
-
-    <note><para>During <command>make install</command>, several questions
-    are asked, including passwords. If you want to make a script, you have
-    to apply a <application>sed</application> before running
-    <command>make install</command>:</para>
-
     <para>
-    <command>sed -i -e 's@install/install.sh@&amp; -n -s<replaceable>&lt;site-password&gt;</replaceable> -l<replaceable>&lt;local-password&gt;</replaceable>@' Makefile</command>
+      <command>sed ... installer/install.cfg</command>: This command tells
+      the package to install the program database and reports in
+      <filename class="directory">/var/lib/tripwire</filename> and sets the
+      proper location for man pages and documentation.
     </para>
 
-    <para>Of course, you should do this with dummy passwords and change them
-    later.</para></note>
-
-    <para><command>cp -v policy/*.txt /usr/doc/tripwire-&tripwire-version;</command>: This command
-    installs the <application>tripwire</application> sample policy files with
-    the other <application>tripwire</application> documentation.</para>
+    <para>
+      <command>find ...</command>, <command>sed ...</command>, and
+      <command>autoreconf -fi</command>: The build system is unusable as is, and
+      has to be modified for the build to succeed.
+    </para>
+
+    <para>
+      <command>make install</command>: This command creates the
+      <application>Tripwire</application> security keys as well as installing
+      the binaries. There are two keys: a site key and a local key which are
+      stored in <filename class="directory">/etc/tripwire/</filename>.
+    </para>
+
+    <para>
+      <command>cp -v policy/*.txt /usr/doc/tripwire-&tripwire-version;</command>:
+      This command installs the <application>tripwire</application> sample
+      policy files with the other <application>tripwire</application>
+      documentation.i
+    </para>
 
   </sect2>
@@ -215,5 +236,5 @@
       as the <systemitem class="username">root</systemitem> user, with:</para>
 
-<screen role="root">twprint --print-report -r /var/lib/tripwire/report/<replaceable>&lt;report-name.twr&gt;</replaceable></screen>
+<screen role="root"><userinput>twprint --print-report -r /var/lib/tripwire/report/<replaceable>&lt;report-name.twr&gt;</replaceable></userinput></screen>
 
       <para>After you run an integrity check, you should examine the
@@ -271,5 +292,6 @@
         <seg>siggen, tripwire, twadmin, and twprint</seg>
         <seg>None</seg>
-        <seg>/etc/tripwire, /var/lib/tripwire, and /usr/share/doc/tripwire</seg>
+	<seg>/etc/tripwire, /var/lib/tripwire,
+        and /usr/share/doc/tripwire-&tripwire-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: x/installing/xkeyboard-config.xml
===================================================================
--- x/installing/xkeyboard-config.xml	(revision 34484cfee7140fb4dc39e6e6ec0dbd17d1f91c64)
+++ x/installing/xkeyboard-config.xml	(revision 8b319a8cbe167dab804a22ed7ec4f65dd75e8994)
@@ -9,7 +9,7 @@
   <!ENTITY xkeyboard-config-download-ftp
   "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
-  <!ENTITY xkeyboard-config-md5sum        "88cbf55f2f32b80ba9bb872889daf7ff">
-  <!ENTITY xkeyboard-config-size          "964 KB">
-  <!ENTITY xkeyboard-config-buildsize     "13 MB">
+  <!ENTITY xkeyboard-config-md5sum        "1f68886339116ae3877052204c9b9b88">
+  <!ENTITY xkeyboard-config-size          "955 KB">
+  <!ENTITY xkeyboard-config-buildsize     "20 MB">
   <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
 ]>
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision 34484cfee7140fb4dc39e6e6ec0dbd17d1f91c64)
+++ xsoft/other/gimp.xml	(revision 8b319a8cbe167dab804a22ed7ec4f65dd75e8994)
@@ -7,9 +7,9 @@
   <!ENTITY gimp-download-http "http://download.gimp.org/pub/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
   <!ENTITY gimp-download-ftp  " ">
-  <!ENTITY gimp-md5sum        "5adaa11a68bc8a42bb2c778fee4d389c">
+  <!ENTITY gimp-md5sum        "d405640c426b234d6efc36fb4f5bae57">
   <!ENTITY gimp-size          "20 MB">
-  <!ENTITY gimp-buildsize     "575 MB (additional 714 MB to run
+  <!ENTITY gimp-buildsize     "643 MB (additional 714 MB to run
                                the test suite)">
-  <!ENTITY gimp-time          "5.9 SBU (additional 0.9 SBU to run
+  <!ENTITY gimp-time          "4.2 SBU (additional 0.8 SBU to run
                                the test suite)">
 
@@ -146,5 +146,5 @@
       <command>sendmail</command> program),
       <xref linkend="gtk-doc"/>, 
-      <xref linkend="webkitgtk2"/> (required for the help-plugin) and
+      <xref linkend="webkitgtk2"/>, and
       <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>
     </para>
@@ -256,10 +256,11 @@
     <para>
       <parameter>--without-gvfs</parameter>: the choice of the backend to
-      handle URI information, e.g., when dragging images from a browser into the
-      <application>Gimp</application>, is made at compile time.  This parameter will
-      ensure that <application>cURL</application> is used at run-time, instead of
-      <application>Gvfs</application>.  You can omit this if you are installing
-      <application>Gvfs</application> AND will be running <command>gvfsd</command>,
-      e.g., in a <application>GNOME</application> desktop.
+      handle URI information, e.g., when dragging images from a browser into
+      the <application>Gimp</application>, is made at compile time. This
+      parameter will ensure that <application>cURL</application> is used at
+      run-time, instead of <application>Gvfs</application>. You can omit this
+      if you are installing <application>Gvfs</application> AND will be running
+      <command>gvfsd</command>, e.g., in a <application>GNOME</application>
+      desktop.
     </para>
 
@@ -302,9 +303,10 @@
 
       <para>
-        The GIMP uses either a plugin or a browser for its help system.  <!-- 
-        The depedency to build the plugin, WebKitGTK+-2.4.x, has been deprecated
-        and is no longer in BLFS. -->  To set up the help system to work with 
-        the default browser, use Edit -> Preferences -> Help System and select 
-        'Web Browser' for the 'Help Browser to use' setting.
+        The GIMP uses either a plugin (if you have installed <xref
+        linkend="webkitgtk2"/>) or a browser for its help system.<!-- 
+        The depedency to build the plugin, WebKitGTK+-2.4.x, has been
+        deprecated and is no longer in BLFS. --> To set up the help system to
+	work with the default browser, use Edit -> Preferences -> Help System
+        and select 'Web Browser' for the 'Help Browser to use' setting.
       </para>
     </sect3>
@@ -322,6 +324,6 @@
       <seglistitem>
         <seg>
-          gimp, gimp-2.8,
-          gimp-console, gimp-console-2.8, and
+          gimp (symlink), gimp-2.8,
+          gimp-console (symlink), gimp-console-2.8, and
           gimptool-2.0
         </seg>
