diff --git a/general.ent b/general.ent
index c29dd92576..50d39c0ee0 100644
--- a/general.ent
+++ b/general.ent
@@ -366,7 +366,7 @@ export -f as_root</userinput></screen>
 <!ENTITY gcc-version                  "4.8.2">
 <!ENTITY gc-version                   "7.2d">
 <!ENTITY gdb-version                  "7.6.1">
-<!ENTITY git-version                  "1.8.4.1">
+<!ENTITY git-version                  "1.8.4.2">
 <!ENTITY guile-version                "2.0.9">
 <!ENTITY librep-version               "0.92.3">
 <!ENTITY llvm-version                 "3.3">
diff --git a/general/prog/git.xml b/general/prog/git.xml
index 5b1ab1ff5f..8a3479e424 100644
--- a/general/prog/git.xml
+++ b/general/prog/git.xml
@@ -6,10 +6,11 @@
 
   <!ENTITY git-download-http "http://git-core.googlecode.com/files/git-&git-version;.tar.gz">
   <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "5d8c89ad312ca0b0e603259c9357e6b8">
+  <!ENTITY git-md5sum        "6f63d103465b86ca0ebe4189ea54731c">
   <!ENTITY git-size          "4.5 MB">
-  <!ENTITY git-buildsize     "233 MB">
-  <!ENTITY git-time          "0.7 SBU (additional 2.8 SBU for tests)">
+  <!ENTITY git-buildsize     "207 MB">
+  <!ENTITY git-time          "0.7 SBU (additional 145 SBU for tests and 2.7
+                              SBU for docs and man creation)">
 ]>
 
 <sect1 id="git" xreflabel="git-&git-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index bd46171a8b..c1e7407423 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,10 @@
     <listitem>
       <para>October 29th, 2013</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to git-1.8.4.2. Fixes
+          <ulink url="&blfs-ticket-root;4238">#4238</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[igor] - Update to cups-1.7.0. Fixes
           <ulink url="&blfs-ticket-root;4225">#4225</ulink>.</para>