Index: general.ent
===================================================================
--- general.ent	(revision 926d146d7c6aaf0c053cac1cad96984622f39698)
+++ general.ent	(revision 59e93110e40d55c1f5b186ec559fa2cf4166a8a9)
@@ -369,5 +369,5 @@
 <!ENTITY gc-version                   "7.4.0">
 <!ENTITY gdb-version                  "7.6.2">
-<!ENTITY git-version                  "1.8.5.2">
+<!ENTITY git-version                  "1.8.5.3">
 <!ENTITY guile-version                "2.0.9">
 <!ENTITY librep-version               "0.92.3">
@@ -448,5 +448,5 @@
 <!ENTITY nmap-version                 "6.40">
 <!ENTITY traceroute-version           "2.0.19">
-<!ENTITY whois-version                "5.1.0">
+<!ENTITY whois-version                "5.1.1">
 <!ENTITY wicd-version                 "1.7.2.4">
 <!ENTITY wireshark-version            "1.10.5">  <!-- even minors only -->
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 926d146d7c6aaf0c053cac1cad96984622f39698)
+++ general/prog/git.xml	(revision 59e93110e40d55c1f5b186ec559fa2cf4166a8a9)
@@ -7,9 +7,9 @@
   <!ENTITY git-download-http "http://git-core.googlecode.com/files/git-&git-version;.tar.gz">
   <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "df8519044f9880f3687d863d99245282">
+  <!ENTITY git-md5sum        "57b966065882f83ef5879620a1e329ca">
   <!ENTITY git-size          "4.6 MB">
-  <!ENTITY git-buildsize     "175 MB (additional 10 MB with downloaded docs and
-                              man pages, or 20 MB building docs and man pages)">
-  <!ENTITY git-time          "0.7 SBU (additional 8.7 SBU for tests and 2.7 SBU
+  <!ENTITY git-buildsize     "190 MB (additional 14 MB with downloaded docs and
+                              man pages, or 24 MB building docs and man pages)">
+  <!ENTITY git-time          "0.7 SBU (additional 8.4 SBU for tests and 2.6 SBU
                               for docs and man pages creation)">
 ]>
@@ -301,6 +301,8 @@
       <seglistitem>
         <seg>
-          git, git-cvsserver, gitk, git-receive-pack, git-shell,
-          git-upload-archive and git-upload-pack
+          git, git-receive-pack and git-upload-archive
+          (hardlinked to each other);
+          git-shell, git-cvsserver, git-upload-pack and
+          gitk (this one is optional)
         </seg>
         <seg>
@@ -312,5 +314,5 @@
           /usr/share/git-core,
           /usr/share/git-gui,
-          /usr/share/gitk,
+          /usr/share/gitk (optional),
           /usr/share/gitweb,
           /usr/lib/perl5/site_perl/&lt;5.x.y&gt;/Git and
@@ -353,6 +355,6 @@
         <listitem>
           <para>
-            is a graphical <application>Git</application> repository browser
-            (needs <xref linkend="tk"/>).
+            (optional) is a graphical <application>Git</application> repository
+            browser (needs <xref linkend="tk"/>).
           </para>
           <indexterm zone="git gitk">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 926d146d7c6aaf0c053cac1cad96984622f39698)
+++ introduction/welcome/changelog.xml	(revision 59e93110e40d55c1f5b186ec559fa2cf4166a8a9)
@@ -48,4 +48,12 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Update to whois 5.1.1. Fixes
+          <ulink url="&blfs-ticket-root;4573">#4573</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to Git-1.8.5.3. Fixes
+          <ulink url="&blfs-ticket-root;4562">#4562</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Update to GnuTLS 3.2.8.1. Fixes
           <ulink url="&blfs-ticket-root;4566">#4566</ulink>.</para>
Index: networking/netutils/whois.xml
===================================================================
--- networking/netutils/whois.xml	(revision 926d146d7c6aaf0c053cac1cad96984622f39698)
+++ networking/netutils/whois.xml	(revision 59e93110e40d55c1f5b186ec559fa2cf4166a8a9)
@@ -7,6 +7,6 @@
   <!ENTITY whois-download-http "http://ftp.debian.org/debian/pool/main/w/whois/whois_&whois-version;.tar.xz">
   <!ENTITY whois-download-ftp  "ftp://ftp.debian.org/debian/pool/main/w/whois/whois_&whois-version;.tar.xz">
-  <!ENTITY whois-md5sum        "e16cc6ca56a6834ab60ace26215d6b0c">
-  <!ENTITY whois-size          "72 KB">
+  <!ENTITY whois-md5sum        "aa4561134a03e22e2d759748ca676a97">
+  <!ENTITY whois-size          "76 KB">
   <!ENTITY whois-buildsize     "1.4 MB">
   <!ENTITY whois-time          "less than 0.1 SBU">
