Index: general.ent
===================================================================
--- general.ent	(revision 52cc64ddc113cd3ba24cf62ace0e90ad432bb14a)
+++ general.ent	(revision bb7f58ecda88115a7c08c8979a669fc667ad6997)
@@ -541,9 +541,9 @@
 <!ENTITY libXdmcp-version             "1.1.1">
 <!ENTITY libpthread-stubs-version     "0.3">
-<!ENTITY xcb-proto-version            "1.7.1">
-<!ENTITY libxcb-version               "1.8.1">
+<!ENTITY xcb-proto-version            "1.8">
+<!ENTITY libxcb-version               "1.9">
 <!ENTITY xbitmaps-version             "1.1.1">
 <!ENTITY xcursor-themes-version       "1.0.3">
-<!ENTITY xkeyboard-config-version     "2.6">
+<!ENTITY xkeyboard-config-version     "2.7">
 <!ENTITY mesalib-version              "9.0.1">
 <!ENTITY glu-version                  "9.0.0">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 52cc64ddc113cd3ba24cf62ace0e90ad432bb14a)
+++ introduction/welcome/changelog.xml	(revision bb7f58ecda88115a7c08c8979a669fc667ad6997)
@@ -133,4 +133,15 @@
         <listitem>
           <para>[krejzi] - Poppler 0.22.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - XKeyboard Config 2.7.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Updated XCB Proto and libxcb to latest available
+          versions.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Updated Xorg Protocol Headers and Libraries to
+          latest available versions.</para>
         </listitem>
         <listitem>
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 52cc64ddc113cd3ba24cf62ace0e90ad432bb14a)
+++ x/installing/installing.xml	(revision bb7f58ecda88115a7c08c8979a669fc667ad6997)
@@ -68,8 +68,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7font.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="printproto.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="twm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xterm.xml"/>
Index: x/installing/libxcb.xml
===================================================================
--- x/installing/libxcb.xml	(revision 52cc64ddc113cd3ba24cf62ace0e90ad432bb14a)
+++ x/installing/libxcb.xml	(revision bb7f58ecda88115a7c08c8979a669fc667ad6997)
@@ -7,8 +7,7 @@
   <!ENTITY libxcb-download-http "http://xcb.freedesktop.org/dist/libxcb-&libxcb-version;.tar.bz2">
   <!ENTITY libxcb-download-ftp  " ">
-  <!-- <!ENTITY libxcb-download-ftp  "ftp://ftp.x.org/pub/current/src/extras/libxcb-&libxcb-version;.tar.bz2"> -->
-  <!ENTITY libxcb-md5sum        "9da03df9e2f4c048202920d9f6a7e123">
-  <!ENTITY libxcb-size          "367 KB">
-  <!ENTITY libxcb-buildsize     "22 MB">
+  <!ENTITY libxcb-md5sum        "2b05856e9d1cb37836aae7406f2f4ce2">
+  <!ENTITY libxcb-size          "380 KB">
+  <!ENTITY libxcb-buildsize     "40 MB">
   <!ENTITY libxcb-time          "0.3 SBU">
 ]>
@@ -88,5 +87,5 @@
     commands:</para>
 
-<screen><userinput>./configure $XORG_CONFIG --docdir='${datadir}'/doc/libxcb-&libxcb-version; &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG --enable-xinput --docdir='${datadir}'/doc/libxcb-&libxcb-version; &amp;&amp;
 make</userinput></screen>
 
@@ -101,4 +100,7 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para><option>--enable-xinput</option>: This switch enables XCB Xinput
+    extension.</para>
 
     <para><parameter>--docdir='${datadir}'/doc/libxcb-&libxcb-version;</parameter>:
@@ -149,5 +151,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libxcb.{so,a} and libxcb-*.{so,a}</seg>
+        <seg>libxcb.so and libxcb-*.so</seg>
         <seg><envar>$XORG_PREFIX</envar>/include/xcb and
         <envar>$XORG_PREFIX</envar>/share/doc/libxcb-&libxcb-version;</seg>
@@ -161,9 +163,9 @@
 
       <varlistentry id="libxcb-lib">
-        <term><filename class='libraryfile'>libxcb.{so,a}</filename></term>
+        <term><filename class="libraryfile">libxcb.so</filename></term>
         <listitem>
           <para>is an interface to the X Window System protocol.</para>
           <indexterm zone="libxcb libxcb-lib">
-            <primary sortas="c-libxcb">libxcb.{so,a}</primary>
+            <primary sortas="c-libxcb">libxcb.so</primary>
           </indexterm>
         </listitem>
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision 52cc64ddc113cd3ba24cf62ace0e90ad432bb14a)
+++ x/installing/x7lib.xml	(revision bb7f58ecda88115a7c08c8979a669fc667ad6997)
@@ -8,100 +8,99 @@
   <!ENTITY x7libs-download-ftp  "ftp://ftp.x.org/pub/individual/lib/">
   <!ENTITY x7libs-size          "12.1 MB">
-  <!ENTITY x7libs-buildsize     "327 MB">
+  <!ENTITY x7libs-buildsize     "280 MB">
   <!ENTITY x7libs-time          "3.7 SBU">
