diff --git a/general.ent b/general.ent
index 7ad0d6b738..02a4e0d3ce 100644
--- a/general.ent
+++ b/general.ent
@@ -190,7 +190,7 @@ $Date$
 <!ENTITY gperf-version                "3.0.3">
 
 <!-- Chapter 11 -->
-<!ENTITY gpm-version                  "1.20.5">
+<!ENTITY gpm-version                  "1.20.6">
 <!ENTITY fcron-version                "3.0.4">
 <!ENTITY hdparm-version               "9.6">
 <!ENTITY which-version                "2.20">
diff --git a/general/sysutils/gpm.xml b/general/sysutils/gpm.xml
index fa6a296cf0..0aa7de4d71 100644
--- a/general/sysutils/gpm.xml
+++ b/general/sysutils/gpm.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY gpm-download-http "http://unix.schottelius.org/gpm/archives/gpm-&gpm-version;.tar.bz2">
   <!ENTITY gpm-download-ftp  " ">
-  <!ENTITY gpm-md5sum        "e55473932e4052f3b74c730dfefe0d15">
+  <!ENTITY gpm-md5sum        "6b534da16dc1b28ba828dea89e520f6f">
   <!ENTITY gpm-size          "1.4 MB">
-  <!ENTITY gpm-buildsize     "10 MB">
+  <!ENTITY gpm-buildsize     "9 MB">
   <!ENTITY gpm-time          "0.1 SBU">
 ]>
 
@@ -90,27 +90,34 @@ make</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install &amp;&amp;
+<screen role="root"><userinput>make install                                                       &amp;&amp;
 
 install-info --dir-file=/usr/share/info/dir \
-             /usr/share/info/gpm.info &amp;&amp;
+             /usr/share/info/gpm.info                              &amp;&amp;
 
-ln -v -s libgpm.so.2.1.0 /usr/lib/libgpm.so &amp;&amp;
-install -v -m644 conf/gpm-root.conf /etc</userinput></screen>
+ln -v -s libgpm.so.2.1.0 /usr/lib/libgpm.so                        &amp;&amp;
+install -v -m644 conf/gpm-root.conf /etc                           &amp;&amp;
+
+install -v -m755 -d destdir/usr/share/doc/gpm-&gpm-version;               &amp;&amp;
+chmod   -v   755    doc/{changes,support}                          &amp;&amp; 
+chmod   -v   644    doc/{changes/*,support/*,FAQ,HACK_GPM,README*} &amp;&amp;
+cp      -v -R       doc/{FAQ,HACK_GPM,README*,changes,support} \
+                    /usr/share/doc/gpm-&gpm-version;</userinput></screen>
 
   </sect2>
 
-  <!-- <sect2 role="commands">
+  <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>LDFLAGS="-lm"</command>: The math library
-    must be linked with <command>gpm</command>, as ceil() is used in
-    some cursor scrolling logic.</para>
+    <para><command>install-info ...</command>: This package installs a
+    <filename class="extension">.info</filename> file, but does not update the
+    system <filename>dir</filename> file. This command makes the update.</para>
 
-    <para><command>ldconfig -n -l </command>: During installation, gpm outputs a
-message to run the above command to create the proper library links.</para>
+    <para><command>ln -v -s libgpm.so.2.1.0 /usr/lib/libgpm.so</command>: This
+    command is used to create the <filename class="extension">.so</filename>
+    symlink to the library.</para>
 
-  </sect2> -->
+  </sect2>
 
   <sect2 role="configuration">
     <title>Configuring GPM</title>
@@ -200,7 +207,7 @@ GPMOPTS=""</literal></screen>
         <seg>disable-paste, display-buttons, display-coords, get-versions, gpm,
         gpm-root, hltest, mev, and mouse-test</seg>
         <seg>libgpm.{so.a}</seg>
-        <seg>None</seg>
+        <seg>/usr/share/doc/gpm-&gpm-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index d1eb756848..24a2efb770 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,15 @@
 
 -->
 
+    <listitem>
+      <para>February 11th, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to GPM-1.20.6.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>February 9th, 2009</para>
       <itemizedlist>