Index: general.ent
===================================================================
--- general.ent	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ general.ent	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -398,4 +398,5 @@
 <!ENTITY vala-major-version           "0.22">  <!-- even minors only -->
 <!ENTITY vala-version                 "&vala-major-version;.1">
+<!ENTITY valgrind-version             "3.9.0">
 <!ENTITY yasm-version                 "1.2.0">
 
Index: general/genlib/exempi.xml
===================================================================
--- general/genlib/exempi.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ general/genlib/exempi.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -66,5 +66,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="required">
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: general/genlib/libidn.xml
===================================================================
--- general/genlib/libidn.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ general/genlib/libidn.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -92,5 +92,5 @@
       <ulink url="http://www.gnu.org/software/dotgnu/">DotGNU Portable.NET</ulink> or
       <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>, and
-      <ulink url="http://valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: general/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ general/genlib/libtasn1.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -76,5 +76,5 @@
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <ulink url="http://valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: general/genlib/pcre.xml
===================================================================
--- general/genlib/pcre.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ general/genlib/pcre.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -78,5 +78,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: general/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ general/prog/llvm.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -146,5 +146,5 @@
       <ulink url="http://www.ocaml.org/">OCaml</ulink>,
       <ulink url="http://pypi.python.org/pypi/Sphinx">Sphinx</ulink> and
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ general/prog/prog.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -57,4 +57,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vala.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="valgrind.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yasm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other-tools.xml"/>
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ general/prog/python3.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -111,5 +111,5 @@
       <xref linkend="bluez"/>,
       <xref linkend="gdb"/> (required for some tests), and
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: general/prog/valgrind.xml
===================================================================
--- general/prog/valgrind.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
+++ general/prog/valgrind.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY valgrind-download-http "http://valgrind.org/downloads/valgrind-&valgrind-version;.tar.bz2">
+  <!ENTITY valgrind-download-ftp  " ">
+  <!ENTITY valgrind-md5sum        "0947de8112f946b9ce64764af7be6df2">
+  <!ENTITY valgrind-size          "9.6 MB">
+  <!ENTITY valgrind-buildsize     "439 MB">
+  <!ENTITY valgrind-time          "1.2 SBU and iand additional 4.7 SBU for tests">
+]>
+
+<sect1 id="valgrind" xreflabel="Valgrind-&valgrind-version;">
+  <?dbhtml filename="valgrind.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Valgrind-&valgrind-version;</title>
+
+  <indexterm zone="valgrind">
+    <primary sortas="a-Valgrind">Valgrind</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Valgrind</title>
+
+    <para>
+      <application>Valgrind</application> is an instrumentation framework for
+      building dynamic analysis tools. There are Valgrind tools that can
+      automatically detect many memory management and threading bugs, and
+      profile programs in detail. Valgrind can also be used to build new
+      tools. 
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&valgrind-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&valgrind-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &valgrind-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &valgrind-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &valgrind-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &valgrind-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Valgrind Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="boost"/>,
+      <xref linkend="llvm"/>, and
+      <ulink url="www.openmp.org">OpenMP</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Optional for regenerating the documentation</bridgehead>
+    <para role="optional">
+      <xref linkend="libxslt"/> and 
+      <xref linkend="texlive"/> 
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/valgrind"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Valgrind</title>
+
+    <para>Install <application>Valgrind</application> by running the following
+    commands:</para>
+
+<screen><userinput>sed -i 's|2.18|2.19|'      configure        &amp;&amp;
+sed -i 's|/doc/valgrind||' docs/Makefile.in &amp;&amp;
+
+./configure --prefix=/usr \
+            --datadir=/usr/share/doc/valgrind-&valgrind-version; &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make regtest</command>.
+    </para>
+
+    <para>
+      If you wish to regenerate the documentation, run:
+    </para>
+
+<screen><userinput>pushd docs         &amp;&amp;
+make download-docs &amp;&amp;
+popd</userinput></screen>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed s|2.18|2.19| ... </command>: This sed allows the program to build
+      with glibc-2.19.
+    </para>
+
+    <para>
+      <command>sed s|/doc/valgrind|| ... </command>: This sed provides for 
+      installing the documentation in a versioned directory.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          callgrind_annotate, 
+          callgrind_control, 
+          cg_annotate, 
+          cg_diff, 
+          cg_merge, 
+          ms_print, 
+          valgrind, 
+          valgrind-di-server,
+          valgrind-listener, and 
+          vgdb
+        </seg>
+        <seg>
+          vgpreload_core-amd64-linux.so, 
+          vgpreload_drd-amd64-linux.so, 
+          vgpreload_exp-dhat-amd64-linux.so, 
+          vgpreload_exp-sgcheck-amd64-linux.so,
+          vgpreload_helgrind-amd64-linux.so, 
+          vgpreload_massif-amd64-linux.so, and 
+          vgpreload_memcheck-amd64-linux.so
+        </seg>
+        <seg>
+          /usr/lib/valgrind,
+          /usr/include/valgrind, and 
+          /usr/share/doc/valgrind-&valgrind-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="valgrind-prog">
+        <term><command>valgrind</command></term>
+        <listitem>
+          <para>
+            is a program for debugging and profiling Linux executables.
+          </para>
+          <indexterm zone="valgrind valgrind-prog">
+            <primary sortas="b-valgrind">valgrind</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="callgrind_annotate">
+        <term><command>callgrind_annotate</command></term>
+        <listitem>
+          <para>
+            takes an output file produced by the
+            <application>Valgrind</application> tool Callgrind and prints the
+            information in an easy-to-read form.
+          </para>
+          <indexterm zone="callgrind_annotate">
+            <primary sortas="b-callgrind_annotate">callgrind_annotate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="callgrind_control">
+        <term><command>callgrind_control</command></term>
+        <listitem>
+          <para>
+            controls programs being run by the <application>Valgrind</application> 
+            tool Callgrind.
+          </para>
+          <indexterm zone="valgrind callgrind_control">
+            <primary sortas="b-callgrind_control">callgrind_control</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cg_annotate">
+        <term><command>cg_annotate</command></term>
+        <listitem>
+          <para>
+            is a post-processing tool for the <application>Valgrind</application> 
+            tool Cachegrind.
+          </para>
+          <indexterm zone="valgrind cg_annotate">
+            <primary sortas="b-cg_annotate">cg_annotate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cg_diff">
+        <term><command>cg_diff</command></term>
+        <listitem>
+          <para>
+            compares two Cachegrind output files.
+          </para>
+          <indexterm zone="valgrind cg_diff">
+            <primary sortas="b-cg_diff">cg_diff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cg_merge">
+        <term><command>cg_merge</command></term>
+        <listitem>
+          <para>
+            merges multiple Cachegrind output files into one.
+          </para>
+          <indexterm zone="valgrind cg_merge">
+            <primary sortas="b-cg_merge">cg_merge</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ms_print">
+        <term><command>ms_print</command></term>
+        <listitem>
+          <para>
+            takes an output file produced by the <application>Valgrind</application>
+            tool Massif and prints the information in an easy-to-read form.
+          </para>
+          <indexterm zone="valgrind ms_print">
+            <primary sortas="b-ms_print">ms_print</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="valgrind-di-server">
+        <term><command>valgrind-di-server</command></term>
+        <listitem>
+          <para>
+            is a server that reads debuginfo from objects stored on a 
+            different machine.
+          </para>
+          <indexterm zone="valgrind valgrind-di-server">
+            <primary sortas="b-valgrind-di-server">valgrind-di-server</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="valgrind-listener">
+        <term><command>valgrind-listener</command></term>
+        <listitem>
+          <para>
+            listens on a socket for Valgrind commentary.
+          </para>
+          <indexterm zone="valgrind valgrind-listener">
+            <primary sortas="b-valgrind-listener">valgrind-listener</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vgdb">
+        <term><command>vgdb</command></term>
+        <listitem>
+          <para>
+            is an intermediary between Valgrind and GDB or a shell.
+          </para>
+          <indexterm zone="valgrind vgdb">
+            <primary sortas="b-vgdb">vgdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ general/sysutils/colord.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -88,5 +88,5 @@
     <bridgehead renderas="sect4">Required (for the tests)</bridgehead>
     <para role="required">
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: gnome/platform/gcr.xml
===================================================================
--- gnome/platform/gcr.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ gnome/platform/gcr.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -94,5 +94,5 @@
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <ulink url="http://www.valgrind.org">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: gnome/platform/gnome-keyring.xml
===================================================================
--- gnome/platform/gnome-keyring.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ gnome/platform/gnome-keyring.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -89,5 +89,5 @@
     <para role="optional">
       <ulink url="http://people.redhat.com/sgrubb/libcap-ng/">libcap-ng</ulink> and