+
+  <!ENTITY xtrans-version                  "1.2.7">
+  <!ENTITY xtrans-md5sum                   "84c66908cf003ad8c272b0eecbdbaee3">
+
+  <!ENTITY libX11-version                  "1.5.0">
+  <!ENTITY libX11-md5sum                   "78b4b3bab4acbdf0abcfca30a8c70cc6">
+
+  <!ENTITY libXext-version                 "1.3.1">
+  <!ENTITY libXext-md5sum                  "71251a22bc47068d60a95f50ed2ec3cf">
+
+  <!ENTITY libFS-version                   "1.0.4">
+  <!ENTITY libFS-md5sum                    "645f83160cf7b562734e2038045106d1">
+
+  <!ENTITY libICE-version                  "1.0.8">
+  <!ENTITY libICE-md5sum                   "471b5ca9f5562ac0d6eac7a0bf650738">
+
+  <!ENTITY libSM-version                   "1.2.1">
+  <!ENTITY libSM-md5sum                    "766de9d1e1ecf8bf74cebe2111d8e2bd">
+
+  <!ENTITY libXScrnSaver-version           "1.2.2">
+  <!ENTITY libXScrnSaver-md5sum            "7a773b16165e39e938650bcc9027c1d5">
+
+  <!ENTITY libXt-version                   "1.1.3">
+  <!ENTITY libXt-md5sum                    "a6f137ae100e74ebe3b71eb4a38c40b3">
+
+  <!ENTITY libXmu-version                  "1.1.1">
+  <!ENTITY libXmu-md5sum                   "a4efff8de85bd45dd3da124285d10c00">
+
+  <!ENTITY libXpm-version                  "3.5.10">
+  <!ENTITY libXpm-md5sum                   "7ae7eff7a14d411e84a67bd166bcec1a">
+
+  <!ENTITY libXaw-version                  "1.0.11">
+  <!ENTITY libXaw-md5sum                   "f39942f2cab379fc9b4c3731bf191b84">
+
+  <!ENTITY libXfixes-version               "5.0">
+  <!ENTITY libXfixes-md5sum                "678071bd7f9f7467e2fc712d81022318">
+
+  <!ENTITY libXcomposite-version           "0.4.3">
+  <!ENTITY libXcomposite-md5sum            "a60e0b5c276d0aa9e2d3b982c98f61c8">
+
+  <!ENTITY libXrender-version              "0.9.7">
+  <!ENTITY libXrender-md5sum               "ee62f4c7f0f16ced4da63308963ccad2">
+
+  <!ENTITY libXcursor-version              "1.1.13">
+  <!ENTITY libXcursor-md5sum               "52efa81b7f26c8eda13510a2fba98eea">
+
+  <!ENTITY libXdamage-version              "1.1.3">
+  <!ENTITY libXdamage-md5sum               "44774e1a065158b52f1a0da5100cebec">
+
+  <!ENTITY libfontenc-version              "1.1.1">
+  <!ENTITY libfontenc-md5sum               "a2a861f142c3b4367f14fc14239fc1f7">
+
+  <!ENTITY libXfont-version                "1.4.5">
+  <!ENTITY libXfont-md5sum                 "6851da5dae0a6cf5f7c9b9e2b05dd3b4">
+
+  <!ENTITY libXft-version                  "2.3.1">
+  <!ENTITY libXft-md5sum                   "78d64dece560c9e8699199f3faa521c0">
+
+  <!ENTITY libXi-version                   "1.6.1">
+  <!ENTITY libXi-md5sum                    "78ee882e1ff3b192cf54070bdb19938e">
+
+  <!ENTITY libXinerama-version             "1.1.2">
+  <!ENTITY libXinerama-md5sum              "cb45d6672c93a608f003b6404f1dd462">
+
+  <!ENTITY libXrandr-version               "1.4.0">
+  <!ENTITY libXrandr-md5sum                "0c843636124cc1494e3d87df16957672">
+
+  <!ENTITY libXres-version                 "1.0.6">
+  <!ENTITY libXres-md5sum                  "80d0c6d8522fa7a645e4f522e9a9cd20">
+
+  <!ENTITY libXtst-version                 "1.2.1">
+  <!ENTITY libXtst-md5sum                  "e8abc5c00c666f551cf26aa53819d592">
+
+  <!ENTITY libXv-version                   "1.0.7">
+  <!ENTITY libXv-md5sum                    "5e1ac203ccd3ce3e89755ed1fbe75b0b">
+
+  <!ENTITY libXvMC-version                 "1.0.7">
+  <!ENTITY libXvMC-md5sum                  "3340c99ff556ea2457b4be47f5cb96fa">
+
+  <!ENTITY libXxf86dga-version             "1.1.3">
+  <!ENTITY libXxf86dga-md5sum              "b7f38465c46e7145782d37dbb9da8c09">
+
+  <!ENTITY libXxf86vm-version              "1.1.2">
+  <!ENTITY libXxf86vm-md5sum               "ffd93bcedd8b2b5aeabf184e7b91f326">
 
   <!ENTITY libdmx-version                  "1.1.2">
   <!ENTITY libdmx-md5sum                   "782ced3a9e754dfeb53a8a006a75eb1a">
 
-  <!ENTITY libfontenc-version              "1.1.1">
-  <!ENTITY libfontenc-md5sum               "a2a861f142c3b4367f14fc14239fc1f7">
-
-  <!ENTITY libFS-version                   "1.0.4">
-  <!ENTITY libFS-md5sum                    "645f83160cf7b562734e2038045106d1">
-
-  <!ENTITY libICE-version                  "1.0.8">
-  <!ENTITY libICE-md5sum                   "471b5ca9f5562ac0d6eac7a0bf650738">
-
   <!ENTITY libpciaccess-version            "0.13.1">
   <!ENTITY libpciaccess-md5sum             "399a419ac6a54f0fc07c69c9bdf452dc">
 
