Index: BOOK/final-system/common/gmp.xml
===================================================================
--- BOOK/final-system/common/gmp.xml	(revision 37dd4bdfa15994f31bc898ad8001a50d634e34cf)
+++ BOOK/final-system/common/gmp.xml	(revision 4c682912a191085f844699198ec7c93ad707fba9)
@@ -51,5 +51,6 @@
 CXX="g++ -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr --enable-cxx</userinput></screen>
+  ./configure --prefix=/usr --enable-cxx \
+  --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -57,22 +58,24 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <important os="e">
+    <para os="e">Build the HTML documentation:</para>
+
+<screen os="f"><userinput>make html</userinput></screen>
+
+    <important os="g">
       <para>The test suite for GMP is considered
       critical. Do not skip it under any circumstance.</para>
     </important>
 
-    <para os="f">Test the results:</para>
+    <para os="h">Test the results:</para>
 
-<screen os="g"><userinput remap="test">make check</userinput></screen>
+<screen os="i"><userinput remap="test">make check</userinput></screen>
 
-    <para os="h">Install the package:</para>
+    <para os="j">Install the package:</para>
 
-<screen os="i"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make install</userinput></screen>
 
-    <para os="j">Install the documentation:</para>
+    <para os="l">Install the documentation:</para>
 
-<screen os="k"><userinput>mkdir -v /usr/share/doc/gmp-&gmp-version;
-cp -v doc/{isa_abi_headache,configuration} doc/*.html \
-    /usr/share/doc/gmp-&gmp-version;</userinput></screen>
+<screen os="m"><userinput>make install-html</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/mips64/gmp-64bit.xml
===================================================================
--- BOOK/final-system/mips64/gmp-64bit.xml	(revision 37dd4bdfa15994f31bc898ad8001a50d634e34cf)
+++ BOOK/final-system/mips64/gmp-64bit.xml	(revision 4c682912a191085f844699198ec7c93ad707fba9)
@@ -74,14 +74,30 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gmp-64bit.xml"
+    href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gmp-64bit.xml"
+    href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/gmp-64bit.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/gmp-64bit.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/gmp-64bit.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
 
 <screen os="m"><userinput>cat &gt; /usr/include/gmp.h &lt;&lt; "EOF"
Index: BOOK/final-system/multilib/gmp-64bit.xml
===================================================================
--- BOOK/final-system/multilib/gmp-64bit.xml	(revision 37dd4bdfa15994f31bc898ad8001a50d634e34cf)
+++ BOOK/final-system/multilib/gmp-64bit.xml	(revision 4c682912a191085f844699198ec7c93ad707fba9)
@@ -44,5 +44,6 @@
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
   ./configure --prefix=/usr \
-    --libdir=/usr/lib64 --enable-cxx</userinput></screen>
+    --libdir=/usr/lib64 --enable-cxx \
+    --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -82,11 +83,19 @@
     xpointer="xpointer(//*[@os='k'])"/>
 
-    <para os="j">Create the 64bit header file:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-    <para os="l">Finally, create a stub header in the place of the originals:</para>
+    <para os="n">Create the 64bit header file:</para>
 
-<screen os="m"><userinput>cat &gt; /usr/include/gmp.h &lt;&lt; "EOF"
+<screen os="o"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
+
+    <para os="p">Finally, create a stub header in the place of the originals:</para>
+
+<screen os="q"><userinput>cat &gt; /usr/include/gmp.h &lt;&lt; "EOF"
 /* gmp.h - Stub Header  */
 #ifndef __STUB__GMP_H__
Index: BOOK/final-system/multilib/gmp-n32.xml
===================================================================
--- BOOK/final-system/multilib/gmp-n32.xml	(revision 37dd4bdfa15994f31bc898ad8001a50d634e34cf)
+++ BOOK/final-system/multilib/gmp-n32.xml	(revision 4c682912a191085f844699198ec7c93ad707fba9)
@@ -58,12 +58,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -76,7 +68,15 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <para os="j">Create the N32 header file:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <para os="l">Create the N32 header file:</para>
+
+<screen os="m"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/gmp.xml
===================================================================
--- BOOK/final-system/multilib/gmp.xml	(revision 37dd4bdfa15994f31bc898ad8001a50d634e34cf)
+++ BOOK/final-system/multilib/gmp.xml	(revision 4c682912a191085f844699198ec7c93ad707fba9)
@@ -56,12 +56,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -74,7 +66,15 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <para os="j">The header installed by GMP is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of GMP. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <para os="l">The header installed by GMP is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of GMP. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
+
+<screen os="m"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
 
   </sect2>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 37dd4bdfa15994f31bc898ad8001a50d634e34cf)
+++ BOOK/introduction/common/changelog.xml	(revision 4c682912a191085f844699198ec7c93ad707fba9)
@@ -48,4 +48,8 @@
           <para>[William Harrington] - Add Linux sublevel patch.</para>
         </listitem>
+        <listitem>
+          <para>[Chris] - Changed GMP documentation installation instructions
+          to use the Makefile to install docs instead of doing so manually.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
