Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f9dd885ff57a75902ce92096a4b282bd0334ed1b)
+++ introduction/welcome/changelog.xml	(revision 9bff4bc54de926742d05142e3edfcfaeb7db7887)
@@ -48,4 +48,8 @@
       <para>February 9th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to xorg-server-1.17.0. Fixes
+          <ulink url="&blfs-ticket-root;6112">#6112</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to nfs-utils-1.3.2. Fixes
Index: packages.ent
===================================================================
--- packages.ent	(revision f9dd885ff57a75902ce92096a4b282bd0334ed1b)
+++ packages.ent	(revision 9bff4bc54de926742d05142e3edfcfaeb7db7887)
@@ -440,5 +440,5 @@
 <!ENTITY xcb-util-renderutil-version  "0.3.9">
 <!ENTITY xcb-util-wm-version          "0.4.1">
-<!ENTITY xorg-server-version          "1.16.3">
+<!ENTITY xorg-server-version          "1.17.0">
 <!ENTITY twm-version                  "1.0.8">
 <!ENTITY xterm-version                "314">
Index: x/installing/x7driver-ati.xml
===================================================================
--- x/installing/x7driver-ati.xml	(revision f9dd885ff57a75902ce92096a4b282bd0334ed1b)
+++ x/installing/x7driver-ati.xml	(revision 9bff4bc54de926742d05142e3edfcfaeb7db7887)
@@ -197,25 +197,21 @@
         Decoder ring for engineering vs marketing names</ulink>. Please note
         that Glamor acceleration can be used with other chips as well, from the
-        R300 onwards, but it has not been tested recently.
+        R300 onwards. On at least some Northern Islands chips it is beneficial.
       </para>
 
       <para>
         Glamor acceleration is not enabled by default for chipsets that don't
-        use "radeonsi" Gallium3D driver. You have to use a
+        use "radeonsi" Gallium3D driver. You have to use an
         <filename>xorg.conf</filename> file to enable it. To enable
         Glamor for cards other than "Southern Islands" and later, create the
-        following <filename>/etc/X11/xorg.conf</filename> as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/X11/xorg.conf &lt;&lt; "EOF"
-<literal>Section "Module"
-        Load "dri2"
-        Load "glamoregl"
-EndSection
-
-Section "Device"
+        following file in
+        <filename class="directory">${XORG_PREFIX}/share/X11/xorg.conf.d/</filename>
+        as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat &gt;&gt; ${XORG_PREFIX}/share/X11/xorg.conf.d/20-glamor.conf &lt;&lt; "EOF"
+<literal>Section "Device"
         Identifier "radeon"
-        Driver "radeon"
+        Driver "ati"
         Option "AccelMethod" "glamor"
 EndSection</literal>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision f9dd885ff57a75902ce92096a4b282bd0334ed1b)
+++ x/installing/x7driver.xml	(revision 9bff4bc54de926742d05142e3edfcfaeb7db7887)
@@ -28,7 +28,15 @@
       The <application>Xorg Drivers</application> page contains the
       instructions for building Xorg drivers that are necessary in order
-      for Xorg Server to take the advantage of the hardware that it is
-      running on. At least one input and one video driver is required
+      for Xorg Server to take advantage of the hardware that it is
+      running on. At least one input and one video driver are required
       for Xorg Server to start.
+    </para>
+
+    <para>
+      On machines using KMS, the modesetting driver is provided by
+      <application>xorg-server</application> and can be used instead of the
+      video driver for the specific hardware, but with reduced performance.
+      It can also be used (without hardware acceleration) in virtual machines
+      running under <application>qemu</application>.
     </para>
 
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision f9dd885ff57a75902ce92096a4b282bd0334ed1b)
+++ x/installing/xorg-server.xml	(revision 9bff4bc54de926742d05142e3edfcfaeb7db7887)
@@ -7,8 +7,8 @@
   <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "afd93977235584a9caa7528a737c1b52">