-  <!ENTITY libSM-version                   "1.2.1">
-  <!ENTITY libSM-md5sum                    "766de9d1e1ecf8bf74cebe2111d8e2bd">
-
-  <!ENTITY libX11-version                  "1.5.0">
-  <!ENTITY libX11-md5sum                   "78b4b3bab4acbdf0abcfca30a8c70cc6">
-
-  <!ENTITY libXaw-version                  "1.0.11">
-  <!ENTITY libXaw-md5sum                   "f39942f2cab379fc9b4c3731bf191b84">
-
-  <!ENTITY libXcomposite-version           "0.4.3">
-  <!ENTITY libXcomposite-md5sum            "a60e0b5c276d0aa9e2d3b982c98f61c8">
-
-  <!ENTITY libXcursor-version              "1.1.13">
-  <!ENTITY libXcursor-md5sum               "52efa81b7f26c8eda13510a2fba98eea">
-
-  <!ENTITY libXdamage-version              "1.1.3">
-  <!ENTITY libXdamage-md5sum               "44774e1a065158b52f1a0da5100cebec">
-
-  <!ENTITY libXext-version                 "1.3.1">
-  <!ENTITY libXext-md5sum                  "71251a22bc47068d60a95f50ed2ec3cf">
-
-  <!ENTITY libXfixes-version               "5.0">
-  <!ENTITY libXfixes-md5sum                "678071bd7f9f7467e2fc712d81022318">
-
-  <!ENTITY libXfont-version                "1.4.5">
-  <!ENTITY libXfont-md5sum                 "6851da5dae0a6cf5f7c9b9e2b05dd3b4">
-
-  <!ENTITY libXft-version                  "2.3.1">
-  <!ENTITY libXft-md5sum                   "78d64dece560c9e8699199f3faa521c0">
-
-  <!ENTITY libXi-version                   "1.6.1">
-  <!ENTITY libXi-md5sum                    "78ee882e1ff3b192cf54070bdb19938e">
-
-  <!ENTITY libXinerama-version             "1.1.2">
-  <!ENTITY libXinerama-md5sum              "cb45d6672c93a608f003b6404f1dd462">
-
   <!ENTITY libxkbfile-version              "1.0.8">
   <!ENTITY libxkbfile-md5sum               "19e6533ae64abba0773816a23f2b9507">
-
-  <!ENTITY libXmu-version                  "1.1.1">
-  <!ENTITY libXmu-md5sum                   "a4efff8de85bd45dd3da124285d10c00">
-
-  <!ENTITY libXpm-version                  "3.5.10">
-  <!ENTITY libXpm-md5sum                   "7ae7eff7a14d411e84a67bd166bcec1a">
-
-  <!ENTITY libXrandr-version               "1.3.2">
-  <!ENTITY libXrandr-md5sum                "92473da2fccf5fac665be4fa4f2037fa">
-
-  <!ENTITY libXrender-version              "0.9.7">
-  <!ENTITY libXrender-md5sum               "ee62f4c7f0f16ced4da63308963ccad2">
-
-  <!ENTITY libXres-version                 "1.0.6">
-  <!ENTITY libXres-md5sum                  "80d0c6d8522fa7a645e4f522e9a9cd20">
-
-  <!ENTITY libXScrnSaver-version           "1.2.2">
-  <!ENTITY libXScrnSaver-md5sum            "7a773b16165e39e938650bcc9027c1d5">
-
-  <!ENTITY libXt-version                   "1.1.3">
-  <!ENTITY libXt-md5sum                    "a6f137ae100e74ebe3b71eb4a38c40b3">
-
-  <!ENTITY libXtst-version                 "1.2.1">
-  <!ENTITY libXtst-md5sum                  "e8abc5c00c666f551cf26aa53819d592">
-
-  <!ENTITY libXv-version                   "1.0.7">
-  <!ENTITY libXv-md5sum                    "5e1ac203ccd3ce3e89755ed1fbe75b0b">
-
-  <!ENTITY libXvMC-version                 "1.0.7">
-  <!ENTITY libXvMC-md5sum                  "3340c99ff556ea2457b4be47f5cb96fa">
-
-  <!ENTITY libXxf86dga-version             "1.1.3">
-  <!ENTITY libXxf86dga-md5sum              "b7f38465c46e7145782d37dbb9da8c09">
-
-  <!ENTITY libXxf86vm-version              "1.1.2">
-  <!ENTITY libXxf86vm-md5sum               "ffd93bcedd8b2b5aeabf184e7b91f326">
-
-  <!ENTITY xtrans-version                  "1.2.7">
-  <!ENTITY xtrans-md5sum                   "84c66908cf003ad8c272b0eecbdbaee3">
-
 ]>
 
@@ -242,5 +241,5 @@
     libXt-[0-9]* )
       ./configure $XORG_CONFIG \
-        --with-appdefaultdir=/etc/X11/app-defaults
+                  --with-appdefaultdir=/etc/X11/app-defaults
     ;;
     * )
@@ -285,6 +284,5 @@
 
 <screen role="root"><userinput>ln -sv $XORG_PREFIX/lib/X11 /usr/lib/X11 &amp;&amp;
-ln -sv $XORG_PREFIX/include/X11 /usr/include/X11 &amp;&amp;
-ln -sv $XORG_PREFIX /usr/X11R6</userinput></screen>
+ln -sv $XORG_PREFIX/include/X11 /usr/include/X11</userinput></screen>
 
   </sect2>
