Index: general/genlib/icu.xml
===================================================================
--- general/genlib/icu.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/genlib/icu.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -8,8 +8,8 @@
            "http://download.icu-project.org/files/icu4c/&icu-version;/icu4c-&icu-dl-version;-src.tgz">
   <!ENTITY icu-download-ftp  " ">
-  <!ENTITY icu-md5sum        "6eef33b229d0239d654983028c9c7053">
+  <!ENTITY icu-md5sum        "072e501b87065f3a0ca888f1b5165709">
   <!ENTITY icu-size          "21 MB">
-  <!ENTITY icu-buildsize     "285 MB">
-  <!ENTITY icu-time          "1.5 SBU">
+  <!ENTITY icu-buildsize     "288 MB">
+  <!ENTITY icu-time          "1.0 SBU">
 ]>
 
Index: general/genlib/libdbusmenuqt.xml
===================================================================
--- general/genlib/libdbusmenuqt.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/genlib/libdbusmenuqt.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -70,5 +70,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt"/>
+    <xref linkend="qt4"/>
     </para>
 
@@ -92,5 +92,5 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
       -DWITH_DOC=OFF .. &amp;&amp;
 make</userinput></screen>
@@ -126,5 +126,5 @@
         <seg>None</seg>
         <seg>libdbusmenu-qt.so</seg>
-        <seg>&qt-dir;/include/dbusmenu-qt</seg>
+        <seg>&qt4-dir;/include/dbusmenu-qt</seg>
       </seglistitem>
     </segmentedlist>
Index: general/genlib/pcre.xml
===================================================================
--- general/genlib/pcre.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/genlib/pcre.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -7,8 +7,8 @@
   <!ENTITY pcre-download-http "&sourceforge-repo;/pcre/pcre-&pcre-version;.tar.bz2">
   <!ENTITY pcre-download-ftp  "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-&pcre-version;.tar.bz2">
-  <!ENTITY pcre-md5sum        "62f02a76bb57a40bc66681760ed511d5">
-  <!ENTITY pcre-size          "1.3 MB">
-  <!ENTITY pcre-buildsize     "16 MB">
-  <!ENTITY pcre-time          "0.3 SBU">
+  <!ENTITY pcre-md5sum        "21514018448ac10062ece7a668fca949">
+  <!ENTITY pcre-size          "1.4 MB">
+  <!ENTITY pcre-buildsize     "18 MB">
+  <!ENTITY pcre-time          "0.2 SBU">
 ]>
 
@@ -79,4 +79,7 @@
     <para role="optional">
       <ulink url="http://valgrind.org/">Valgrind</ulink>
+<!-- -&#45;enable-pcretest-libedit (redundant as long as LFS installs libreadline
+      and <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>
+-->
     </para>
 
@@ -100,4 +103,5 @@
             --enable-pcregrep-libz            \
             --enable-pcregrep-libbz2          \
+            --enable-pcretest-libreadline     \
             --disable-static                 &amp;&amp;
 make</userinput></screen>
@@ -113,5 +117,5 @@
 <screen role="root"><userinput>make install                     &amp;&amp;
 mv -v /usr/lib/libpcre.so.* /lib &amp;&amp;
-ln -sfv ../../lib/libpcre.so.1.2.0 /usr/lib/libpcre.so</userinput></screen>
+ln -sfv ../../lib/libpcre.so.1.2.1 /usr/lib/libpcre.so</userinput></screen>
 
   </sect2>
@@ -142,4 +146,9 @@
       support to <command>pcregrep</command> to read
       <filename class="extension">.bz2</filename> compressed files.
+    </para>
+
+    <para>
+      <option>--enable-pcretest-libreadline</option>: This switch adds line
+      editing and history features to <command>pcretest</command> program.
     </para>
 
Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/genlib/qca.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -72,5 +72,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt"/> and
+    <xref linkend="qt4"/> and
     <xref linkend="which"/>
     </para>
@@ -88,5 +88,5 @@
 
 <screen><userinput>sed -i '217s@set@this->set@' src/botantools/botan/botan/secmem.h &amp;&amp;
-./configure --prefix=&qt-dir; \
+./configure --prefix=&qt4-dir; \
             --certstore-path=/etc/ssl/ca-bundle.crt &amp;&amp;
 make</userinput></screen>
@@ -124,5 +124,5 @@
         <seg>qcatool2 and qcatool2.debug</seg>
         <seg>libqca.so and libqca.so.&qca-version;.debug</seg>
-        <seg>&qt-dir;/include/QtCrypto and &qt-dir;/share/qca</seg>
+        <seg>&qt4-dir;/include/QtCrypto and &qt4-dir;/share/qca</seg>
       </seglistitem>
     </segmentedlist>
