Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision c052d9fc0ea9a8cf1a6c826609810448e168d962)
+++ general/prog/php.xml	(revision b1f7ec3c3a6a80a8d53b9644dd42dd841040e09a)
@@ -7,8 +7,8 @@
   <!ENTITY php-download-http "http://www.php.net/distributions/php-&php-version;.tar.xz">
   <!ENTITY php-download-ftp  " ">
-  <!ENTITY php-md5sum        "bbf4dfe4f501143a1763eb86b6a0a454">
+  <!ENTITY php-md5sum        "8a9c86939e067579bb4cf7683366298a">
   <!ENTITY php-size          "12 MB">
-  <!ENTITY php-buildsize     "615 MB (with tests, add 112 MB for documentation)">
-  <!ENTITY php-time          "1.6 SBU (with parallelism=4; add 2.5 SBU for tests)">
+  <!ENTITY php-buildsize     "458 MB (with tests, add 112 MB for documentation)">
+  <!ENTITY php-time          "0.9 SBU (with parallelism=4; add 2.6 SBU for tests)">
 ]>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c052d9fc0ea9a8cf1a6c826609810448e168d962)
+++ introduction/welcome/changelog.xml	(revision b1f7ec3c3a6a80a8d53b9644dd42dd841040e09a)
@@ -46,4 +46,12 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to mariadb-10.2.11. Fixes
+          <ulink url="&blfs-ticket-root;10085">#10085</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to php-7.1.12. Fixes
+          <ulink url="&blfs-ticket-root;10069">#10069</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to vlc-2.2.8. Fixes
           <ulink url="&blfs-ticket-root;10060">#10060</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision c052d9fc0ea9a8cf1a6c826609810448e168d962)
+++ packages.ent	(revision b1f7ec3c3a6a80a8d53b9644dd42dd841040e09a)
@@ -327,5 +327,5 @@
 <!ENTITY ninja-version                "1.8.2">
 <!ENTITY npapi-sdk-version            "0.27.2">
-<!ENTITY php-version                  "7.1.11">
+<!ENTITY php-version                  "7.1.12">
 <!ENTITY python2-version              "2.7.14">
 <!ENTITY python3-version              "3.6.3">
@@ -509,5 +509,5 @@
 <!ENTITY db-version                   "6.2.32">
 <!ENTITY lmdb-version                 "0.9.21">
-<!ENTITY mariadb-version              "10.2.10">
+<!ENTITY mariadb-version              "10.2.11">
 <!ENTITY postgresql-version           "10.1">
 <!ENTITY sqlite-version               "3.21.0">
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision c052d9fc0ea9a8cf1a6c826609810448e168d962)
+++ server/databases/mariadb.xml	(revision b1f7ec3c3a6a80a8d53b9644dd42dd841040e09a)
@@ -8,8 +8,8 @@
   <!ENTITY mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz"> 
   <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
-  <!ENTITY mariadb-md5sum        "4d14eba77e964737b13893b8beaafb1c">
+  <!ENTITY mariadb-md5sum        "954088299fe5f11b4fda3b540558adbd">
   <!ENTITY mariadb-size          "69 MB">
-  <!ENTITY mariadb-buildsize     "1.8 GB">
-  <!ENTITY mariadb-time          "8.3 SBU (with parallelism=4, add 0.5 SBU for tests)">
+  <!ENTITY mariadb-buildsize     "1.3 GB">
+  <!ENTITY mariadb-time          "8.6 SBU (with parallelism=4, add 0.5 SBU for tests)">
 ]>
 
@@ -191,6 +191,5 @@
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-ln -sfv /usr/include/mysql/{mariadb,mysql}_version.h</userinput></screen>
+<screen role="root"><userinput>make install </userinput></screen>
 
   </sect2>
@@ -232,11 +231,4 @@
       customization options.
     </para></note>
-
-    <para>
-      <command>ln -s /usr/include/mysql/{mariadb,mysql}_version.h</command>: 
-      Some applications, for example <xref linkend='qt5'/>, look specifically for 
-      mysql_version.h.  This symbolic link ensures the proper file can be found.
-    </para>
-
 
   </sect2>