@@ -299,17 +297,35 @@
 
       <seglistitem>
-        <seg>cxpm, sxpm, xft-config</seg>
-        <seg>libdmx.{so,a}, libfontenc.{so,a},
-        libFS.{so,a}, libICE.{so,a}, libpciaccess.{so,a}, libSM.{so,a},
-        libX11.{so,a}, libXaw6.{so,a}, libXaw7.{so,a},
-        libXaw.{so,a}, libXcomposite.{so,a}, libXcursor.{so,a},
-        libXdamage.{so,a}, libXext.{so,a}, libXfixes.{so,a},
-        libXfont.{so,a}, libXft.{so,a}, libXinerama.{so,a}, libXi.{so,a},
-        libxkbfile.{so,a}, libXmu.{so,a}, libXmuu.{so,a},
-        libXpm.{so,a}, libXrandr.{so,a}, libXrender.{so,a}, libXRes.{so,a},
-        libXss.{so,a}, libXt.{so,a}, libXtst.{so,a}, libXvMC.{so,a},
-        libXvMCW.{so,a}, libXv.{so,a}, libXxf86dga.{so,a}, and
-        libXxf86vm.{so,a}</seg>
-        <seg>None</seg>
+        <seg>
+          cxpm and sxpm
+        </seg>
+        <seg>
+          libdmx.so, libfontenc.so, libFS.so, libICE.so,
+          libpciaccess.so, libSM.so, libX11.so, libXaw6.so,
+          libXaw7.so, libXaw.so, libXcomposite.so,
+          libXcursor.so, libXdamage.so, libXext.so,
+          libXfixes.so, libXfont.so, libXft.so, libXinerama.so,
+          libXi.so, libxkbfile.so, libXmu.so, libXmuu.so,
+          libXpm.so, libXrandr.so, libXrender.so, libXRes.so,
+          libXss.so, libXt.so, libXtst.so, libXvMC.so,
+          libXvMCW.so, libXv.so, libXxf86dga.so and
+          libXxf86vm.so
+        </seg>
+        <seg>
+          <envar>$XORG_PREFIX</envar>/share/doc/libFS,
+          <envar>$XORG_PREFIX</envar>/share/doc/libICE,
+          <envar>$XORG_PREFIX</envar>/share/doc/libSM,
+          <envar>$XORG_PREFIX</envar>/share/doc/libX11,
+          <envar>$XORG_PREFIX</envar>/share/doc/libXaw,
+          <envar>$XORG_PREFIX</envar>/share/doc/libXext,
+          <envar>$XORG_PREFIX</envar>/share/doc/libXi,
+          <envar>$XORG_PREFIX</envar>/share/doc/libXmu,
+          <envar>$XORG_PREFIX</envar>/share/doc/libXrender,
+          <envar>$XORG_PREFIX</envar>/share/doc/libXt,
+          <envar>$XORG_PREFIX</envar>/share/doc/libXtst,
+          <envar>$XORG_PREFIX</envar>/share/doc/libXvMC,
+          <envar>$XORG_PREFIX</envar>/share/doc/xtrans and
+          <envar>$XORG_PREFIX</envar>/share/X11/locale
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -320,9 +336,9 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="cxpm-x7">
+      <varlistentry id="cxpm">
         <term><command>cxpm</command></term>
         <listitem>
           <para>checks the format of an XPM file.</para>
-          <indexterm zone="xorg7-lib cxpm-x7">
+          <indexterm zone="xorg7-lib cxpm">
             <primary sortas="b-cxpm">cxpm</primary>
           </indexterm>
@@ -330,10 +346,10 @@
       </varlistentry>
 
-      <varlistentry id="sxpm-x7">
+      <varlistentry id="sxpm">
         <term><command>sxpm</command></term>
         <listitem>
           <para>shows an XPM file and/or converts XPM 1 or 2 files to
           XPM 3.</para>
-          <indexterm zone="xorg7-lib sxpm-x7">
+          <indexterm zone="xorg7-lib sxpm">
             <primary sortas="b-sxpm">sxpm</primary>
           </indexterm>
@@ -341,356 +357,345 @@
       </varlistentry>
 
-      <varlistentry id="xft-config-x7">
-        <term><command>xft-config</command></term>
-        <listitem>
-          <para>reports Xft version, compiler, linker, and/or installation
-          directory information.</para>
-          <indexterm zone="xorg7-lib xft-config-x7">
-            <primary sortas="b-xft-config">xft-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdmx-x7">
-        <term><filename class='libraryfile'>libdmx.{so,a}</filename></term>
+      <varlistentry id="libdmx">
+        <term><filename class="libraryfile">libdmx.so</filename></term>
         <listitem>
           <para>is the X Window System DMX (Distributed Multihead X) extension
           library.</para>
-          <indexterm zone="xorg7-lib libdmx-x7">
-            <primary sortas="c-libdmx">libdmx.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfontenc-x7">
-        <term><filename class='libraryfile'>libfontenc.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libdmx">
+            <primary sortas="c-libdmx">libdmx.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libfontenc">
+        <term><filename class="libraryfile">libfontenc.so</filename></term>
         <listitem>
           <para>is the X11 font encoding library.</para>
-          <indexterm zone="xorg7-lib libfontenc-x7">
-            <primary sortas="c-libfontenc">libfontenc.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libFS-x7">
-        <term><filename class='libraryfile'>libFS.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libfontenc">
+            <primary sortas="c-libfontenc">libfontenc.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libFS">
+        <term><filename class="libraryfile">libFS.so</filename></term>
         <listitem>
           <para>is the library interface to the X Font Server.</para>
