Index: postlfs/editors/gedit.xml
===================================================================
--- postlfs/editors/gedit.xml	(revision 4ad8ef421191ab4747b206ffa6122108665942d9)
+++ postlfs/editors/gedit.xml	(revision 96e9478c767667b9b7564dad4e1cab471cd77dea)
@@ -83,5 +83,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gvfs"/> (runtime),
+      <xref role="runtime" linkend="gvfs"/> (runtime),
       <xref linkend="iso-codes"/>,
       <xref linkend="libsoup"/>, and
Index: postlfs/editors/mousepad.xml
===================================================================
--- postlfs/editors/mousepad.xml	(revision 4ad8ef421191ab4747b206ffa6122108665942d9)
+++ postlfs/editors/mousepad.xml	(revision 96e9478c767667b9b7564dad4e1cab471cd77dea)
@@ -83,5 +83,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend='dconf'/> (runtime) and
+      <xref role="runtime" linkend='dconf'/> (runtime) and
       <xref linkend="dbus-glib"/>
     </para>
Index: postlfs/filesystems/initramfs.xml
===================================================================
--- postlfs/filesystems/initramfs.xml	(revision 4ad8ef421191ab4747b206ffa6122108665942d9)
+++ postlfs/filesystems/initramfs.xml	(revision 96e9478c767667b9b7564dad4e1cab471cd77dea)
@@ -366,5 +366,5 @@
 
     <para role="required">
-      <xref linkend="cpio"/>
+      <xref role="runtime" linkend="cpio"/>
     </para>
 
Index: postlfs/filesystems/smartmontools.xml
===================================================================
--- postlfs/filesystems/smartmontools.xml	(revision 4ad8ef421191ab4747b206ffa6122108665942d9)
+++ postlfs/filesystems/smartmontools.xml	(revision 96e9478c767667b9b7564dad4e1cab471cd77dea)
@@ -65,11 +65,11 @@
     <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
     <para role="optional">
-      <xref linkend="curl"/> or
-      <xref linkend="lynx"/> or
-      <xref linkend="wget"/> (download tools)
+      <xref role="runtime" linkend="curl"/> or
+      <xref role="runtime" linkend="lynx"/> or
+      <xref role="runtime" linkend="wget"/> (download tools)
     </para>
 
     <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gptdisk"/>
+      User Notes: <ulink url="&blfs-wiki;/smartmontools"/>
     </para>
   </sect2>
Index: postlfs/security/cacerts.xml
===================================================================
--- postlfs/security/cacerts.xml	(revision 4ad8ef421191ab4747b206ffa6122108665942d9)
+++ postlfs/security/cacerts.xml	(revision 96e9478c767667b9b7564dad4e1cab471cd77dea)
@@ -91,7 +91,9 @@
    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
     <para role="optional">
-    <xref linkend="java"/> or <xref linkend="openjdk"/>,
-    <xref linkend="nss"/>, and
-    <xref linkend="p11-kit"/></para>
+      <xref role="runtime" linkend="java"/> or
+      <xref role="runtime" linkend="openjdk"/>,
+      <xref role="runtime" linkend="nss"/>, and
+      <xref role="runtime" linkend="p11-kit"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: postlfs/security/nss.xml
===================================================================
--- postlfs/security/nss.xml	(revision 4ad8ef421191ab4747b206ffa6122108665942d9)
+++ postlfs/security/nss.xml	(revision 96e9478c767667b9b7564dad4e1cab471cd77dea)
@@ -103,5 +103,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="sqlite"/> and <xref linkend="p11-kit"/> (runtime)
+      <xref linkend="sqlite"/> and
+      <xref role="runtime" linkend="p11-kit"/> (runtime)
     </para>
 
Index: postlfs/security/openssh.xml
===================================================================
--- postlfs/security/openssh.xml	(revision 4ad8ef421191ab4747b206ffa6122108665942d9)
+++ postlfs/security/openssh.xml	(revision 96e9478c767667b9b7564dad4e1cab471cd77dea)
@@ -105,7 +105,7 @@
     <bridgehead renderas="sect4">Optional Runtime (Used only to gather entropy)</bridgehead>
     <para role="optional">
-      <xref linkend="openjdk"/>,
-      <xref linkend="net-tools"/>, and
-      <xref linkend="sysstat"/>
+      <xref role="runtime" linkend="openjdk"/>,
+      <xref role="runtime" linkend="net-tools"/>, and
+      <xref role="runtime" linkend="sysstat"/>
     </para>
 
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision 4ad8ef421191ab4747b206ffa6122108665942d9)
+++ postlfs/security/polkit.xml	(revision 96e9478c767667b9b7564dad4e1cab471cd77dea)
@@ -116,5 +116,5 @@
     <bridgehead renderas="sect4" revision="systemd">Required Runtime Dependencies</bridgehead>
     <para role="required" revision="systemd">
-      <xref linkend="systemd"/>
+      <xref role="runtime" linkend="systemd"/>
     </para>
 
Index: postlfs/security/ssh-askpass.xml
===================================================================
--- postlfs/security/ssh-askpass.xml	(revision 4ad8ef421191ab4747b206ffa6122108665942d9)
+++ postlfs/security/ssh-askpass.xml	(revision 96e9478c767667b9b7564dad4e1cab471cd77dea)
@@ -80,8 +80,9 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="gtk2"/>,
-    <xref linkend="sudo"/> (runtime),
-    <xref linkend="xorg7-lib"/>, and
-    <xref linkend="x-window-system"/> (runtime)</para>
+      <xref linkend="gtk2"/>,
+      <xref role="runtime" linkend="sudo"/> (runtime),
+      <xref linkend="xorg7-lib"/>, and
+      <xref role="runtime" linkend="x-window-system"/> (runtime)
+    </para>
 
     <para condition="html" role="usernotes">
