Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision dfd52645d678488172b7a84d9637c4df49b8a3ba)
+++ general/prog/git.xml	(revision 49ee8357312a3cc5b864d8ce18ae47f29f3cdd30)
@@ -9,8 +9,8 @@
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  "ftp://ftp.kernel.org/pub/software/scm/git/git-&git-version;.tar.xz">
-  <!ENTITY git-md5sum        "244e2cd2c276314cf35b60e44def1743">
+  <!ENTITY git-md5sum        "f108b475a0aa30e9587be4295ab0bb09">
   <!ENTITY git-size          "3.6 MB">
-  <!ENTITY git-buildsize     "340 MB (with tests and downloaded documents)">
-  <!ENTITY git-time          "4.8 SBU (with tests using -j8 and downloaded documents)">
+  <!ENTITY git-buildsize     "343 MB (357 MB, with tests and downloaded documents)">
+  <!ENTITY git-time          "0.7 SBU (4.8 SBU, using -j8, with tests and downloaded documents)">
 ]>
 
@@ -126,5 +126,5 @@
     <para>
       <xref linkend="xmlto"/> and
-      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> or 
+      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> or
       <ulink url="http://asciidoctor.org/">AsciiDoctor</ulink>
     </para>
@@ -281,5 +281,5 @@
 
     <para>
-      <command>find ... chmod ...</command>: These commands correct the 
+      <command>find ... chmod ...</command>: These commands correct the
       permissions in the shipped documentation tar file.
     </para>
@@ -326,5 +326,5 @@
         </seg>
         <seg>
-          /usr/lib/perl5/site_perl/&lt;5.x.y&gt;/{,&lt;arch-linux&gt;/auto/}Git,
+          /usr/lib/perl5/site_perl/&lt;5.x.y&gt;{,&lt;arch-linux&gt;/auto}/Git,
           /usr/libexec/git-core and
           /usr/share/{doc/git-&git-version;,git-core,git-gui,gitk,gitweb}
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision dfd52645d678488172b7a84d9637c4df49b8a3ba)
+++ introduction/welcome/changelog.xml	(revision 49ee8357312a3cc5b864d8ce18ae47f29f3cdd30)
@@ -44,7 +44,20 @@
 
 -->
+
     <listitem>
       <para>July 28th, 2015</para>
       <itemizedlist>
+          <listitem>
+            <para>[fernando] - Update to sqlite-3.8.10. Fixes
+            <ulink url="&blfs-ticket-root;6760">#6760</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to stunnel-5.21. Fixes
+            <ulink url="&blfs-ticket-root;6758">#6758</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to git-2.5.0. Fixes
+            <ulink url="&blfs-ticket-root;6573">#6573</ulink>.</para>
+          </listitem>
         <listitem>
           <para>[ken] - Correct error in installation of perl modules
Index: packages.ent
===================================================================
--- packages.ent	(revision dfd52645d678488172b7a84d9637c4df49b8a3ba)
+++ packages.ent	(revision 49ee8357312a3cc5b864d8ce18ae47f29f3cdd30)
@@ -36,5 +36,5 @@
 <!ENTITY shadow-version               "4.2.1">
 <!ENTITY ssh-askpass-version          "&openssh-version;">
-<!ENTITY stunnel-version              "5.20">
+<!ENTITY stunnel-version              "5.21">
 <!ENTITY sudo-version                 "1.8.14p3">
 <!ENTITY tripwire-version             "2.4.2.2">
@@ -260,5 +260,5 @@
 <!ENTITY gc-version                   "7.4.2">
 <!ENTITY gdb-version                  "7.9.1">
-<!ENTITY git-version                  "2.4.3">
+<!ENTITY git-version                  "2.5.0">
 <!ENTITY guile-version                "2.0.11">
 <!ENTITY librep-version               "0.92.5">
@@ -422,5 +422,5 @@
 <!ENTITY mariadb-version              "10.0.20">
 <!ENTITY postgresql-version           "9.4.4">
-<!ENTITY sqlite-version               "3.8.10.2">
+<!ENTITY sqlite-version               "3.8.11">
 
 <!-- Chapter 23 -->
Index: postlfs/filesystems/reiser.xml
===================================================================
--- postlfs/filesystems/reiser.xml	(revision dfd52645d678488172b7a84d9637c4df49b8a3ba)
+++ postlfs/filesystems/reiser.xml	(revision 49ee8357312a3cc5b864d8ce18ae47f29f3cdd30)
@@ -7,5 +7,5 @@
   <!-- <!ENTITY reiser-download-http "http://www.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-&reiser-version;.tar.bz2"> -->
   <!ENTITY reiser-download-http "http://ftp.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v&reiser-version;/reiserfsprogs-&reiser-version;.tar.xz">