-          <indexterm zone="xorg7-lib libFS-x7">
-            <primary sortas="c-libFS">libFS.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libICE-x7">
-        <term><filename class='libraryfile'>libICE.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libFS">
+            <primary sortas="c-libFS">libFS.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libICE">
+        <term><filename class="libraryfile">libICE.so</filename></term>
         <listitem>
           <para>is the X Inter Client Exchange Library.</para>
-          <indexterm zone="xorg7-lib libICE-x7">
-            <primary sortas="c-libICE">libICE.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpciaccess-x7">
-        <term><filename class='libraryfile'>libpciaccess.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libICE">
+            <primary sortas="c-libICE">libICE.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpciaccess">
+        <term><filename class="libraryfile">libpciaccess.so</filename></term>
         <listitem>
           <para>is the generic PCI Access library for X.</para>
-          <indexterm zone="xorg7-lib libpciaccess-x7">
-            <primary sortas="c-libpciaccess">libpciaccess.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libSM-x7">
-        <term><filename class='libraryfile'>libSM.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libpciaccess">
+            <primary sortas="c-libpciaccess">libpciaccess.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libSM">
+        <term><filename class="libraryfile">libSM.so</filename></term>
         <listitem>
           <para>is the X Session Management Library.</para>
-          <indexterm zone="xorg7-lib libSM-x7">
-            <primary sortas="c-libSM">libSM.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libX11-x7">
-        <term><filename class='libraryfile'>libX11.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libSM">
+            <primary sortas="c-libSM">libSM.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libX11">
+        <term><filename class="libraryfile">libX11.so</filename></term>
         <listitem>
           <para>is the Xlib Library.</para>
-          <indexterm zone="xorg7-lib libX11-x7">
-            <primary sortas="c-libX11">libX11.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXaw6-x7">
-        <term><filename class='libraryfile'>libXaw6.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libX11">
+            <primary sortas="c-libX11">libX11.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXaw6">
+        <term><filename class="libraryfile">libXaw6.so</filename></term>
         <listitem>
           <para>is the X Athena Widgets Library, version 6.</para>
-          <indexterm zone="xorg7-lib libXaw6-x7">
-            <primary sortas="c-libXaw6">libXaw6.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXaw7-x7">
-        <term><filename class='libraryfile'>libXaw7.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXaw6">
+            <primary sortas="c-libXaw6">libXaw6.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXaw7">
+        <term><filename class="libraryfile">libXaw7.so</filename></term>
         <listitem>
           <para>is the X Athena Widgets Library, version 7.</para>
-          <indexterm zone="xorg7-lib libXaw7-x7">
-            <primary sortas="c-libXaw7">libXaw7.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXaw-x7">
-        <term><filename class='libraryfile'>libXaw.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXaw7">
+            <primary sortas="c-libXaw7">libXaw7.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXaw">
+        <term><filename class="libraryfile">libXaw.so</filename></term>
         <listitem>
           <para>are symbolic links to the current X Athena Widgets Library,
           version 7.</para>
-          <indexterm zone="xorg7-lib libXaw-x7">
-            <primary sortas="c-libXaw">libXaw.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXcomposite-x7">
-        <term><filename class='libraryfile'>libXcomposite.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXaw">
+            <primary sortas="c-libXaw">libXaw.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXcomposite">
+        <term><filename class="libraryfile">libXcomposite.so</filename></term>
         <listitem>
           <para>is the X Composite Library.</para>
-          <indexterm zone="xorg7-lib libXcomposite-x7">
-            <primary sortas="c-libXcomposite">libXcomposite.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXcursor-x7">
-        <term><filename class='libraryfile'>libXcursor.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXcomposite">
+            <primary sortas="c-libXcomposite">libXcomposite.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXcursor">
+        <term><filename class="libraryfile">libXcursor.so</filename></term>
         <listitem>
           <para>is the X Cursor management library.</para>
-          <indexterm zone="xorg7-lib libXcursor-x7">
-            <primary sortas="c-libXcursor">libXcursor.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXdamage-x7">
-        <term><filename class='libraryfile'>libXdamage.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXcursor">
+            <primary sortas="c-libXcursor">libXcursor.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXdamage">
+        <term><filename class="libraryfile">libXdamage.so</filename></term>
         <listitem>
           <para>is the X Damage Library.</para>
-          <indexterm zone="xorg7-lib libXdamage-x7">
-            <primary sortas="c-libXdamage">libXdamage.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXext-x7">
-        <term><filename class='libraryfile'>libXext.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXdamage">
+            <primary sortas="c-libXdamage">libXdamage.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXext">
+        <term><filename class="libraryfile">libXext.so</filename></term>
         <listitem>
           <para>is the Misc X Extension Library.</para>
-          <indexterm zone="xorg7-lib libXext-x7">
-            <primary sortas="c-libXext">libXext.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXfixes-x7">
-        <term><filename class='libraryfile'>libXfixes.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXext">
+            <primary sortas="c-libXext">libXext.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXfixes">
+        <term><filename class="libraryfile">libXfixes.so</filename></term>
         <listitem>
           <para>provides augmented versions of core protocol
           requests.</para>