Index: general/genlib/qjson.xml
===================================================================
--- general/genlib/qjson.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/genlib/qjson.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -75,5 +75,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="qt"/> and
+      <xref linkend="qt4"/> and
       <xref linkend="cmake"/>
     </para>    
@@ -94,5 +94,5 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
       -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
@@ -126,5 +126,5 @@
         </seg>
         <seg>
-          &qt-dir;/include/json and &qt-dir;/lib/cmake/qjson
+          &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
         </seg>
       </seglistitem>
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/genutils/graphviz.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -101,5 +101,5 @@
       <xref linkend="gs"/>,
       <xref linkend="gtk2"/> and
-      <xref linkend="qt"/>
+      <xref linkend="qt4"/>
     </para>
 
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/genutils/pinentry.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -72,5 +72,5 @@
       <xref linkend="gtk2"/>,
       <xref linkend="libcap2"/> and
-      <xref linkend="qt"/>
+      <xref linkend="qt4"/>
     </para>
 
Index: general/graphlib/harfbuzz.xml
===================================================================
--- general/graphlib/harfbuzz.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/graphlib/harfbuzz.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -8,8 +8,8 @@
            "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-&harfbuzz-version;.tar.bz2">
   <!ENTITY harfbuzz-download-ftp  " ">
-  <!ENTITY harfbuzz-md5sum        "90855e670c790c1fec4592908be3c0b8">
-  <!ENTITY harfbuzz-size          "884 KB">
-  <!ENTITY harfbuzz-buildsize     "32 MB">
-  <!ENTITY harfbuzz-time          "0.3 SBU">
+  <!ENTITY harfbuzz-md5sum        "0bff05fafef4894031b2b64a65ac1899">
+  <!ENTITY harfbuzz-size          "882 KB">
+  <!ENTITY harfbuzz-buildsize     "24 MB">
+  <!ENTITY harfbuzz-time          "0.2 SBU">
 ]>
 
@@ -137,5 +137,5 @@
         </seg>
         <seg>
-          libharfbuzz.so
+          libharfbuzz.so and libharfbuzz-icu.so
         </seg>
         <seg>
Index: general/graphlib/libjpeg-turbo.xml
===================================================================
--- general/graphlib/libjpeg-turbo.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/graphlib/libjpeg-turbo.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -7,8 +7,8 @@
   <!ENTITY libjpeg-download-http "&sourceforge-repo;/libjpeg-turbo/libjpeg-turbo-&libjpeg-turbo-version;.tar.gz">
   <!ENTITY libjpeg-download-ftp  " ">
-  <!ENTITY libjpeg-md5sum        "f61e60ff01381ece4d2fe65eeb52669e">
-  <!ENTITY libjpeg-size          "1.7 MB">
-  <!ENTITY libjpeg-buildsize     "15 MB">
-  <!ENTITY libjpeg-time          "0.4 SBU">
+  <!ENTITY libjpeg-md5sum        "e1e65cc711a1ade1322c06ad4a647741">
+  <!ENTITY libjpeg-size          "1.3 MB">
+  <!ENTITY libjpeg-buildsize     "13 MB">
+  <!ENTITY libjpeg-time          "0.3 SBU">
 ]>
 
Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/graphlib/poppler.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -132,5 +132,5 @@
       <xref linkend="libxml2"/>,
       <xref linkend="openjpeg"/> and
-      <xref linkend="qt"/> (the <filename>libpoppler-qt4.so</filename> library
+      <xref linkend="qt4"/> (the <filename>libpoppler-qt4.so</filename> library
       is needed for PDF support in <application>Okular</application>).
     </para>
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/prog/cmake.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -87,5 +87,5 @@
     <para role="optional">
       <xref linkend="subversion"/> (for testing) and
-      <xref linkend="qt"/> (for the Qt-based GUI)
+      <xref linkend="qt4"/> (for the Qt-based GUI)
     </para>
 
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/prog/doxygen.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -94,5 +94,5 @@
       <xref linkend="gs"/>,
       <xref linkend="python2"/>,
-      <xref linkend="qt"/> (for doxywizard) and
+      <xref linkend="qt4"/> (for doxywizard) and
       <xref linkend="texlive"/>
     </para>
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/prog/git.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -7,8 +7,8 @@
   <!ENTITY git-download-http "http://git-core.googlecode.com/files/git-&git-version;.tar.gz">
   <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "03ebfd403a8cf355da0e3f15e53b8925">
+  <!ENTITY git-md5sum        "d91b6099fb6763cf92c696977a247060">
   <!ENTITY git-size          "4.3 MB">
-  <!ENTITY git-buildsize     "225 MB">
-  <!ENTITY git-time          "5.0 SBU (including tests)">
+  <!ENTITY git-buildsize     "217 MB">
+  <!ENTITY git-time          "0.6 SBU (additional 2.9 SBU for tests)">
 ]>
 
Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/prog/mercurial.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -7,8 +7,8 @@
   <!ENTITY mercurial-download-http "http://mercurial.selenic.com/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "6b467f41a262e2537cf927ed42d0fdda">
