diff --git a/general/prog/valgrind.xml b/general/prog/valgrind.xml
index c267fca56c..d9286f102b 100644
--- a/general/prog/valgrind.xml
+++ b/general/prog/valgrind.xml
@@ -77,21 +77,20 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="boost"/>,
-      <xref linkend="llvm"/> (with Clang),
-      <xref linkend="gdb"/> (for tests), 
-      <xref linkend="which"/> (for tests), 
       <xref linkend="bind"/> or <xref linkend="bind-utils"/> (for tests), 
-      and
-      <ulink url="http://www.openmp.org">OpenMP</ulink>
+      <xref linkend="boost"/>,
+      <xref linkend="gdb"/> (for tests), 
+      <xref linkend="llvm"/> (with Clang), and
+      <xref linkend="which"/> (for tests)
     </para>
 
+<!-- See "maintainer note", below
     <bridgehead renderas="sect4">Optional for regenerating the documentation</bridgehead>
     <para role="optional">
       <xref linkend="libxslt"/> and
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/valgrind"/>
     </para>
@@ -134,18 +133,37 @@ make</userinput></screen>
      </para>
     </note>
 
-
     <para>
       To test the results, issue: <command>make regtest</command>. The tests
-      may hang forever if <xref linkend="gdb"/> is not installed.
-    </para>
-<!--  Note to maintainer: Recheck when next texlive (2015) is released.
-    <para>
-      If you wish to regenerate the documentation, run:
+      may hang forever if <xref linkend="gdb"/> is not installed. Some tests
+      are known to hang also, depending on the version of glibc. Problematic
+      tests can be disabled by changing the <userinput>prereq:</userinput> line
+      in the correponding <filename>.vgtest</filename> file to
+      <userinput>prereq: false</userinput>. For example:
     </para>
 
-<screen><userinput>make -C docs download-docs</userinput></screen>
--->
+<!-- For valgrind-3.12.0, the pth_cond_destroy_busy test hangs forever because
+     of some change in glibc-2.25. Should be fixed in next versions of
+     valgrind.-->
+<screen><userinput>sed -e 's@prereq:.*@prereq: false@' \
+    -i {helgrind,drd}/tests/pth_cond_destroy_busy.vgtest</userinput></screen>
+
+    <note>
+      <para>
+        The <application>OpenMP</application> tests are skipped if libgomp
+        has been compiled with <option>--enable-linux-futex</option> (the
+        default). If needed, just recompile the libgomp library from
+        the gcc build tree, passing <option>--disable-linux-futex</option>
+        to configure, storing the library to some place and changing the link
+        from <filename>/usr/lib/libgomp.so.1</filename> to point to the new
+        library.
+      </para>
+    </note>
+
+<!--  Note to maintainer: there is a long thread in ticket #5882 explaining
+      why we do not provide instructions to rebuild the documentation.
+      (still broken with TeXLive 2016) -->
+
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>