-          <indexterm zone="xorg7-lib libXfixes-x7">
-            <primary sortas="c-libXfixes">libXfixes.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXfont-x7">
-        <term><filename class='libraryfile'>libXfont.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXfixes">
+            <primary sortas="c-libXfixes">libXfixes.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXfont">
+        <term><filename class="libraryfile">libXfont.so</filename></term>
         <listitem>
           <para>is the X font library.</para>
-          <indexterm zone="xorg7-lib libXfont-x7">
-            <primary sortas="c-libXfont">libXfont.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXft-x7">
-        <term><filename class='libraryfile'>libXft.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXfont">
+            <primary sortas="c-libXfont">libXfont.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXft">
+        <term><filename class="libraryfile">libXft.so</filename></term>
         <listitem>
           <para>is the X FreeType interface library.</para>
-          <indexterm zone="xorg7-lib libXft-x7">
-            <primary sortas="c-libXft">libXft.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXinerama-x7">
-        <term><filename class='libraryfile'>libXinerama.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXft">
+            <primary sortas="c-libXft">libXft.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXinerama">
+        <term><filename class="libraryfile">libXinerama.so</filename></term>
         <listitem>
           <para>is the Xinerama Library.</para>
-          <indexterm zone="xorg7-lib libXinerama-x7">
-            <primary sortas="c-libXinerama">libXinerama.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXi-x7">
-        <term><filename class='libraryfile'>libXi.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXinerama">
+            <primary sortas="c-libXinerama">libXinerama.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXi">
+        <term><filename class="libraryfile">libXi.so</filename></term>
         <listitem>
           <para>is the X Input Extension Library.</para>
-          <indexterm zone="xorg7-lib libXi-x7">
-            <primary sortas="c-libXi">libXi.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxkbfile-x7">
-        <term><filename class='libraryfile'>libxkbfile.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXi">
+            <primary sortas="c-libXi">libXi.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libxkbfile">
+        <term><filename class="libraryfile">libxkbfile.so</filename></term>
         <listitem>
           <para>is the xkbfile Library.</para>
-          <indexterm zone="xorg7-lib libxkbfile-x7">
-            <primary sortas="c-libxkbfile">libxkbfile.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXmu-x7">
-        <term><filename class='libraryfile'>libXmu.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libxkbfile">
+            <primary sortas="c-libxkbfile">libxkbfile.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXmu">
+        <term><filename class="libraryfile">libXmu.so</filename></term>
         <listitem>
           <para>is the X interface library for miscellaneous utilities not
           part of the Xlib standard.</para>
-          <indexterm zone="xorg7-lib libXmu-x7">
-            <primary sortas="c-libXmu">libXmu.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXmuu-x7">
-        <term><filename class='libraryfile'>libXmuu.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXmu">
+            <primary sortas="c-libXmu">libXmu.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXmuu">
+        <term><filename class="libraryfile">libXmuu.so</filename></term>
         <listitem>
           <para>is the Mini Xmu Library.</para>
-          <indexterm zone="xorg7-lib libXmuu-x7">
-            <primary sortas="c-libXmuu">libXmuu.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXpm-x7">
-        <term><filename class='libraryfile'>libXpm.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXmuu">
+            <primary sortas="c-libXmuu">libXmuu.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXpm">
+        <term><filename class="libraryfile">libXpm.so</filename></term>
         <listitem>
           <para>is the X Pixmap Library.</para>
-          <indexterm zone="xorg7-lib libXpm-x7">
-            <primary sortas="c-libXpm">libXpm.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXrandr-x7">
-        <term><filename class='libraryfile'>libXrandr.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXpm">
+            <primary sortas="c-libXpm">libXpm.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXrandr">
+        <term><filename class="libraryfile">libXrandr.so</filename></term>
         <listitem>
           <para>is the X Resize, Rotate and Reflection extension library.</para>
-          <indexterm zone="xorg7-lib libXrandr-x7">
-            <primary sortas="c-libXrandr">libXrandr.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXrender-x7">
-        <term><filename class='libraryfile'>libXrender.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXrandr">
+            <primary sortas="c-libXrandr">libXrandr.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXrender">
+        <term><filename class="libraryfile">libXrender.so</filename></term>
         <listitem>
           <para>is the X Render Library.</para>
-          <indexterm zone="xorg7-lib libXrender-x7">
-            <primary sortas="c-libXrender">libXrender.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXRes-x7">
-        <term><filename class='libraryfile'>libXRes.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXrender">
+            <primary sortas="c-libXrender">libXrender.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXRes">
+        <term><filename class="libraryfile">libXRes.so</filename></term>
         <listitem>
           <para>is the X-Resource extension client library.</para>
-          <indexterm zone="xorg7-lib libXRes-x7">
-            <primary sortas="c-libXRes">libXRes.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXss-x7">
-        <term><filename class='libraryfile'>libXss.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXRes">
+            <primary sortas="c-libXRes">libXRes.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXss">
+        <term><filename class="libraryfile">libXss.so</filename></term>
         <listitem>
           <para>is the X11 Screen Saver extension client library.</para>
-          <indexterm zone="xorg7-lib libXss-x7">
-            <primary sortas="c-libXss">libXss.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXt-x7">
-        <term><filename class='libraryfile'>libXt.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXss">
+            <primary sortas="c-libXss">libXss.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXt">
+        <term><filename class="libraryfile">libXt.so</filename></term>
         <listitem>
           <para>is the X Toolkit Library.</para>
