Index: general.ent
===================================================================
--- general.ent	(revision 8f0c312939a1a84c7f1a82ffeafbc4fbdf2412a6)
+++ general.ent	(revision 9a9d63d40db17f9477f6858094370a0e89759cbc)
@@ -187,5 +187,5 @@
 
 <!-- Chapter 11 -->
-<!ENTITY gpm-version                  "1.20.1">
+<!ENTITY gpm-version                  "1.20.5">
 <!ENTITY fcron-version                "3.0.4">
 <!ENTITY hdparm-version               "7.7">
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision 8f0c312939a1a84c7f1a82ffeafbc4fbdf2412a6)
+++ general/sysutils/gpm.xml	(revision 9a9d63d40db17f9477f6858094370a0e89759cbc)
@@ -5,21 +5,9 @@
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY gpm-download-http "http://ftp.schottelius.org/pub/linux/gpm/gpm-&gpm-version;.tar.bz2">
-  <!ENTITY gpm-download-ftp  "&gentoo-ftp-repo;/gpm-&gpm-version;.tar.bz2">
-  <!ENTITY gpm-md5sum        "2c63e827d755527950d9d13fe3d87692">
-  <!ENTITY gpm-size          "556 KB">
-  <!ENTITY gpm-buildsize     "6.7 MB">
+  <!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-size          "1.4 MB">
+  <!ENTITY gpm-buildsize     "10 MB">
   <!ENTITY gpm-time          "0.1 SBU">
 ]>
@@ -73,5 +61,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
@@ -83,5 +71,5 @@
         url="&patch-root;/gpm-&gpm-version;-silent-1.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <para condition="html" role="usernotes">User Notes:
@@ -96,18 +84,19 @@
     the following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../gpm-&gpm-version;-segfault-1.patch &amp;&amp;
-patch -Np1 -i ../gpm-&gpm-version;-silent-1.patch &amp;&amp;
-./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-LDFLAGS="-lm" make</userinput></screen>
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &amp;&amp;
-cp -v conf/gpm-root.conf /etc &amp;&amp;
-ldconfig</userinput></screen>
+
+ln -v -s libgpm.so.2.1.0 /usr/lib/libgpm.so &amp;&amp;
+install -v -m644 conf/gpm-root.conf /etc</userinput></screen>
 
   </sect2>
 
-  <sect2 role="commands">
+  <!-- <sect2 role="commands">
     <title>Command Explanations</title>
 
@@ -116,8 +105,8 @@
     some cursor scrolling logic.</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> -->
-
-  </sect2>
+    <para><command>ldconfig -n -l </command>: During installation, gpm outputs a
+message to run the above command to create the proper library links.</para>
+
+  </sect2> -->
 
   <sect2 role="configuration">
@@ -206,5 +195,6 @@
 
       <seglistitem>
-        <seg>disable-paste, gpm, gpm-root, hltest, mev, and mouse-test</seg>
+        <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>
@@ -227,4 +217,36 @@
       </varlistentry>
 
+      <varlistentry id="display-buttons">
+        <term><command>display-buttons</command></term>
+        <listitem>
+          <para>is a simple program that reports the mouse buttons being
+          pressed and released.</para>
+          <indexterm zone="gpm display-buttons">
+            <primary sortas="b-display-buttons">display-buttons</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="display-coords">
+        <term><command>display-coords</command></term>
+        <listitem>
+          <para>is a simple program that reports the mouse coordinates.</para>
+          <indexterm zone="gpm display-coords">
+            <primary sortas="b-display-coords">display-coords</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="get-versions">
+        <term><command>get-versions</command></term>
+        <listitem>
+          <para>is used to report the <application>GPM</application> library
+          and server versions.</para>
+          <indexterm zone="gpm get-versions">
+            <primary sortas="b-get-versions">get-versions</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="gpm-prog">
         <term><command>gpm</command></term>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 8f0c312939a1a84c7f1a82ffeafbc4fbdf2412a6)
+++ introduction/welcome/changelog.xml	(revision 9a9d63d40db17f9477f6858094370a0e89759cbc)
@@ -45,4 +45,7 @@
       <para>October 13th, 2008</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to GPM-1.20.5.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated all the LFS package versions (in the book