-      <ulink url="http://www.valgrind.org">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: gnome/platform/libpeas.xml
===================================================================
--- gnome/platform/libpeas.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ gnome/platform/libpeas.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -95,5 +95,5 @@
       <xref linkend="gtk-doc"/>,
       <ulink url="&gnome-download-http;/seed/">Seed</ulink>, and
-      <ulink url="http://www.valgrind.org">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ introduction/welcome/changelog.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -49,4 +49,8 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Added valgrind-3.9.0.  Fixes
+          <ulink url="&blfs-ticket-root;4724">#4724</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Ristretto-0.6.3, Thunar-1.6.3 and
           xfce4-power-manager-1.2.0: include some dependencies.</para>
Index: multimedia/libdriv/audiofile.xml
===================================================================
--- multimedia/libdriv/audiofile.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/audiofile.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -87,5 +87,5 @@
     <para role="optional">
       <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> and
-      <ulink url="http://valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: multimedia/libdriv/farstream.xml
===================================================================
--- multimedia/libdriv/farstream.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/farstream.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -96,5 +96,5 @@
       <xref linkend="gtk-doc"/>,
       <ulink url="https://wiki.gnome.org/action/show/Projects/GUPnP">gupnp-igd</ulink> and
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/flac.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -75,5 +75,5 @@
       <xref linkend="docbook-utils"/>,
       <xref linkend="doxygen"/> and
