diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index fce89c315..b89790c71 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -645,7 +645,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
         locale, localedef, makedb, mtrace,
         pcprofiledump, pldd, sln, sotruss, sprof, tzselect, xtrace,
         zdump, and zic</seg>
-        <seg>ld-linux-x86-64.so.2, ld-linux.so.2,
+        <seg>ld.so.1, ld-linux-mipsn8.so.1
         libBrokenLocale.{a,so}, libanl.{a,so},
         libc.{a,so}, libc_nonshared.a, libc_malloc_debug.so,
         libdl.{a,so.2}, libg.a, libm.{a,so},
diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index 7615f4562..8c0adfd61 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -142,16 +142,18 @@ su tester -c "make -k check"</userinput></screen>
         chmem, choom, chrt, col, colcrt, colrm, column, ctrlaltdel, delpart, dmesg,
         eject, fallocate, fdisk, fincore, findfs, findmnt, flock, fsck,
         fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hardlink, hexdump, hwclock,
-        i386 (link to setarch), ionice, ipcmk, ipcrm, ipcs, irqtop, isosize, kill, last, 
+        ionice, ipcmk, ipcrm, ipcs, irqtop, isosize, kill, last, 
         lastb (link to last), ldattach, linux32 (link to setarch), linux64 (link to setarch),
         logger, look, losetup, lsblk, lscpu, lsipc, lsirq, lsfd, lslocks, lslogins,
-        lsmem, lsns, mcookie, mesg, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
+        lsmem, lsns, mcookie, mesg, mips (link to setarch), mips32 (link
+        to setarch), mips64 (link to setarch), mkfs, mkfs.bfs, mkfs.cramfs,
+        mkfs.minix, mkswap,
         more, mount, mountpoint, namei, nsenter, partx, pivot_root, prlimit,
         readprofile, rename, renice, resizepart, rev, rfkill, rtcwake, script,
         scriptlive, scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
         swapoff, swapon, switch_root, taskset, uclampset, ul,
         umount, uname26 (link to setarch), unshare, utmpdump, uuidd, uuidgen, uuidparse,
-        wall, wdctl, whereis, wipefs, x86_64 (link to setarch), and zramctl</seg>
+        wall, wdctl, whereis, wipefs, and zramctl</seg>
         <seg>libblkid.so, libfdisk.so, libmount.so,
         libsmartcols.so, and libuuid.so</seg>
         <seg>/usr/include/blkid,
@@ -534,16 +536,6 @@ su tester -c "make -k check"</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="i386">
-        <term><command>i386</command></term>
-        <listitem>
-          <para>A symbolic link to setarch</para>
-          <indexterm zone="ch-system-util-linux i386">
-            <primary sortas="b-i386">i386</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="ionice">
         <term><command>ionice</command></term>
         <listitem>
@@ -814,6 +806,36 @@ su tester -c "make -k check"</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="mips">
+        <term><command>mips</command></term>
+        <listitem>
+          <para>A symbolic link to setarch</para>
+          <indexterm zone="ch-system-util-linux mips">
+            <primary sortas="b-mips">mips</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mips32">
+        <term><command>mips32</command></term>
+        <listitem>
+          <para>A symbolic link to setarch</para>
+          <indexterm zone="ch-system-util-linux mips32">
+            <primary sortas="b-mips32">mips32</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mips64">
+        <term><command>mips64</command></term>
+        <listitem>
+          <para>A symbolic link to setarch</para>
+          <indexterm zone="ch-system-util-linux mips64">
+            <primary sortas="b-mips64">mips64</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="mkfs">
         <term><command>mkfs</command></term>
         <listitem>
@@ -1295,16 +1317,6 @@ su tester -c "make -k check"</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="x86_64">
-        <term><command>x86_64</command></term>
-        <listitem>
-          <para>A symbolic link to setarch</para>
-          <indexterm zone="ch-system-util-linux x86_64">
-            <primary sortas="b-x86_64">x86_64</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="zramctl">
         <term><command>zramctl</command></term>
         <listitem>