-  <!ENTITY reiser-download-ftp  " ">
+  <!ENTITY reiser-download-ftp  "ftp://ftp.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v&reiser-version;/reiserfsprogs-&reiser-version;.tar.xz">
   <!ENTITY reiser-md5sum        "66787380fb418ff7d88a23e47cda7af6">
   <!ENTITY reiser-size          "316 KB">
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision dfd52645d678488172b7a84d9637c4df49b8a3ba)
+++ postlfs/security/stunnel.xml	(revision 49ee8357312a3cc5b864d8ce18ae47f29f3cdd30)
@@ -6,8 +6,11 @@
 
   <!ENTITY stunnel-download-http "https://www.stunnel.org/downloads/stunnel-&stunnel-version;.tar.gz">
-  <!ENTITY stunnel-download-ftp  "ftp://ftp.stunnel.org/stunnel/stunnel-&stunnel-version;.tar.gz">
-  <!ENTITY stunnel-md5sum        "3264375026c2b496b5d258e243222de8">
+  <!-- Following ftp also has older releases -->
+  <!ENTITY stunnel-download-ftp  "ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-&stunnel-version;.tar.gz">
+  <!-- Following ftp only has later release -->
+<!--  <!ENTITY stunnel-download-ftp  "ftp://ftp.stunnel.org/stunnel/stunnel-&stunnel-version;.tar.gz"> -->
+  <!ENTITY stunnel-md5sum        "3d0a932ea650c0fa0da1e45547afdbb8">
   <!ENTITY stunnel-size          "612 KB">
-  <!ENTITY stunnel-buildsize     "6.5 MB">
+  <!ENTITY stunnel-buildsize     "7.9 MB">
   <!ENTITY stunnel-time          "0.1 SBU">
 ]>
@@ -273,10 +276,14 @@
 
       <seglistitem>
-        <seg>stunnel and stunnel3</seg>
-        <seg>libstunnel.so</seg>
-        <seg>/etc/stunnel,
-             /usr/lib/stunnel,
-             /usr/share/doc/stunnel-&stunnel-version;, and
-             /var/lib/stunnel</seg>
+        <seg>
+          stunnel and stunnel3
+        </seg>
+        <seg>
+          libstunnel.so
+        </seg>
+        <seg>
+          /{etc,{usr,var}/lib}/stunnel and
+          /usr/share/doc/stunnel-&stunnel-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: server/databases/sqlite.xml
===================================================================
--- server/databases/sqlite.xml	(revision dfd52645d678488172b7a84d9637c4df49b8a3ba)
+++ server/databases/sqlite.xml	(revision 49ee8357312a3cc5b864d8ce18ae47f29f3cdd30)
@@ -5,16 +5,16 @@
   %general-entities;
 
-  <!ENTITY sqlite-dl-version    "3081002">
-  <!ENTITY sqlite-doc-version   "3081002">
+  <!ENTITY sqlite-dl-version    "3081100">
+  <!ENTITY sqlite-doc-version   "3081100">
 
   <!ENTITY sqlite-download-http "http://sqlite.org/2015/sqlite-autoconf-&sqlite-dl-version;.tar.gz">
   <!ENTITY sqlite-download-ftp  " ">
-  <!ENTITY sqlite-md5sum        "a18bfc015cd49a1e7a961b7b77bc3b37">
-  <!ENTITY sqlite-size          "2.0 MB">
-  <!ENTITY sqlite-buildsize     "69 MB (with Optional Documentation)">
+  <!ENTITY sqlite-md5sum        "77b451925121028befbddbf45ea2bc49">
+  <!ENTITY sqlite-size          "2.1 MB">
+  <!ENTITY sqlite-buildsize     "70 MB (with Optional Documentation)">
   <!ENTITY sqlite-time          "0.3 SBU">
 
   <!ENTITY sqlite-docs-download "http://sqlite.org/2015/sqlite-doc-&sqlite-doc-version;.zip">
-  <!ENTITY sqlite-docs-md5sum   "59e10cdbacbda10469a7c57843d1ffdd">
+  <!ENTITY sqlite-docs-md5sum   "979a1601b700b4969914ee03dade41aa">
   <!ENTITY sqlite-docs-size     "4.9 MB">
 ]>
@@ -113,10 +113,4 @@
   <sect2 role="installation">
     <title>Installation of SQLite</title>
-
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
 
     <para>
@@ -137,5 +131,5 @@
             -DSQLITE_ENABLE_UNLOCK_NOTIFY=1       \
             -DSQLITE_SECURE_DELETE=1" &amp;&amp;
-make -j1</userinput></screen>
+make</userinput></screen>
 
     <para>
