Index: pst/printing/cups-filters.xml
===================================================================
--- pst/printing/cups-filters.xml	(revision 1051f94edfdf66e0d42766be9cf9e784a647a77f)
+++ pst/printing/cups-filters.xml	(revision f5cdf4111a7d4b5473b3df3cd5f740fcad4675e8)
@@ -108,4 +108,5 @@
     <para role="optional">
       <xref linkend="avahi"/>,
+      <xref linkend="dejavu-fonts"/> (required for the tests),
       <xref linkend="openldap"/>,
       <xref linkend="php"/> (use of this might be broken),
@@ -116,7 +117,6 @@
     <bridgehead renderas="sect4">Optional printer drivers (runtime)</bridgehead>
     <para role="optional">
-      <xref linkend="dejavu-fonts"/> (required for the tests), and
-      <xref linkend="gutenprint"/> (for supported printers),
-      or other printer drivers, such as <ulink
+      <xref role="runtime" linkend="gutenprint"/> (for supported printers),
+      or other printer drivers, such as <ulink role="runtime"
       url="http://sourceforge.net/projects/hplip/files/hplip/">hplip</ulink>
     </para>
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision 1051f94edfdf66e0d42766be9cf9e784a647a77f)
+++ pst/printing/gutenprint.xml	(revision f5cdf4111a7d4b5473b3df3cd5f740fcad4675e8)
@@ -83,5 +83,6 @@
       For the Sinfonia S6145 and the Ciaat Brava 21, <ulink
       url="http://git.shaftnet.org/cgit/selphy_print.git/tree/lib6145">libS6145ImageReProcess</ulink>,
-      see <ulink url="http://www.peachyphotos.com/blog/posts/201601301524-sinfonia-chc-s6145-cs2-and-ciaat-brava-21-revited/">Peachy
+      see <ulink role="nodep" 
+      url="http://www.peachyphotos.com/blog/posts/201601301524-sinfonia-chc-s6145-cs2-and-ciaat-brava-21-revited/">Peachy
       Photos (Sinfonia)</ulink> for instructions on how to build and test this.
     </para>
@@ -90,6 +91,8 @@
       For the Mitsubishi D70 family and the similar Kodak 305, <ulink
       url="http://git.shaftnet.org/cgit/selphy_print.git/tree/lib70x">libMitsuD70ImageReProcess</ulink>,
-      see <ulink url="http://www.peachyphotos.com/blog/posts/201610061508-mitsubishi-cp-d70-family-working/">Peachy
-      Photos (Mitsubishi CP-D70)</ulink> for instructions on how to build and test this.
+      see <ulink role="nodep"
+      url="http://www.peachyphotos.com/blog/posts/201610061508-mitsubishi-cp-d70-family-working/">Peachy
+      Photos (Mitsubishi CP-D70)</ulink> for instructions on how to build and
+      test this.
     </para>
 
Index: pst/ps/mupdf.xml
===================================================================
--- pst/ps/mupdf.xml	(revision 1051f94edfdf66e0d42766be9cf9e784a647a77f)
+++ pst/ps/mupdf.xml	(revision f5cdf4111a7d4b5473b3df3cd5f740fcad4675e8)
@@ -106,5 +106,5 @@
     <para role="optional">
       <xref linkend="openssl"/>,
-      <xref linkend="xdg-utils"/> (runtime),
+      <xref role="runtime" linkend="xdg-utils"/> (runtime),
       <ulink url="http://www.glfw.org/">GLFW</ulink>, and
       <ulink url="http://downloads.ghostscript.com/public/jbig2dec/">jbig2dec</ulink>
@@ -113,5 +113,5 @@
     <bridgehead renderas="sect4">Required (runtime)</bridgehead>
     <para role="required">
-      <xref linkend="x-window-system"/>
+      <xref role="runtime" linkend="x-window-system"/>
     </para>
 
Index: pst/sgml/docbook-utils.xml
===================================================================
--- pst/sgml/docbook-utils.xml	(revision 1051f94edfdf66e0d42766be9cf9e784a647a77f)
+++ pst/sgml/docbook-utils.xml	(revision f5cdf4111a7d4b5473b3df3cd5f740fcad4675e8)
@@ -81,8 +81,9 @@
     <bridgehead renderas="sect4">Optional (Runtime Dependencies Only)</bridgehead>
     <para role="optional">
-      <xref linkend="perl-sgmlspm"/> (for conversion to man and texinfo), and
-      <xref linkend="lynx"/> or
-      <xref linkend="Links"/> or
-      <xref linkend="w3m"/> (for conversion to ASCII text)
+      <xref role="runtime" linkend="perl-sgmlspm"/> (for conversion to man and
+      texinfo), and
+      <xref role="runtime" linkend="lynx"/> or
+      <xref role="runtime" linkend="Links"/> or
+      <xref role="runtime" linkend="w3m"/> (for conversion to ASCII text)
     </para>
 
Index: pst/typesetting/asymptote.xml
===================================================================
--- pst/typesetting/asymptote.xml	(revision 1051f94edfdf66e0d42766be9cf9e784a647a77f)
+++ pst/typesetting/asymptote.xml	(revision f5cdf4111a7d4b5473b3df3cd5f740fcad4675e8)
@@ -99,6 +99,6 @@
       <ulink url="http://www.linuxfromscratch.org/patches/downloads/Imaging/Imaging-1.1.7-freetype_fix-1.patch">Imaging-1.1.7-freetype_fix-1.patch</ulink>
       and has a build dependency of
-      <xref linkend="python2"/> (re-) compiled against <xref linkend="tk"/>
-      to provide <filename>_tkinter.so</filename>
+      <xref role="nodep" linkend="python2"/> (re-) compiled against
+      <xref role="nodep" linkend="tk"/> to provide <filename>_tkinter.so</filename>
     </para>
 
Index: pst/typesetting/tl-installer.xml
===================================================================
--- pst/typesetting/tl-installer.xml	(revision 1051f94edfdf66e0d42766be9cf9e784a647a77f)
+++ pst/typesetting/tl-installer.xml	(revision f5cdf4111a7d4b5473b3df3cd5f740fcad4675e8)
@@ -95,14 +95,15 @@
     </para>
     <para role="recommended">
-      <xref linkend="gs"/> is dynamically loaded by dvisvgm, which is used by
+      <xref role="runtime" linkend="gs"/> is dynamically loaded by dvisvgm, which is used by
      <application>asy</application>.
     </para>
     <para role="recommended">
-      <xref linkend="xorg7-lib"/> and
-      <xref linkend="libxcb"/> are needed for inimf, mf, pdfclose, pdfopen and
-      xdvi-xaw. But if you are using asy, or using a <application>TeX</application>
-      engine to create a PDF file, you will need an <xref linkend="x-window-system"/>
-      (for PDF files, this is to support a PDF viewer of your choice, for example
-       <xref linkend="epdfview"/>).
+      <xref role="runtime" linkend="xorg7-lib"/> and
+      <xref role="runtime" linkend="libxcb"/> are needed for inimf, mf,
+      pdfclose, pdfopen and xdvi-xaw. But if you are using asy, or using a
+      <application>TeX</application> engine to create a PDF file, you will
+      need an <xref role="runtime" linkend="x-window-system"/> (for PDF files,
+      this is to support a PDF viewer of your choice, for example
+       <xref role="nodep" linkend="epdfview"/>).
     </para>
     <para role="recommended">