-  <!ENTITY mercurial-size          "3.7 MB">
-  <!ENTITY mercurial-buildsize     "40 MB">
-  <!ENTITY mercurial-time          "0.1 SBU (additional 8.5 SBU for tests)">
+  <!ENTITY mercurial-md5sum        "55f6ea5982cf87836113376174826e8c">
+  <!ENTITY mercurial-size          "3.6 MB">
+  <!ENTITY mercurial-buildsize     "43 MB">
+  <!ENTITY mercurial-time          "0.1 SBU (additional 12 SBU for tests)">
 ]>
 
@@ -31,9 +31,8 @@
 
     <para><application>Mercurial</application> is a distributed source control
-    management tool similar to <application>CVS</application>,
-    <application>Subversion</application> and <application>Git</application>.
-    <application>Mercurial</application> is written in
-    <application>Python</application> and is used by projects such as Mozilla,
-    Vim and Audacious.</para>
+    management tool similar to <application>Git</application> and
+    <application>Bazaar</application>. <application>Mercurial</application> is
+    written in <application>Python</application> and is used by projects such as
+    Mozilla and Vim.</para>
 
     &lfs73_checked;
@@ -82,5 +81,5 @@
     <ulink url="http://docutils.sourceforge.net/">Docutils</ulink> (required to build the documentation),
     <xref linkend="git"/>,
-    <xref linkend="gpg2"/> (with Python bindings),
+    <xref linkend="gnupg2"/> (<command>gpg2</command> with Python bindings),
     <xref linkend="subversion"/> (with Python bindings),
     <xref linkend="bazaar"/>,
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/prog/ruby.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -6,9 +6,9 @@
 
   <!ENTITY ruby-download-http " ">
-  <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-&ruby-version;.tar.bz2">
-  <!ENTITY ruby-md5sum        "c2b2de5ef15ea9b1aaa3152f9112af1b">
-  <!ENTITY ruby-size          "9.6 MB">
-  <!ENTITY ruby-buildsize     "890 MB">
-  <!ENTITY ruby-time          "4.0 SBU">
+  <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-&ruby-version;-p&ruby-patch-version;.tar.bz2">
+  <!ENTITY ruby-md5sum        "2f54faea6ee1ca500632ec3c0cb59cb6">
+  <!ENTITY ruby-size          "11 MB">
+  <!ENTITY ruby-buildsize     "515 MB">
+  <!ENTITY ruby-time          "3.6 SBU">
 ]>
 
@@ -97,5 +97,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --enable-shared &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/ruby-&ruby-version; --enable-shared &amp;&amp;
 make</userinput></screen>
 
@@ -139,7 +139,7 @@
         </seg>
         <seg>
-          /usr/include/ruby-1.9.1,
+          /usr/include/ruby-&ruby-version;,
           /usr/lib/ruby,
-          /usr/share/doc/ruby and
+          /usr/share/doc/ruby-&ruby-version; and
           /usr/share/ri
         </seg>
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/prog/subversion.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -8,8 +8,8 @@
   "http://archive.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
   <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "454b9f398415c3504435bf8c3f6ed127">
-  <!ENTITY subversion-size          "5.8 MB">
-  <!ENTITY subversion-buildsize     "115 MB (additional 585 MB for tests)">
-  <!ENTITY subversion-time          "0.9 SBU (additional 19 SBU for tests)">
+  <!ENTITY subversion-md5sum        "4088a77e14232876c9b4ff1541e6e200">
+  <!ENTITY subversion-size          "5.7 MB">
+  <!ENTITY subversion-buildsize     "127 MB (additional 586 MB for tests)">
+  <!ENTITY subversion-time          "0.8 SBU (additional 20 SBU for tests)">
 ]>
 
@@ -90,27 +90,30 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="sqlite"/>,
-      <xref linkend="apr-util"/> and
+      <xref linkend="apr-util"/>,
       <xref linkend="neon"/> or
-      <ulink url="http://code.google.com/p/serf/">serf</ulink>
-    </para>
-
-    <para>
-      If you require the <application>Berkeley DB</application> back-end hooks
-      in <application>Subversion</application> to build or support BDB based
-      repositories, you must have <application>APR-util</application> linked to
-      the <application>Berkeley DB</application> library.
-    </para>
+      <ulink url="http://code.google.com/p/serf/">serf</ulink>, and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <note>
+      <para>
+        If you require the <application>Berkeley DB</application> back-end hooks
+        in <application>Subversion</application> to build or support BDB based
+        repositories, you must have <application>APR-util</application> linked to
+        the <application>Berkeley DB</application> library.
+      </para>
+    </note>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="python2"/> (required to run the test suite),
+      <xref linkend="apache"/>
       <xref linkend="db"/>,
       <xref linkend="cyrus-sasl"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="dbus-glib"/>,
       <xref linkend="gnome-keyring"/>,
