Index: general/genutils/xscreensaver.xml
===================================================================
--- general/genutils/xscreensaver.xml	(revision 3e07258013399e8a60beccdba7d57e158b56af97)
+++ general/genutils/xscreensaver.xml	(revision 369d7767e4deec0bdf1414412e287c5fad8fb553)
@@ -7,8 +7,8 @@
   <!ENTITY xscreensaver-download-http "http://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz">
   <!ENTITY xscreensaver-download-ftp  " ">
-  <!ENTITY xscreensaver-md5sum        "9f86ef921b55ccc9efa1ffd7ca437332">
+  <!ENTITY xscreensaver-md5sum        "14f9104fa03f85371f885bdad956764d">
   <!ENTITY xscreensaver-size          "8.4 MB">
   <!ENTITY xscreensaver-buildsize     "167 MB">
-  <!ENTITY xscreensaver-time          "0.9 SBU">
+  <!ENTITY xscreensaver-time          "0.8 SBU">
 ]>
 
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 3e07258013399e8a60beccdba7d57e158b56af97)
+++ general/prog/cmake.xml	(revision 369d7767e4deec0bdf1414412e287c5fad8fb553)
@@ -7,8 +7,8 @@
   <!ENTITY cmake-download-http "http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "17c6513483d23590cbce6957ec6d1e66">
-  <!ENTITY cmake-size          "5.8 MB">
-  <!ENTITY cmake-buildsize     "222 MB (additional 175 MB for tests)">
-  <!ENTITY cmake-time          "1.5 SBU (additional 3.5 SBU for tests)">
+  <!ENTITY cmake-md5sum        "21a1c85e1a3b803c4b48e7ff915a863e">
+  <!ENTITY cmake-size          "5.3 MB">
+  <!ENTITY cmake-buildsize     "236 MB (additional 199 MB for tests)">
+  <!ENTITY cmake-time          "1.6 SBU (additional 4.4 SBU for tests)">
 ]>
 
@@ -75,14 +75,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cmake-&cmake-version;-freetype-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
 
@@ -95,5 +85,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="subversion"/> (for testing) and
+      <xref linkend="subversion"/> (for testing),
+       <ulink url="http://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
+       (for building documents), and
       <xref linkend="qt4"/> or <xref linkend="qt5"/> (for the Qt-based GUI)
     </para>
@@ -108,10 +100,16 @@
 
     <para>
+       If <application>Qt4</application> and <application>Qt5</application> are
+       installed in <filename class="directory">/opt</filename>, use
+       <command>source setqt4</command> or <command>source setqt5</command> to
+       choose which one will be used to build the Qt-based GUI.
+    </para>
+
+    <para>
       Install <application>CMake</application> by running the following
       commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../cmake-&cmake-version;-freetype-1.patch &amp;&amp;
-./bootstrap --prefix=/usr       \
+<screen><userinput>./bootstrap --prefix=/usr       \
             --system-libs       \
             --mandir=/share/man \
@@ -120,8 +118,14 @@
 
     <para>
-      To test the results, issue: <command>make -k test</command>. Some
-      tests may fail for unknown reasons. Other tests depend on the
-      availability of remote sites, and may fail if those sites are
-      not available.
+      To test the results, issue: <command>bin/ctest</command>. If you want to
+      investigate a problem with a given "problem1-test", use
+      <command>bin/ctest -R "problem1-test"</command> and, to omit it, use
+      <command>bin/ctest -E "problem1-test"</command>. These options can be
+      used toghether:
+      <command>bin/ctest -R "problem1-test" -E "problem2-test"</command>.
+      Option -N can be used to display all available tests, and you can run
+      <command>bin/ctest</command> for a sub-set of tests by using their name
+      s or numbers, separated by spaces, as options. Option --help can be used
+      to show all options.
     </para>
 
Index: general/sysutils/udev-extras.xml
===================================================================
--- general/sysutils/udev-extras.xml	(revision 3e07258013399e8a60beccdba7d57e158b56af97)
+++ general/sysutils/udev-extras.xml	(revision 369d7767e4deec0bdf1414412e287c5fad8fb553)
@@ -11,4 +11,6 @@
   <!ENTITY eudev-buildsize     "23 MB">
   <!ENTITY eudev-time          "0.3 SBU">
+
+  <!ENTITY eudev-svn-download-http "http://dev.gentoo.org/~blueness/eudev">
 ]>
 
@@ -30,7 +32,22 @@
     <title>Introduction to Udev Extras</title>
 
-    <para>Udev was installed as a part of eudev in LFS. However, not
-    all components were installed due to dependencies that were unavailable.
-    This procedure adds those missing components.</para>
+    <para><application>Udev</application> was indeed installed in LFS and there
+    is no reason to reinstall it unless the user is going to install a package
+    such as <application>UPower</application>. This installation of
+    <application>Udev</application> enables extra features which includes gudev,
+    a requirement for <application>UPower</application> and optionally used by
+    other packages.</para>
+
+    <para>Unlike any other package in the development version of BLFS book,
+    there is no set version of <application>Eudev</application> in this pages's
+    title. For consistency, there is no set version specified to download, as
+    well. Version update to <application>Eudev</application> in the development
+    LFS makes probable that the user's system may have an
+    <application>Eudev</application> version different from the one in the
+    development LFS. Therefore, users should download and use the version of
+    <application>Eudev</application> their computer currently uses. With few
+    exceptions, the BLFS team has no experience updating (or reverting to an
+    older version) the <application>Eudev</application> package <quote>on the
+    fly</quote>.</para>
 
     <!-- &lfs75_checked; -->
@@ -53,4 +70,7 @@
     <itemizedlist spacing="compact">
       <listitem>
+        <para>Download (HTTP): <ulink url="&eudev-svn-download-http;"/></para>
+      </listitem>
+<!--      <listitem>
         <para>Download (HTTP): <ulink url="&eudev-download-http;"/></para>
       </listitem>
@@ -69,5 +89,5 @@
       <listitem>
         <para>Estimated build time: &eudev-time;</para>
-      </listitem>
+      </listitem>-->
     </itemizedlist>
 
