Index: BOOK/appendices/dependencies/alpha.xml
===================================================================
--- BOOK/appendices/dependencies/alpha.xml	(revision 2b6aa156056fc4e6cf1b088ab3c13a74a0fd4e00)
+++ BOOK/appendices/dependencies/alpha.xml	(revision bca3bb10edeeb4a7aba7960397234781eda6e183)
@@ -21,5 +21,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, ELFtoaut, GCC, Glibc,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, ELFtoaut, GCC,
          Grep, Make, Ncurses, Sed and Patch</seg>
         </seglistitem>
Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision 2b6aa156056fc4e6cf1b088ab3c13a74a0fd4e00)
+++ BOOK/appendices/dependencies/common.xml	(revision bca3bb10edeeb4a7aba7960397234781eda6e183)
@@ -95,5 +95,5 @@
 
         <seglistitem>
-          <seg>Bash, Bison, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, Make,
+          <seg>Bash, Bison, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, Make,
           Ncurses, Patch, Readline, Sed and Texinfo</seg>
         </seglistitem>
@@ -123,5 +123,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, GCC, Glibc,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, File, Gawk, GCC,
          Grep, Make, Perl, Sed, Texinfo and Zlib</seg>
         </seglistitem>
@@ -151,5 +151,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC,
          Grep, M4, Make and Sed</seg>
         </seglistitem>
@@ -179,5 +179,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -233,5 +233,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, GMP, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, GMP, Grep, Make,
          Patch, Perl, Sed and Texinfo</seg>
         </seglistitem>
@@ -315,5 +315,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
          Make, Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -325,4 +325,32 @@
         <seglistitem>
           <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin EGLIBC dependency info -->
+  <bridgehead renderas="sect2" id="eglibc-dep">EGLIBC</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Gettext,
+         Grep, Gzip, Make, Perl, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -343,5 +371,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep, Make,
          Patch, Sed and Tcl</seg>
         </seglistitem>
@@ -371,5 +399,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Gettext, Glibc, Grep, Gzip,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gettext, Grep, Gzip,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -399,5 +427,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
          Make, Sed and Zlib</seg>
         </seglistitem>
@@ -427,5 +455,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -455,5 +483,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, M4, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, M4, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -483,5 +511,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -510,6 +538,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Glibc, GMP, Grep, Make, MPFR, Patch, Perl, Sed, Tar and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
+         GCC, GMP, Grep, Make, MPFR, Patch, Perl, Sed, Tar and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -538,6 +566,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Glibc, Grep, Make, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
+         GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -556,32 +584,4 @@
         <seglistitem>
           <seg>Automake</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Glibc dependency info -->
-  <bridgehead renderas="sect2" id="glibc-dep">Glibc</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Gettext,
-         Grep, Gzip, Make, Perl, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -594,5 +594,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, M4, Make,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, M4, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -622,5 +622,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
          Make, Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -650,5 +650,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Perl
+         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep, Make, Perl
          Sed and Texinfo</seg>
         </seglistitem>
@@ -678,5 +678,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -733,5 +733,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Findutils, Flex, GCC, Glibc,
+         <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, Findutils, Flex, GCC,
          Make, Linux-Headers and Sed</seg>
         </seglistitem>
@@ -761,5 +761,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc and Make</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC and Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -788,5 +788,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Gzip, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gzip, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -815,5 +815,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
          Ncurses and Sed</seg>
         </seglistitem>
@@ -843,6 +843,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC, Glibc, Grep,
-         Make, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
+         GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -898,5 +898,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, GCC, Grep,
          Gzip, Make, Module-Init-Tools, Ncurses, Perl and Sed</seg>
         </seglistitem>
@@ -926,5 +926,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Sed
+         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep, Make, Sed
          and Texinfo</seg>
         </seglistitem>