-      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support) and
-      <xref linkend="apache"/>
+      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support),
+      <xref linkend="openssl"/>,
+      <xref linkend="python2"/> (required to run the test suite) and
+      <xref linkend="ruby"/> (version 1.8.x)
     </para>
 
@@ -118,5 +121,5 @@
     <para role="optional">
       One of <xref linkend="openjdk"/>,
-      <ulink url="http://www.inet.no/dante/">Dante</ulink>, or
+      <ulink url="http://www.inet.no/dante/">Dante</ulink> or
       <ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">Jikes</ulink>,
       and <xref linkend="junit"/> (to test the Java bindings)
@@ -125,6 +128,5 @@
     <bridgehead renderas="sect4">Optional (for the SWIG Bindings)</bridgehead>
     <para role="optional">
-      <ulink url="http://www.swig.org">SWIG</ulink> and
-      <xref linkend="python2"/>
+      <ulink url="http://www.swig.org">SWIG</ulink>
     </para>
 
@@ -157,9 +159,4 @@
 
 <screen><userinput>make javahl</userinput></screen>
-
-    <para>
-      <application>Perl</application> and/or <application>Python</application>
-      <!-- ruby is currently b0rken <application>Ruby</application> -->
-    </para>
 
     <para>
@@ -174,13 +171,11 @@
 
     <para>
-      To compile the <application>Perl</application> and/or
-      <application>Python</application> bindings issue any or all of the
-      following commands:
+      To compile the <application>Perl</application>,
+      <application>Python</application> or <application>Ruby</application>
+      bindings issue any of the following commands:
     </para>
 <screen><userinput>make swig-pl &amp;&amp;
-make swig-py</userinput></screen>
-
-<!-- &amp;&amp;
-make swig-rb -->
+make swig-py &amp;&amp;
+make swig-rb</userinput></screen>
 
     <para>
@@ -195,13 +190,11 @@
 
     <para>
-      To test the results of any or all of the <application>SWIG</application>
-      bindings, you can use the following commands:
+      To test the results of any of the <application>SWIG</application>
+      bindings, you can use any of the following commands:
     </para>
 
 <screen><userinput>make check-swig-pl &amp;&amp;
-make check-swig-py</userinput></screen>
-
-<!-- &amp;&amp;
-make check-swig-rb -->
+make check-swig-py &amp;&amp;
+make check-swig-rb </userinput></screen>
 
     <para>
@@ -223,13 +216,11 @@
     <para>
       If you built any of the <application>SWIG</application> bindings, issue
-      any or all of the following commands as the
+      any of the following commands as the
       <systemitem class="username">root</systemitem> user to install them:
     </para>
 
 <screen role="root"><userinput>make install-swig-pl &amp;&amp;
-make install-swig-py</userinput></screen>
-
-<!-- &amp;&amp;
-make install-swig-rb -->
+make install-swig-py &amp;&amp;
+make install-swig-rb</userinput></screen>
 
     <para>
@@ -308,9 +299,9 @@
       <seglistitem>
         <seg>
-          svn, svnadmin, svndumpfilter, svnlook, svnserve, svnsync and
+          svn, svnadmin, svndumpfilter, svnlook, svnrdump, svnserve, svnsync and
           svnversion
         </seg>
         <seg>
-          libsvn*.so and optionally, a Java library, the mod_dav_svn.so, and
+          libsvn_*-1.so and optionally, a Java library, the mod_dav_svn.so and
           and mod_authz_svn.so <application>Apache HTTP</application> DSO
           modules and various <application>Perl</application> and
@@ -439,6 +430,6 @@
       </varlistentry>
 
-      <varlistentry id="libsvn_star">
-        <term><filename class="libraryfile">libsvn_*.so</filename></term>
+      <varlistentry id="libsvn_star-1">
+        <term><filename class="libraryfile">libsvn_*-1.so</filename></term>
         <listitem>
           <para>
@@ -446,6 +437,6 @@
             <application>Subversion</application> programs.
           </para>
-          <indexterm zone="subversion libsvn_star">
-            <primary sortas="c-libsvn_star">libsvn_*.so</primary>
+          <indexterm zone="subversion libsvn_star-1">
+            <primary sortas="c-libsvn_star-1">libsvn_*-1.so</primary>
           </indexterm>
         </listitem>
Index: general/sysutils/strigi.xml
===================================================================
--- general/sysutils/strigi.xml	(revision 13e0a61d725efc6228881705478d355c381b28fc)
+++ general/sysutils/strigi.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -66,5 +66,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="qt"/> and
+    <xref linkend="qt4"/> and
     <xref linkend="dbus"/>
     </para>
