diff --git a/Makefile b/Makefile
index a861994c2..e61f05d5e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ XSLROOTDIR=/usr/share/xml/docbook/xsl-stylesheets-1.69.1
 
 lfs:
 	xsltproc --xinclude --nonet -stringparam profile.condition html \
-	-stringparam chunk.quietly $(CHUNK_QUIET)  -stringparam base.dir $(BASEDIR)/ \
+	-stringparam chunk.quietly $(CHUNK_QUIET) -stringparam base.dir $(BASEDIR)/ \
 	stylesheets/lfs-chunked.xsl index.xml
 
 	if [ ! -e $(BASEDIR)/stylesheets ]; then \
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index df58d95fc..fe28cc68d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,9 @@
     <listitem>
       <para>May 25, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Updated to Vim-7.0. Fixes #1793.</para>
+        </listitem>
         <listitem>
           <para>[jhuntwork] - Fixed generation of diff's man page.
 	  Thanks Randy McMurchy for the report and Ken Moffat for the fix.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index deac055e1..7edce3ec0 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -252,6 +252,9 @@
     <listitem>
       <para>&udev-config;</para>
     </listitem>
+    <listitem>
+      <para>&vim-fixes-patch;</para>
+    </listitem>
   </itemizedlist>
 
   <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 2dc41d643..f4da82764 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -267,6 +267,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Vim Upstream Fixes Patch - <token>&vim-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&vim-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&vim-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 
   <para>Total size of these patches: about <returnvalue/></para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index ff6a68314..0d2310815 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -46,7 +46,12 @@
     <para>First, unpack both
     <filename>vim-&vim-version;.tar.bz2</filename> and (optionally)
     <filename>vim-&vim-version;-lang.tar.gz</filename> archives into the
-    same directory. Then, change the default location of the
+    same directory. Then, patch Vim with several fixes from upstream
+    developers since the initial release of Vim-&vim-version;:</para>
+
+<screen><userinput>patch -Np1 -i ../&vim-fixes-patch;</userinput></screen>
+
+    <para>Next, change the default location of the
     <filename>vimrc</filename> configuration file to <filename
     class="directory">/etc</filename>:</para>
 
diff --git a/packages.ent b/packages.ent
index 17e89c2f4..78a8bb197 100644
--- a/packages.ent
+++ b/packages.ent
@@ -506,18 +506,18 @@
 <!ENTITY util-linux-ch6-du "17.2 MB">
 <!ENTITY util-linux-ch6-sbu "0.2 SBU">
 
-<!ENTITY vim-version "6.4">
-<!ENTITY vim-size "3,650 KB">
+<!ENTITY vim-version "7.0">
+<!ENTITY vim-size "6,152 KB">
 <!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-md5 "774c14d93ce58674b3b2c880edd12d77">
+<!ENTITY vim-md5 "4ca69757678272f718b1041c810d82d8">
 <!ENTITY vim-home "http://www.vim.org">
 <!ENTITY vim-ch6-du "47.4 MB">
 <!ENTITY vim-ch6-sbu "0.4 SBU">
 <!ENTITY vim-lang-version "&vim-version;">
-<!ENTITY vim-lang-size "1,093 KB">
+<!ENTITY vim-lang-size "1,228 KB">
 <!ENTITY vim-lang-url "ftp://ftp.vim.org/pub/vim/extra/vim-&vim-lang-version;-lang.tar.gz">
-<!ENTITY vim-lang-md5 "3cca6128fe5439e89d3828b5e708bddb">
-<!ENTITY vim-lang-home " ">
+<!ENTITY vim-lang-md5 "6d43efaff570b5c86e76b833ea0c6a04">
+<!ENTITY vim-lang-home "http://www.vim.org">
 
 <!ENTITY zlib-version "1.2.3">
 <!ENTITY zlib-size "485 KB">
diff --git a/patches.ent b/patches.ent
index 169b2414b..06aab1c34 100644
--- a/patches.ent
+++ b/patches.ent
@@ -146,3 +146,7 @@
 <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
 <!ENTITY util-linux-cramfs-patch-md5 "1c3f40b30e12738eb7b66a35b7374572">
 <!ENTITY util-linux-cramfs-patch-size "2.8 KB">
+
+<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-3.patch">
+<!ENTITY vim-fixes-patch-md5 "ed158ebfb653b797b642fbff175addea">
+<!ENTITY vim-fixes-patch-size "18 KB">