Index: general/genlib/apr-util.xml
===================================================================
--- general/genlib/apr-util.xml	(revision 58d5000b292de3a220ddafea47dbf61d4b1bffb9)
+++ general/genlib/apr-util.xml	(revision faaa22dbb1ce22aaf06f2b4b61cc345481dae1d5)
@@ -8,8 +8,8 @@
            "http://archive.apache.org/dist/apr/apr-util-&apr-util-version;.tar.bz2">
   <!ENTITY apr-util-download-ftp  "ftp://ftp.mirrorservice.org/sites/ftp.apache.org/apr/apr-util-&apr-util-version;.tar.bz2">
-  <!ENTITY apr-util-md5sum        "2202b18f269ad606d70e1864857ed93c">
-  <!ENTITY apr-util-size          "680 KB">
-  <!ENTITY apr-util-buildsize     "8.7 MB (additional 1 MB for the tests)">
-  <!ENTITY apr-util-time          "0.2 SBU">
+  <!ENTITY apr-util-md5sum        "069a9a980776acab05212c5f37ef8368">
+  <!ENTITY apr-util-size          "419 KB">
+  <!ENTITY apr-util-buildsize     "8 MB (additional 1.4 MB for tests)">
+  <!ENTITY apr-util-time          "0.1 SBU (additional 0.3 SBU for tests)">
 ]>
 
@@ -71,11 +71,4 @@
           Estimated build time: &apr-util-time;
         </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink url="&patch-root;/apr-util-&apr-util-version;-openssl-1.1.0-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -117,6 +110,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../apr-util-&apr-util-version;-openssl-1.1.0-1.patch &amp;&amp;
-./configure --prefix=/usr       \
+<screen><userinput>./configure --prefix=/usr       \
             --with-apr=/usr     \
             --with-gdbm=/usr    \
Index: general/genlib/apr.xml
===================================================================
--- general/genlib/apr.xml	(revision 58d5000b292de3a220ddafea47dbf61d4b1bffb9)
+++ general/genlib/apr.xml	(revision faaa22dbb1ce22aaf06f2b4b61cc345481dae1d5)
@@ -9,8 +9,8 @@
   <!ENTITY apr-download-ftp
     "ftp://ftp.mirrorservice.org/sites/ftp.apache.org/apr/apr-&apr-version;.tar.bz2">
-  <!ENTITY apr-md5sum        "4e9769f3349fe11fc0a5e1b224c236aa">
-  <!ENTITY apr-size          "808 KB">
+  <!ENTITY apr-md5sum        "e81a851967c79b5ce9bfbc909e4bf735">
+  <!ENTITY apr-size          "833 KB">
   <!ENTITY apr-buildsize     "13 MB (additional 3 MB for the tests)">
-  <!ENTITY apr-time          "0.2 SBU (1.1 with tests)">
+  <!ENTITY apr-time          "0.2 SBU (1.6 with tests)">
 ]>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 58d5000b292de3a220ddafea47dbf61d4b1bffb9)
+++ introduction/welcome/changelog.xml	(revision faaa22dbb1ce22aaf06f2b4b61cc345481dae1d5)
@@ -46,4 +46,17 @@
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Update to apr-util-1.6.0. Fixes
+          <ulink url="&blfs-ticket-root;9388">#9388</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to par-1.6.2. Fixes
+          <ulink url="&blfs-ticket-root;9387">#9387</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Add a patch to exim-4.89, preventing repeated
+           use of -p and -oMr options. Fixes 
+          <ulink url="&blfs-ticket-root;9386">#9386</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[pierre] - Update to cairo-1.14.10. Fixes
           <ulink url="&blfs-ticket-root;9369">#9369</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 58d5000b292de3a220ddafea47dbf61d4b1bffb9)
+++ packages.ent	(revision faaa22dbb1ce22aaf06f2b4b61cc345481dae1d5)
@@ -84,6 +84,6 @@
 <!-- Chapter 9 -->
 <!ENTITY appstream-glib-version       "0.6.13">
-<!ENTITY apr-version                  "1.5.2">
-<!ENTITY apr-util-version             "1.5.4">
+<!ENTITY apr-version                  "1.6.2">
+<!ENTITY apr-util-version             "1.6.0">
 <!ENTITY aspell-version               "0.60.6.1">
 
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 58d5000b292de3a220ddafea47dbf61d4b1bffb9)
+++ server/mail/exim.xml	(revision faaa22dbb1ce22aaf06f2b4b61cc345481dae1d5)
@@ -75,4 +75,12 @@
         shown at <ulink url="http://exim.org/docs.html"/>.</para>
       </listitem>
+      <listitem>
+        <para>
+          Recommended patch (prevents triggering CVE-2017-1000369 by using
+          exim commands): <ulink
+            url="&patch-root;/exim-&exim-version;-avoid_mem_clash-1.patch"/>
+        </para>
+      </listitem>
+
     </itemizedlist>
 
@@ -127,5 +135,6 @@
     commands:</para>
 
-<screen><userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,'    \
+<screen><userinput>patch -p1 -i ../exim-&exim-version;-avoid_mem_clash-1.patch &amp;&amp;
+sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,'    \
     -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,' \
     -e 's,^EXIM_USER.*$,EXIM_USER=exim,'           \