@@ -954,5 +954,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -982,6 +982,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bzip2, Coreutils, Gawk, GCC,
-         Glibc, Grep, Groff, Gzip, Less, XZ-Utils, Make and Sed</seg>
+         <seg>Bash, Binutils, Bzip2, Coreutils, EGLIBC, Gawk, GCC,
+         Grep, Groff, Gzip, Less, XZ-Utils, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1037,5 +1037,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, GMP,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, GMP,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -1065,5 +1065,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Findutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, Findutils, GCC, Grep, Make,
          Sed and Zlib</seg>
         </seglistitem>
@@ -1093,5 +1093,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1122,5 +1122,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1149,5 +1149,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1177,5 +1177,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make and Ncurses</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make and Ncurses</seg>
         </seglistitem>
       </segmentedlist>
@@ -1204,5 +1204,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Ncurses
          and Sed</seg>
         </seglistitem>
@@ -1232,5 +1232,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Ncurses,
          Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -1260,5 +1260,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, Make
+         <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, Make
          and Sed</seg>
         </seglistitem>
@@ -1288,5 +1288,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -1316,6 +1316,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Gettext, Glibc, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk, GCC,
+         Gettext, Grep, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1344,5 +1344,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Glibc, Make and Sed</seg>
+         <seg>Binutils, Coreutils, EGLIBC, GCC, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1371,5 +1371,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, GCC, Glibc,
+         <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, GCC,
          Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -1399,5 +1399,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1427,5 +1427,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Grep, Make,
          Ncurses and Sed</seg>
         </seglistitem>
@@ -1455,5 +1455,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+         <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1483,5 +1483,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, E2fprogs, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, E2fprogs, EGLIBC, GCC, Grep,
          Make, Ncurses, Sed, Texinfo and Zlib</seg>
         </seglistitem>
@@ -1511,6 +1511,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Gettext, Glibc, Grep, Make, Ncurses, Perl and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk, GCC,
+         Gettext, Grep, Make, Ncurses, Perl and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1539,6 +1539,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Glibc, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk, GCC,
+         Grep, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1567,5 +1567,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/appendices/dependencies/sparc.xml
===================================================================
--- BOOK/appendices/dependencies/sparc.xml	(revision 2b6aa156056fc4e6cf1b088ab3c13a74a0fd4e00)
+++ BOOK/appendices/dependencies/sparc.xml	(revision bca3bb10edeeb4a7aba7960397234781eda6e183)
@@ -48,5 +48,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Elftoaout, Gawk, GCC, Glibc, Grep, Gzip,
+         <seg>Binutils, Coreutils, EGLIBC, Elftoaout, Gawk, GCC, Grep, Gzip,
          Make, Patch and Sed</seg>
         </seglistitem>
Index: BOOK/appendices/dependencies/x86.xml
===================================================================
--- BOOK/appendices/dependencies/x86.xml	(revision 2b6aa156056fc4e6cf1b088ab3c13a74a0fd4e00)
+++ BOOK/appendices/dependencies/x86.xml	(revision bca3bb10edeeb4a7aba7960397234781eda6e183)
@@ -21,5 +21,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep, Make,
          Ncurses, Sed and Texinfo</seg>
         </seglistitem>
Index: BOOK/appendices/dependencies/x86_64-64.xml
===================================================================
--- BOOK/appendices/dependencies/x86_64-64.xml	(revision 2b6aa156056fc4e6cf1b088ab3c13a74a0fd4e00)
+++ BOOK/appendices/dependencies/x86_64-64.xml	(revision bca3bb10edeeb4a7aba7960397234781eda6e183)
@@ -21,5 +21,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make and Patch</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make and Patch</seg>
         </seglistitem>
       </segmentedlist>
@@ -48,5 +48,5 @@
 
         <seglistitem>
-         <seg>Bash, Bin86, Binutils, Coreutils, GCC, Glibc, Make and Sed</seg>
+         <seg>Bash, Bin86, Binutils, Coreutils, EGLIBC, GCC, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
