5 files changed, 10 insertions, 7 deletions
diff --git a/en/boot-installer/arm.xml b/en/boot-installer/arm.xml
index 8562557de..bd8ee2782 100644
--- a/en/boot-installer/arm.xml
+++ b/en/boot-installer/arm.xml
@@ -127,7 +127,7 @@
   </sect2>
 
 
-  <sect2 arch="arm" id="boot-tftp"><title>Booting by TFTP</title>
+  <sect2 arch="arm" id="boot-tftp-arm"><title>Booting by TFTP</title>
 
 &boot-installer-intro-net.xml;
 
@@ -261,7 +261,7 @@ source ${scriptaddr}
   </sect2> 
 
 
-  <sect2 arch="arm64" condition="bootable-usb" id="usb-boot">
+  <sect2 arch="arm64" condition="bootable-usb" id="usb-boot-arm64">
   <title>Booting from USB Memory Stick with UEFI</title>
 
 &boot-installer-intro-usb.xml;
diff --git a/en/boot-installer/intro-cd.xml b/en/boot-installer/intro-cd.xml
index 7caf6d901..6712f7e0f 100644
--- a/en/boot-installer/intro-cd.xml
+++ b/en/boot-installer/intro-cd.xml
@@ -7,7 +7,7 @@ If you have a CD set, and if your machine supports booting directly
 off the CD, great!  Simply
 <phrase arch="x86">
 configure your system for booting off a CD as described in
-<xref linkend="boot-dev-select"/>,
+<xref linkend="boot-dev-select-x86"/>,
 </phrase>
 insert your CD, reboot, and proceed to the next chapter.
 
diff --git a/en/boot-installer/intro-usb.xml b/en/boot-installer/intro-usb.xml
index 243e7b927..c1d2604df 100644
--- a/en/boot-installer/intro-usb.xml
+++ b/en/boot-installer/intro-usb.xml
@@ -4,7 +4,10 @@
 <para>
 If your computer will boot from USB, this will probably be the easiest
 route for installation. Assuming you have prepared everything from
-<xref linkend="boot-dev-select"/> and <xref
+<phrase
+arch="any-x86"><xref linkend="boot-dev-select-x86"/></phrase><phrase
+arch="arm64"><xref linkend="boot-dev-select-arm64"/></phrase>
+and <xref
 linkend="boot-usb-files"/>, just plug your USB stick into some free
 USB connector and reboot the computer.  The system should boot up, and
 unless you have used the flexible way to build the stick and not
diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml
index c0a03bb82..ff8a74184 100644
--- a/en/howto/installation-howto.xml
+++ b/en/howto/installation-howto.xml
@@ -164,12 +164,12 @@ sticks. For details, see <xref linkend="boot-usb-files" />.
 Some BIOSes can boot USB storage directly, and some cannot. You may need to
 configure your BIOS to boot from a <quote>removable drive</quote> or even a
 <quote>USB-ZIP</quote> to get it to boot from the USB device. For helpful
-hints and details, see <xref linkend="usb-boot" />.
+hints and details, see <xref linkend="usb-boot-x86" />.
 
 </para><para arch="powerpc">
 
 Booting Macintosh systems from USB storage devices involves manual use
-of Open Firmware. For directions, see <xref linkend="usb-boot" />.
+of Open Firmware. For directions, see <xref linkend="usb-boot-powerpc" />.
 
 </para>
   </sect2>
diff --git a/en/preparing/bios-setup/i386.xml b/en/preparing/bios-setup/i386.xml
index 5212b426d..4c50c1e2c 100644
--- a/en/preparing/bios-setup/i386.xml
+++ b/en/preparing/bios-setup/i386.xml
@@ -17,7 +17,7 @@ stating which key to press to enter the setup screen.
 </para>
   </sect2>
   
-  <sect2 arch="any-x86" id="boot-dev-select-i386"><title>Boot Device Selection</title>
+  <sect2 arch="any-x86" id="boot-dev-select-x86"><title>Boot Device Selection</title>
 
 <para>