diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 79593aa140..24bc4462a7 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,10 @@
     <listitem>
       <para>February 11th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to xorg-server-1.17.1. Fixes
+          <ulink url="&blfs-ticket-root;6135">#6135</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to postfix-3.0.0. Fixes
           <ulink url="&blfs-ticket-root;6134">#6134</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 420f2d294b..5973c05cff 100644
--- a/packages.ent
+++ b/packages.ent
@@ -439,7 +439,7 @@
 <!ENTITY xcb-util-keysyms-version     "0.4.0">
 <!ENTITY xcb-util-renderutil-version  "0.3.9">
 <!ENTITY xcb-util-wm-version          "0.4.1">
-<!ENTITY xorg-server-version          "1.17.0">
+<!ENTITY xorg-server-version          "1.17.1">
 <!ENTITY twm-version                  "1.0.8">
 <!ENTITY xterm-version                "314">
 <!ENTITY xclock-version               "1.0.7">
diff --git a/x/installing/xorg-server.xml b/x/installing/xorg-server.xml
index e7d42a1a48..0fed8f7746 100644
--- a/x/installing/xorg-server.xml
+++ b/x/installing/xorg-server.xml
@@ -6,10 +6,10 @@
 
   <!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        "38ecaefa238b04ec4a38f7128e87e239">
+  <!ENTITY xorg-server-md5sum        "5986510d59e394a50126a8e2833e79d3">
   <!ENTITY xorg-server-size          "5.6 MB">
-  <!ENTITY xorg-server-buildsize     "552 MB">
-  <!ENTITY xorg-server-time          "1.8 SBU">
+  <!ENTITY xorg-server-buildsize     "410 MB">
+  <!ENTITY xorg-server-time          "1.6 SBU">
 ]>
 
 <sect1 id="xorg-server" xreflabel="Xorg-Server-&xorg-server-version;">