-  <!ENTITY xorg-server-size          "5.5 MB">
-  <!ENTITY xorg-server-buildsize     "0.5 GB (doesn't include tests)">
-  <!ENTITY xorg-server-time          "1.7 SBU (doesn't include tests)">
+  <!ENTITY xorg-server-md5sum        "38ecaefa238b04ec4a38f7128e87e239">
+  <!ENTITY xorg-server-size          "5.6 MB">
+  <!ENTITY xorg-server-buildsize     "552 MB">
+  <!ENTITY xorg-server-time          "1.8 SBU">
 ]>
 
@@ -97,4 +97,5 @@
       <xref linkend="libepoxy"/> (required for glamor, see command
       explanations below)
+      <xref linkend="xcb-util-keysyms"/> (used by Xnest)
     </para>
 
@@ -104,6 +105,9 @@
       <xref linkend="doxygen"/> (to build API documentation),
       <xref linkend="fop"/>, (to build documentation),
-      <xref linkend="gs"/> (to build documentation), and
-      <xref linkend="xmlto"/>, (to build documentation)
+      <xref linkend="gs"/> (to build documentation),
+      <xref linkend="xcb-util-image"/>,
+      <xref linkend="xcb-util-renderutil"/>,
+      <xref linkend="xcb-util-wm"/> (all three to build Xephyr) and
+      <xref linkend="xmlto"/> (to build documentation)
     </para>
 
@@ -129,5 +133,4 @@
 <screen><userinput>./configure $XORG_CONFIG                    \
            --with-xkb-output=/var/lib/xkb   \
-           --enable-dmx                     \
            --enable-glamor                  \
            --enable-install-setuid          \
@@ -157,13 +160,10 @@
 
     <para>
-      <parameter>--enable-dmx</parameter>: Build DMX (Distributed Multihead X)
-      server.
-    </para>
-
-    <para>
       <parameter>--enable-glamor</parameter>: Build the Glamor DIX (Device
       Independent X) module which is currently required for Southern Islands and
       Sea Islands radeon video chipsets, optional for some other radeons, and
-      also optional for the intel driver.
+      also optional for the intel driver. It is also used by the modesetting
+      driver (which is part of this package) for on hardware using KMS and which
+      offers acceleration.
     </para>
 
@@ -187,4 +187,15 @@
     </para>
 
+    <para>
+      <option>--enable-dmx</option>: Build DMX (Distributed Multihead X)
+      server.
+    </para>
+
+    <para>
+      <option>--enable-kdrive</option>: this option allows the
+      <command>configure</command> script to enable Xephyr if its dependencies
+      are met.
+    </para>
+
   </sect2>
 
@@ -201,8 +212,9 @@
           cvt, dmxaddinput, dmxaddscreen, dmxinfo, dmxreconfig, dmxresize,
           dmxrminput, dmxrmscreen, dmxtodmx, dmxwininfo, gtf, vdltodmx, X,
-          Xdmx, xdmxconfig, Xnest, Xorg, and Xvfb
+          Xdmx, xdmxconfig, Xephyr, Xnest, Xorg, and Xvfb
         </seg>
         <seg>
-          several under $XORG_PREFIX/lib/xorg/modules/{,extensions,multimedia}
+          several under $XORG_PREFIX/lib/xorg/modules/{,drivers,extensions}
+          including modesetting_drv.so
         </seg>
         <seg>
@@ -281,4 +293,16 @@
       </varlistentry>
 
+      <varlistentry id="Xephyr-x7">
+        <term><command>Xephyr</command></term>
+        <listitem>
+          <para>
+            is a nested X server which supports modern X extensions.
+          </para>
+          <indexterm zone="xorg-server Xephyr-x7">
+            <primary sortas="b-Xephyr">Xephyr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="Xnest-x7">
         <term><command>Xnest</command></term>
@@ -329,4 +353,18 @@
       </varlistentry>
 
+      <varlistentry id="modesetting_drv-x7">
+        <term><filename class="libraryfile">modesetting_drv.so</filename></term>
+        <listitem>
+          <para>
+            provides a video driver for machines using Kernel Mode Setting (KMS).
+            This will use glamor if that has been enabled and the hardware offers
+            acceleration.
+          </para>
+          <indexterm zone="xorg-server modesetting_drv-x7">
+            <primary sortas="c-modesetting_drv">modesetting_drv.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