-          <indexterm zone="xorg7-lib libXt-x7">
-            <primary sortas="c-libXt">libXt.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXtst-x7">
-        <term><filename class='libraryfile'>libXtst.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXt">
+            <primary sortas="c-libXt">libXt.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXtst">
+        <term><filename class="libraryfile">libXtst.so</filename></term>
         <listitem>
           <para>is the Xtst Library.</para>
-          <indexterm zone="xorg7-lib libXtst-x7">
-            <primary sortas="c-libXtst">libXtst.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXvMC-x7">
-        <term><filename class='libraryfile'>libXvMC.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXtst">
+            <primary sortas="c-libXtst">libXtst.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXvMC">
+        <term><filename class="libraryfile">libXvMC.so</filename></term>
         <listitem>
           <para>is the X-Video Motion Compensation Library.</para>
-          <indexterm zone="xorg7-lib libXvMC-x7">
-            <primary sortas="c-libXvMC">libXvMC.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXvMCW-x7">
-        <term><filename class='libraryfile'>libXvMCW.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXvMC">
+            <primary sortas="c-libXvMC">libXvMC.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXvMCW">
+        <term><filename class="libraryfile">libXvMCW.so</filename></term>
         <listitem>
           <para>is the XvMC Wrapper including the Nonstandard VLD
           extension.</para>
-          <indexterm zone="xorg7-lib libXvMCW-x7">
-            <primary sortas="c-libXvMCW">libXvMCW.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXv-x7">
-        <term><filename class='libraryfile'>libXv.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXvMCW">
+            <primary sortas="c-libXvMCW">libXvMCW.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXv">
+        <term><filename class="libraryfile">libXv.so</filename></term>
         <listitem>
           <para>is the X Window System video extension library.</para>
-          <indexterm zone="xorg7-lib libXv-x7">
-            <primary sortas="c-libXv">libXv.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXxf86dga-x7">
-        <term><filename class='libraryfile'>libXxf86dga.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXv">
+            <primary sortas="c-libXv">libXv.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXxf86dga">
+        <term><filename class="libraryfile">libXxf86dga.so</filename></term>
         <listitem>
           <para>is the client library for the XFree86-DGA extension.</para>
-          <indexterm zone="xorg7-lib libXxf86dga-x7">
-            <primary sortas="c-libXxf86dga">libXxf86dga.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXxf86vm-x7">
-        <term><filename class='libraryfile'>libXxf86vm.{so,a}</filename></term>
+          <indexterm zone="xorg7-lib libXxf86dga">
+            <primary sortas="c-libXxf86dga">libXxf86dga.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libXxf86vm">
+        <term><filename class="libraryfile">libXxf86vm.so</filename></term>
         <listitem>
           <para>is the client library for the XFree86-VidMode X extension.</para>
-          <indexterm zone="xorg7-lib libXxf86vm-x7">
-            <primary sortas="c-libXxf86vm">libXxf86vm.{so,a}</primary>
+          <indexterm zone="xorg7-lib libXxf86vm">
+            <primary sortas="c-libXxf86vm">libXxf86vm.so</primary>
           </indexterm>
         </listitem>
Index: x/installing/x7proto.xml
===================================================================
--- x/installing/x7proto.xml	(revision 52cc64ddc113cd3ba24cf62ace0e90ad432bb14a)
+++ x/installing/x7proto.xml	(revision bb7f58ecda88115a7c08c8979a669fc667ad6997)
@@ -8,10 +8,5 @@
   <!ENTITY x7proto-download-ftp  "ftp://ftp.x.org/pub/individual/proto/">
   <!ENTITY x7proto-size          "3.0 MB">
-<!-- Editors note:  Because we recommend a scripted build that removes
-     the source directories after installation, the xorg buildsizes are
-     determined by the sum of all package source tarballs, the size of
-     installed files, and the size of the largest package's build
-     directory after running make install. -->
-  <!ENTITY x7proto-buildsize     "21 MB">
+  <!ENTITY x7proto-buildsize     "25 MB">
   <!ENTITY x7proto-time          "0.8 SBU">
 
@@ -28,6 +23,6 @@
   <!ENTITY dmxproto-md5sum                 "4ee175bbd44d05c34d43bb129be5098a">
 
-  <!ENTITY dri2proto-version               "2.6">
-  <!ENTITY dri2proto-md5sum                "2eb74959684f47c862081099059a11ab">
+  <!ENTITY dri2proto-version               "2.8">
+  <!ENTITY dri2proto-md5sum                "b2721d5d24c04d9980a0c6540cb5396a">
 
   <!ENTITY fixesproto-version              "5.0">
@@ -37,6 +32,6 @@
   <!ENTITY fontsproto-md5sum               "c5f4f1fb4ba7766eedbc9489e81f3be2">
 
-  <!ENTITY glproto-version                 "1.4.15">
-  <!ENTITY glproto-md5sum                  "d1ff0c1acc605689919c1ee2fc9b5582">
+  <!ENTITY glproto-version                 "1.4.16">
+  <!ENTITY glproto-md5sum                  "3847963c1b88fd04a030b932b0aece07">
 
   <!ENTITY inputproto-version              "2.2">
@@ -46,6 +41,6 @@
   <!ENTITY kbproto-md5sum                  "677ea8523eec6caca86121ad2dca0b71">
 
-  <!ENTITY randrproto-version              "1.3.2">
-  <!ENTITY randrproto-md5sum               "597491c0d8055e2a66f11350c4985775">
+  <!ENTITY randrproto-version              "1.4.0">
+  <!ENTITY randrproto-md5sum               "ce4d0b05675968e4c83e003cc809660d">
 
   <!ENTITY recordproto-version             "1.14.2">
