diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 82c5d2674..db8833af9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,9 @@
     <listitem>
       <para>April 13, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[archaic] - Added symlink from vim.1 to vi.1.</para>
+        </listitem>
         <listitem>
           <para>[archaic] - Added chgpasswd to the list of installed files for
           Shadow.</para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 08e2d3661..8d1ded1fc 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -109,9 +109,10 @@ rm -f /usr/share/vim/vim64/tutor/tutor.??.*</userinput></screen>
     <para>Many users are used to using <command>vi</command> instead of
     <command>vim</command>. To allow execution of <command>vim</command>
     when users habitually enter <command>vi</command>, create a
-    symlink:</para>
+    symlink for both the binary and the man-page:</para>
 
-<screen><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
+<screen><userinput>ln -sv vim /usr/bin/vi
+ln -sv vim.1 /usr/share/man/man1/vi.1</userinput></screen>
 
     <para>By default, Vim's documentation is installed in <filename
     class="directory">/usr/share/vim</filename>. The following symlink