diff --git a/general/genutils/xscreensaver.xml b/general/genutils/xscreensaver.xml
index 139bb67262..1c21d0f510 100644
--- a/general/genutils/xscreensaver.xml
+++ b/general/genutils/xscreensaver.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY xscreensaver-download-http "http://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz">
   <!ENTITY xscreensaver-download-ftp  " ">
-  <!ENTITY xscreensaver-md5sum        "b71e3a78db1ae14291cc9ff4c5e10911">
-  <!ENTITY xscreensaver-size          "9.1 MB">
-  <!ENTITY xscreensaver-buildsize     "230 MB">
-  <!ENTITY xscreensaver-time          "0.9 SBU">
+  <!ENTITY xscreensaver-md5sum        "edad550c27660f2018927eaf3ca3999c">
+  <!ENTITY xscreensaver-size          "11 MB">
+  <!ENTITY xscreensaver-buildsize     "199 MB">
+  <!ENTITY xscreensaver-time          "1 SBU">
 ]>
 
 <sect1 id="xscreensaver" xreflabel="XScreenSaver-&xscreensaver-version;">
@@ -110,7 +110,8 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>sed -i '/hsv.h/ a#include "stdint.h"' hacks/binaryring.c &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -128,6 +129,11 @@ make</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <command>sed -i ... hacks/binaryring.c</command>: Include missing
+      standard integer header reference.
+    </para>
+
     <para>
       <option>--with-setuid-hacks</option>: This switch allows some demos
       to be installed setuid <systemitem class="username">root</systemitem>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 6bfdda8505..cf02ea254c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,10 @@
     <listitem>
       <para>November 16th, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to xscreensaver-5.31. Fixes
+          <ulink url="&blfs-ticket-root;5831">#5831</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to brasero-3.12.0. Fixes
           <ulink url="&blfs-ticket-root;5824">#5824</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index fe2689ef8b..42d5e9b0f0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -204,7 +204,7 @@
 <!ENTITY time-version                 "1.7">
 <!ENTITY tree-version                 "1.7.0">
 <!ENTITY unixodbc-version             "2.3.2">
-<!ENTITY xscreensaver-version         "5.30">
+<!ENTITY xscreensaver-version         "5.31">
 
 <!-- Chapter 12 -->
 <!ENTITY acpid-version                "2.0.23">