@@ -242,13 +237,29 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>The following subdirectories of <envar>$XORG_PREFIX</envar>/:
-        include/X11, include/GL, and lib/pkgconfig</seg>
+        <seg>
+          <envar>$XORG_PREFIX</envar>/include/GL,
+          <envar>$XORG_PREFIX</envar>/include/X11,
+          <envar>$XORG_PREFIX</envar>/lib/pkgconfig,
+          <envar>$XORG_PREFIX</envar>/share/doc/bigreqsproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/compositeproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/damageproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/dri2proto,
+          <envar>$XORG_PREFIX</envar>/share/doc/fixesproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/fontsproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/inputproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/kbproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/randrproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/recordproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/renderproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/resourceproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/scrnsaverproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/videoproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/xcmiscproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/xextproto and
+          <envar>$XORG_PREFIX</envar>/share/doc/xproto
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: x/installing/xcb-proto.xml
===================================================================
--- x/installing/xcb-proto.xml	(revision 52cc64ddc113cd3ba24cf62ace0e90ad432bb14a)
+++ x/installing/xcb-proto.xml	(revision bb7f58ecda88115a7c08c8979a669fc667ad6997)
@@ -7,8 +7,7 @@
   <!ENTITY xcb-proto-download-http "http://xcb.freedesktop.org/dist/xcb-proto-&xcb-proto-version;.tar.bz2">
   <!ENTITY xcb-proto-download-ftp  " ">
-  <!-- <!ENTITY xcb-proto-download-ftp  "ftp://ftp.x.org/pub/current/src/extras/xcb-proto-&xcb-proto-version;.tar.bz2"> -->
-  <!ENTITY xcb-proto-md5sum        "948fec39dd42f3694edd5d9689735ec4">
-  <!ENTITY xcb-proto-size          "104 KB">
-  <!ENTITY xcb-proto-buildsize     "1.3 MB">
+  <!ENTITY xcb-proto-md5sum        "a5de3432cc6e43cc6a27f241dbb991b1">
+  <!ENTITY xcb-proto-size          "124 KB">
+  <!ENTITY xcb-proto-buildsize     "2.0 MB">
   <!ENTITY xcb-proto-time          "less than 0.1 SBU">
 ]>
@@ -85,7 +84,5 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-install -dv -m755 ${XORG_PREFIX}/share/doc/xcb-proto-&xcb-proto-version; &amp;&amp;
-install -v -m644 doc/* ${XORG_PREFIX}/share/doc/xcb-proto-&xcb-proto-version;</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -95,11 +92,7 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
         <seg><envar>$XORG_PREFIX</envar>/share/xcb</seg>
       </seglistitem>
Index: x/installing/xkeyboard-config.xml
===================================================================
--- x/installing/xkeyboard-config.xml	(revision 52cc64ddc113cd3ba24cf62ace0e90ad432bb14a)
+++ x/installing/xkeyboard-config.xml	(revision bb7f58ecda88115a7c08c8979a669fc667ad6997)
@@ -7,7 +7,7 @@
   <!ENTITY xkeyboard-config-download-http "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
   <!ENTITY xkeyboard-config-download-ftp  "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
-  <!ENTITY xkeyboard-config-md5sum        "e7e31da9adb56ba52b5c18226b8cbef3">
-  <!ENTITY xkeyboard-config-size          "840 KB">
-  <!ENTITY xkeyboard-config-buildsize     "17.6 MB">
+  <!ENTITY xkeyboard-config-md5sum        "6ad7b43062f123eacf8ff0eb3a4e0678">
+  <!ENTITY xkeyboard-config-size          "848 KB">
+  <!ENTITY xkeyboard-config-buildsize     "18 MB">
   <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
 ]>
@@ -103,8 +103,5 @@
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-install -dv -m755 $XORG_PREFIX/share/doc/xkeyboard-config-&xkeyboard-config-version; &amp;&amp;
-install -v -m644 docs/{README,HOWTO}* \
-    $XORG_PREFIX/share/doc/xkeyboard-config-&xkeyboard-config-version;</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -125,10 +122,9 @@
 
     <segmentedlist>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>
-          <envar>$XORG_PREFIX</envar>/share/X11/xkb and
-          <envar>$XORG_PREFIX</envar>/share/doc/xkeyboard-config-&xkeyboard-config-version;
+          <envar>$XORG_PREFIX</envar>/share/X11/xkb
         </seg>
       </seglistitem>
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision 52cc64ddc113cd3ba24cf62ace0e90ad432bb14a)
+++ x/installing/xorg7.xml	(revision bb7f58ecda88115a7c08c8979a669fc667ad6997)
@@ -149,5 +149,5 @@
 
 <screen><userinput>export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc \
-    --mandir=$XORG_PREFIX/share/man --localstatedir=/var"</userinput></screen>
+    --localstatedir=/var --disable-static"</userinput></screen>
 
     <para>Create an <filename>/etc/profile.d/xorg.sh</filename> configuration
@@ -159,6 +159,6 @@
 XORG_CONFIG="--prefix=$XORG_PREFIX \
              --sysconfdir=/etc \
-             --mandir=$XORG_PREFIX/share/man \
-             --localstatedir=/var"
+             --localstatedir=/var \
+             --disable-static"
 export XORG_PREFIX XORG_CONFIG
 EOF