-      <ulink url="http://valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: multimedia/libdriv/gst-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst-plugins-bad.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/gst-plugins-bad.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -143,5 +143,5 @@
     <bridgehead renderas="sect4">Optional, for the unit regression tests</bridgehead>
     <para>
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/gst-plugins-base.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -112,5 +112,5 @@
       <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
       <xref linkend="check"/> (required to run the unit regression tests), and
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
       (optionaly used during the unit regression tests)
     </para>
Index: multimedia/libdriv/gst-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst-plugins-good.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/gst-plugins-good.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -126,5 +126,5 @@
     <bridgehead renderas="sect4">Optional, for the unit regression tests</bridgehead>
     <para>
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: multimedia/libdriv/gst-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst-plugins-ugly.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/gst-plugins-ugly.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -121,5 +121,5 @@
     <bridgehead renderas="sect4">Optional, for the unit regression tests</bridgehead>
     <para>
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: multimedia/libdriv/gst10-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-bad.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/gst10-plugins-bad.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -113,4 +113,5 @@
       <xref linkend="openjpeg"/>,
       <xref linkend="openssl"/>,
+      <xref linkend="valgrind"/>,
       <xref linkend="xorg7-lib"/>,
       <ulink url="http://celt-codec.org/">Celt</ulink>,
@@ -129,7 +130,6 @@
       <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">VO AAC</ulink>,
       <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">VO AMRWB</ulink>,
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>,
-      <ulink url="http://sourceforge.net/projects/zbar/">ZBAR</ulink>, and
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>, and
+      <ulink url="http://sourceforge.net/projects/zbar/">ZBAR</ulink>
       <!-- Not ported
       <xref linkend="jasper"/>,
Index: multimedia/libdriv/gst10-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-base.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/gst10-plugins-base.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -111,5 +111,5 @@
       <ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>,
       <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>, and
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
Index: multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/gst10-plugins-good.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -112,4 +112,5 @@
       <xref linkend="taglib"/>,
       <xref linkend="udev-extras"/> (for GUdev),
+      <xref linkend="valgrind"/>,
       <ulink url="http://jackaudio.org/">JACK</ulink>,
       <ulink url="http://caca.zoy.org/wiki/libcaca">libcaca</ulink>,
@@ -118,7 +119,6 @@
       <ulink url="http://www.icecast.org/download.php">libshout</ulink>,
       <ulink url="http://code.entropywave.com/orc/">ORC</ulink>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
-      <ulink url="http://wavpack.com/">WavPack</ulink>, and
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>, and
+      <ulink url="http://wavpack.com/">WavPack</ulink>
     </para>
 
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/gstreamer.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -97,5 +97,5 @@
     <para role="optional">
       <xref linkend="gsl"/>,
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
       (optionally used during the unit regression tests)
     </para>
Index: multimedia/libdriv/gstreamer10.xml
===================================================================
--- multimedia/libdriv/gstreamer10.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/gstreamer10.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -93,6 +93,6 @@
     <para role="optional">
       <xref linkend="gsl"/>,
