Index: general.ent
===================================================================
--- general.ent	(revision 49ee2def4c5f8f4b1546e364b48738d127b7a885)
+++ general.ent	(revision 2e0084d34788a23f32a4ec4928c728bd51eb9931)
@@ -387,5 +387,5 @@
 <!ENTITY guile-version                "2.0.11">
 <!ENTITY librep-version               "0.92.3">
-<!ENTITY llvm-version                 "3.4.1">
+<!ENTITY llvm-version                 "3.4.2">
 <!ENTITY lua-version                  "5.2.3">
 <!ENTITY mercurial-version            "3.0.1">
@@ -515,5 +515,5 @@
 <!-- Chapter 22 -->
 <!ENTITY db-version                   "6.0.30">
-<!ENTITY mariadb-version              "10.0.11">
+<!ENTITY mariadb-version              "10.0.12">
 <!ENTITY postgresql-version           "9.3.4">
 <!ENTITY sqlite-version               "3.8.5">
Index: general/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision 49ee2def4c5f8f4b1546e364b48738d127b7a885)
+++ general/prog/llvm.xml	(revision 2e0084d34788a23f32a4ec4928c728bd51eb9931)
@@ -7,11 +7,11 @@
   <!ENTITY llvm-download-http "http://llvm.org/releases/&llvm-version;/llvm-&llvm-version;.src.tar.gz">
   <!ENTITY llvm-download-ftp  " ">
-  <!ENTITY llvm-md5sum        "b90697f4de35563ad6c35924defa8dd1">
-  <!ENTITY llvm-size          "15 MB">
-  <!ENTITY llvm-buildsize     "624 MB (1.2 GB with Clang)">
-  <!ENTITY llvm-time          "17.1 SBU (33 SBU with Clang) and 0.4 for tests">
+  <!ENTITY llvm-md5sum        "a20669f75967440de949ac3b1bad439c">
+  <!ENTITY llvm-size          "16 MB">
+  <!ENTITY llvm-buildsize     "543 MB (1.2 GB with Clang)">
+  <!ENTITY llvm-time          "12 SBU (23 SBU with Clang) and 0.3 for tests">
 
   <!ENTITY clang-download-http "http://llvm.org/releases/&llvm-version;/cfe-&llvm-version;.src.tar.gz">
-  <!ENTITY clang-md5sum        "c64fdc567383211c9ac212d6f7b69263">
+  <!ENTITY clang-md5sum        "87945973b7c73038871c5f849a818588">
   <!ENTITY clang-size          "11 MB">
 
@@ -301,6 +301,7 @@
           /usr/lib/clang,
           /usr/lib/clang-analyzer,
-          /usr/share/doc/html/clang, and
-          /usr/share/doc/llvm-&llvm-version;
+          /usr/share/doc/html/clang,
+          /usr/share/doc/llvm-&llvm-version;, and
+          /usr/share/doc/ps
         </seg>
       </seglistitem>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 49ee2def4c5f8f4b1546e364b48738d127b7a885)
+++ general/prog/php.xml	(revision 2e0084d34788a23f32a4ec4928c728bd51eb9931)
@@ -288,4 +288,7 @@
       enables command line <application>Readline</application> support.</para>
 
+      <para><parameter>--with-mysql</parameter>: This parameter
+      includes <application>MariaDB/MySQL</application> support.</para>
+
       <para><option>--disable-libxml</option>: This option
       allows building PHP without <application>libxml2</application>
Index: general/prog/valgrind.xml
===================================================================
--- general/prog/valgrind.xml	(revision 49ee2def4c5f8f4b1546e364b48738d127b7a885)
+++ general/prog/valgrind.xml	(revision 2e0084d34788a23f32a4ec4928c728bd51eb9931)
@@ -79,5 +79,5 @@
     <para role="optional">
       <xref linkend="boost"/>,
-      <xref linkend="llvm"/>, and
+      <xref linkend="llvm"/> (with Clang), and
       <ulink url="www.openmp.org">OpenMP</ulink>
     </para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 49ee2def4c5f8f4b1546e364b48738d127b7a885)
+++ introduction/welcome/changelog.xml	(revision 2e0084d34788a23f32a4ec4928c728bd51eb9931)
@@ -49,4 +49,21 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Tweaks in valgrind-3.9.0 and php-5.5.13.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - llvm-3.4.2. Fixes
+          <ulink url="&blfs-ticket-root;5182">#5182</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - mariadb-10.0.12. Fixes
+          <ulink url="&blfs-ticket-root;5181">#5181</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>June 16th, 2014</para>
+      <itemizedlist>
+        <listitem>
           <para>[fernando] - gnome-calculator-3.12.3. Fixes
           <ulink url="&blfs-ticket-root;5179">#5179</ulink>.</para>
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 49ee2def4c5f8f4b1546e364b48738d127b7a885)
+++ server/databases/mariadb.xml	(revision 2e0084d34788a23f32a4ec4928c728bd51eb9931)
@@ -7,8 +7,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        "faa2ea3f9c6f7bc5f021d299367a7a8d">
+  <!ENTITY mariadb-md5sum        "6e9a7c075526f8f2f83ad8e0933bab2f">
   <!ENTITY mariadb-size          "49 MB">
-  <!ENTITY mariadb-buildsize     "1.2 GB">
-  <!ENTITY mariadb-time          "5.5 SBU (additional 0.4 SBU for the tests)">
+  <!ENTITY mariadb-buildsize     "1.4 GB">
+  <!ENTITY mariadb-time          "8.7 SBU (additional 0.4 SBU for the tests)">
 ]>
 
