diff --git a/appendices/udev-rules.xml b/appendices/udev-rules.xml
index 25f41033e..750205686 100644
--- a/appendices/udev-rules.xml
+++ b/appendices/udev-rules.xml
@@ -13,7 +13,7 @@
   <title>Udev configuration rules</title>
 
   <para>The rules in this appendix are listed for convenience.  Installation is
-  normally done via instructions in <xref linkend='ch-system-udev'/>.  </para>
+  normally done via instructions in <xref linkend='ch-system-udev' role='.'/>  </para>
 
   <sect1 id="lfsrules" role="wrap">
     <title>55-lfs.rules</title>
diff --git a/chapter01/askforhelp.xml b/chapter01/askforhelp.xml
index dd36b30fa..7c6032389 100644
--- a/chapter01/askforhelp.xml
+++ b/chapter01/askforhelp.xml
@@ -15,7 +15,7 @@
       In case you've hit an issue building one package with the LFS
       instruction, we strongly discourage posting the issue directly onto
       the upstream support channel before discussing via a LFS support
-      channel listed in <xref linkend="ch-intro-resources"/>.
+      channel listed in <xref linkend="ch-intro-resources" role='.'/>
       Doing so is often quite inefficient because the upstream
       maintainers are rarely familiar with LFS building procedure.  Even if
       you've really hit an upstream issue, the LFS community can still help
diff --git a/chapter02/stages.xml b/chapter02/stages.xml
index aeee2588e..287aa43f4 100644
--- a/chapter02/stages.xml
+++ b/chapter02/stages.xml
@@ -86,7 +86,7 @@
          and, as <systemitem class="username">root</systemitem>, running the
          commands in
          <xref linkend='ch-tools-bindmount'/> and
-         <xref linkend='ch-tools-kernfsmount'/>.</para>
+         <xref linkend='ch-tools-kernfsmount' role='.'/></para>
       </listitem>
     </itemizedlist>
   </sect2>
diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml
index bfa2dafd4..5e2fc972a 100644
--- a/chapter06/introduction.xml
+++ b/chapter06/introduction.xml
@@ -26,6 +26,6 @@
   may render your computer unusable.
   This whole chapter must be done as user <systemitem
   class="username">lfs</systemitem>, with the environment as described in
-  <xref linkend="ch-preps-settingenviron"/>.</para>
+  <xref linkend="ch-preps-settingenviron" role='.'/></para>
 
 </sect1>
diff --git a/chapter07/cleanup.xml b/chapter07/cleanup.xml
index 2bfe68d9e..870ba318e 100644
--- a/chapter07/cleanup.xml
+++ b/chapter07/cleanup.xml
@@ -88,7 +88,8 @@
         make sure you have set <envar>LFS</envar>.
      </para>
      <para>
-        This has been discussed in <xref linkend='ch-partitioning-aboutlfs'/>.
+       This has been discussed in
+       <xref linkend='ch-partitioning-aboutlfs' role='.'/>
       </para>
     </important>
 
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 19cc9674a..a2dbbaf41 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -111,7 +111,7 @@
 mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userinput></screen>
 
   <para>Making your LFS system bootable with GRUB will be discussed in
-  <xref linkend="ch-bootable-grub"/>.</para>
+  <xref linkend="ch-bootable-grub" role='.'/></para>
 
   </sect2>
 
diff --git a/chapter08/shadow.xml b/chapter08/shadow.xml
index 315e3cc5e..de6b05f75 100644
--- a/chapter08/shadow.xml
+++ b/chapter08/shadow.xml
@@ -242,7 +242,8 @@ useradd -D --gid 999</userinput></screen>
           unknown GID 999</computeroutput>,
           even though the account has been created correctly. That is why we
           created the group <systemitem class="groupname">users</systemitem>
-          with this group ID in <xref linkend='ch-tools-createfiles'/>.</para>
+          with this group ID in
+          <xref linkend='ch-tools-createfiles' role='.'/></para>
 
         </listitem>
       </varlistentry>
diff --git a/chapter09/symlinks.xml b/chapter09/symlinks.xml
index dd79b9ffd..cd2d58077 100644
--- a/chapter09/symlinks.xml
+++ b/chapter09/symlinks.xml
@@ -39,7 +39,7 @@
       often have two ethernet connections named eth0 and
       wlan0; such laptops can also use this method.  The command line
       is in the GRUB configuration file.
-      See <xref linkend="grub-cfg"/>.</para>
+      See <xref linkend="grub-cfg" role='.'/></para>
     </sect3>
 
     <sect3>
@@ -219,8 +219,8 @@
 
     <title>Dealing with Duplicate Devices</title>
 
-    <para>As explained in <xref linkend="ch-config-udev"/>, the order in
-    which devices with the same function appear in
+    <para>As explained in <xref linkend="ch-config-udev" role=','/> the
+    order in which devices with the same function appear in
     <filename class="directory">/dev</filename> is essentially random.
     E.g., if you have a USB web camera and a TV tuner, sometimes
     <filename>/dev/video0</filename> refers to the camera and
@@ -229,8 +229,9 @@
     For all classes of hardware except sound cards and network cards, this is
     fixable by creating udev rules to create persistent symlinks.
     The case of network cards is covered separately in
-    <xref linkend="ch-config-network"/>, and sound card configuration can
-    be found in <ulink url="&blfs-book;postlfs/devices.html">BLFS</ulink>.</para>
+    <xref linkend="ch-config-network" role=','/> and sound card
+    configuration can be found in
+    <ulink url="&blfs-book;postlfs/devices.html">BLFS</ulink>.</para>
 
     <para>For each of your devices that is likely to have this problem
     (even if the problem doesn't exist in your current Linux distribution),
diff --git a/chapter09/usage.xml b/chapter09/usage.xml
index 6b5441bba..554affc71 100644
--- a/chapter09/usage.xml
+++ b/chapter09/usage.xml
@@ -254,7 +254,7 @@ EOF</userinput></screen>
       /sys/class/rtc.</para>
 
       <para>For information on kernel module loading and udev, see
-      <xref linkend="module-loading"/>.</para>
+      <xref linkend="module-loading" role='.'/></para>
   </sect2>
 
   <sect2 id="ch-config-clock">
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 6eafeaf27..c1e02129a 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -55,8 +55,8 @@
         LFS editors recommend that users not familiar with this process follow
         the procedures below fairly closely.  The objective is to get an
         initial system to a point where you can log in at the command line when
-        you reboot later in <xref linkend="ch-finish-reboot"/>.  At this point
-        optimization and customization is not a goal.
+        you reboot later in <xref linkend="ch-finish-reboot" role='.'/>
+        At this point optimization and customization is not a goal.
       </para>