diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7158e4208..da2b79478 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2016-09-14</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.0. Fixes 
+          <ulink url="&lfs-ticket-root;3979">#3979</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2016-09-12</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ff51cdee0..89887fd4a 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -224,9 +224,9 @@
     <listitem>
       <para>Util-Linux &util-linux-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Vim &vim-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>XML-Parser-&xml-parser-version;</para>
     </listitem>-->
diff --git a/general.ent b/general.ent
index abe2fb686..2af3c938f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20160912">
+<!ENTITY version         "SVN-20160914">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20160912-systemd">
+<!ENTITY versiond        "20160914-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "September 12, 2016">
+<!ENTITY releasedate     "September 14, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.11">
 
diff --git a/packages.ent b/packages.ent
index ff7f59a9a..6f2bd9deb 100644
--- a/packages.ent
+++ b/packages.ent
@@ -616,11 +616,11 @@
 <!ENTITY util-linux-ch6-du "158 MB">
 <!ENTITY util-linux-ch6-sbu "1.0 SBU">
 
-<!ENTITY vim-version "7.4">
-<!ENTITY vim-docdir "vim/vim74">
-<!ENTITY vim-size "9,632 KB">
+<!ENTITY vim-version "8.0">
+<!ENTITY vim-docdir "vim/vim80">
+<!ENTITY vim-size "10,362 KB">
 <!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-md5 "607e135c559be642f210094ad023dc65">
+<!ENTITY vim-md5 "808d2ebdab521e18bc5e0eaede0db867">
 <!ENTITY vim-home "http://www.vim.org">
 <!ENTITY vim-ch6-du "109 MB">
 <!ENTITY vim-ch6-sbu "1.0 SBU">