diff -Naur -- 02-patched/BOOK/general.ent 03-working/BOOK/general.ent
--- 02-patched/BOOK/general.ent	2007-08-13 01:29:41.000000000 +0100
+++ 03-working/BOOK/general.ent	2007-08-15 21:59:27.000000000 +0100
@@ -82,7 +82,7 @@
 
 <!-- Chapter 6 -->
 <!ENTITY vim-version                  "7.1">
-<!ENTITY emacs-version                "21.4a">
+<!ENTITY emacs-version                "22.1">
 <!ENTITY nano-version                 "2.0.1">
 <!ENTITY joe-version                  "3.5">
 <!ENTITY ed-version                   "0.2">
diff -Naur -- 02-patched/BOOK/postlfs/editors/emacs.xml 03-working/BOOK/postlfs/editors/emacs.xml
--- 02-patched/BOOK/postlfs/editors/emacs.xml	2007-08-12 15:34:20.000000000 +0100
+++ 03-working/BOOK/postlfs/editors/emacs.xml	2007-08-16 19:57:51.000000000 +0100
@@ -6,10 +6,10 @@
 
   <!ENTITY emacs-download-http "http://ftp.gnu.org/pub/gnu/emacs/emacs-&emacs-version;.tar.gz">
   <!ENTITY emacs-download-ftp  "ftp://ftp.gnu.org/pub/gnu/emacs/emacs-&emacs-version;.tar.gz">
-  <!ENTITY emacs-md5sum        "8f9d97cbd126121bd5d97e5e31168a87">
-  <!ENTITY emacs-size          "20.4 MB">
-  <!ENTITY emacs-buildsize     "96.8 MB">
-  <!ENTITY emacs-time          "4.2 SBU">
+  <!ENTITY emacs-md5sum        "6949df37caec2d7a2e0eee3f1b422726">
+  <!ENTITY emacs-size          "36.4 MB">
+  <!ENTITY emacs-buildsize     "260 MB">
+  <!ENTITY emacs-time          "3.3 SBU">
 ]>
 
 <sect1 id="emacs" xreflabel="Emacs-&emacs-version;">
@@ -54,14 +54,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/emacs-&emacs-version;-altgr-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Emacs Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -82,23 +74,18 @@
   <sect2 role="installation">
     <title>Installation of Emacs</title>
 
-    <para>In some circumstances, the AltGr modifier key present on some
-    keyboards is not recognized. Ensure that it is by applying the
-    following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../emacs-&emacs-version;-altgr-1.patch</userinput></screen>
-
     <para>Install <application>Emacs</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib --localstatedir=/var &amp;&amp;
 make bootstrap</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</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+chown -v -R root:root /usr/share/emacs/&emacs-version;</userinput></screen>
 
   </sect2>
 
@@ -108,6 +95,11 @@
     <para><option>--libexecdir=/usr/lib</option>: Place library
     executables in a Filesystem Hierarchy Standard (FHS) location.</para>
 
+    <para><option>--localstatedir=/var</option>: Create game
+    score files
+    in <filename class='directory'>/var/games/emacs</filename> instead
+    of <filename class='directory'>/usr/var/games/emacs</filename>.</para>
+
   </sect2>
 
   <sect2 role="content">
@@ -122,7 +114,7 @@
         <seg>b2m, ctags, ebrowse, emacs, emacsclient, etags, grep-changelog,
         and rcs-checkin</seg>
         <seg>None</seg>
-        <seg>/usr/lib/emacs and /usr/share/emacs</seg>
+        <seg>/usr/lib/emacs, /usr/share/emacs and /var/games/emacs</seg>
       </seglistitem>
     </segmentedlist>