-      <xref linkend="gtk-doc"/> and
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="gtk-doc"/>, and
+      <xref linkend="valgrind"/>
     </para>
 
Index: multimedia/libdriv/libtheora.xml
===================================================================
--- multimedia/libdriv/libtheora.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/libtheora.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -69,12 +69,14 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="sdl"/> and
-    <xref linkend="libpng"/> (both to build the example players),
-    <xref linkend="doxygen"/>,
-    <xref linkend="texlive"/>,
-    <ulink url="http://bibtexml.sourceforge.net">BibTex</ulink>, and
-    <ulink url="http://www.xfig.org/">Transfig</ulink>
-    (all four to build the API documentation),
-    <ulink url="http://www.valgrind.org">Valgrind</ulink></para>
+    <para role="optional">
+      <xref linkend="sdl"/> and
+      <xref linkend="libpng"/> (both to build the example players),
+      <xref linkend="doxygen"/>,
+      <xref linkend="texlive"/>,
+      <ulink url="http://bibtexml.sourceforge.net">BibTex</ulink>, and
+      <ulink url="http://www.xfig.org/">Transfig</ulink>
+      (all four to build the API documentation), and
+      <xref linkend="valgrind"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/pulseaudio.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -111,5 +111,5 @@
       <xref linkend="sbc"/> (Bluetooth support),
       <ulink url="http://tdb.samba.org/">TDB</ulink>,
-      <ulink url="http://valgrind.org/">Valgrind</ulink>,
+      <xref linkend="valgrind"/>
       <ulink url="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/">
       WebRTC AudioProcessing</ulink> and
Index: multimedia/libdriv/speex.xml
===================================================================
--- multimedia/libdriv/speex.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ multimedia/libdriv/speex.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -62,8 +62,12 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libogg"/></para>
+    <para role="required">
+      <xref linkend="libogg"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://valgrind.org/">Valgrind</ulink></para>
+    <para role="optional">
+      <xref linkend="valgrind"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ networking/netprogs/samba.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -87,6 +87,6 @@
       <xref linkend="avahi"/>,
       <ulink url="http://www.openafs.org/">OpenAFS</ulink>, and
-      <ulink url="http://valgrind.org/">Valgrind</ulink> (optionally
-        used by the test suite)</para>
+      <xref linkend="valgrind"/> (optionally used by the test suite)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ postlfs/security/gnutls.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -116,5 +116,5 @@
       <ulink url="http://sourceforge.net/projects/trousers/files/trousers/">Trousers</ulink> (Trusted Platform Module support),
       <xref linkend="unbound"/> (to build the DANE library), and 
-      <ulink url="http://valgrind.org/">Valgrind</ulink> (used during the test suite)
+      <xref linkend="valgrind"/> (used during the test suite)
     </para>
 
Index: x/lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ x/lib/cairo.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -108,6 +108,6 @@
       <xref linkend="mesalib"/>,
       <xref linkend="qt4"/>,
-      <ulink url="http://code.google.com/p/skia/">Skia</ulink> and
-      <ulink url="http://www.valgrind.org">Valgrind</ulink>
+      <ulink url="http://code.google.com/p/skia/">Skia</ulink>, and
+      <xref linkend="valgrind"/>
     </para>
 
Index: x/lib/libdrm.xml
===================================================================
--- x/lib/libdrm.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ x/lib/libdrm.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -85,6 +85,6 @@
       <xref linkend="DocBook"/>,
       <xref linkend="docbook-xsl"/> and
-      <xref linkend="libxslt"/> (to build manual pages) and
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="libxslt"/> (to build manual pages), and
+      <xref linkend="valgrind"/>
     </para>
 
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ xsoft/graphweb/seamonkey.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -111,6 +111,5 @@
       <xref linkend="nss"/>,
       <xref linkend="wireless_tools"/>,
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
-      the jemalloc code), and
+      <xref linkend="valgrind"/> (only for testing the jemalloc code), and
       <xref linkend="wget"/>
     </para>
Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision 88136e4d574fb2ae2b36b9854b77514ab92bffb8)
+++ xsoft/office/abiword.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
@@ -143,5 +143,5 @@
       <ulink url="http://libots.sourceforge.net/">OTS</ulink>
       <ulink url="http://software.frodo.looijaard.name/psiconv/">Psiconv</ulink>, and
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+      <xref linkend="valgrind"/>
     </para>
 
