diff --git a/documentation/adt-manual/adt-prepare.xml b/documentation/adt-manual/adt-prepare.xml
index 7faf39b9e2..3810568730 100644
--- a/documentation/adt-manual/adt-prepare.xml
+++ b/documentation/adt-manual/adt-prepare.xml
@@ -276,7 +276,7 @@
                             target, go into the <filename>x86_64</filename>
                             folder and download the following installer:
                             <literallayout class='monospaced'>
-     poky-eglibc-x86_64-core-image-sato-i586-toolchain-&DISTRO;.sh
+     poky-glibc-x86_64-core-image-sato-i586-toolchain-&DISTRO;.sh
                             </literallayout></para></listitem>
                         <listitem><para>Build your own toolchain installer.
                             For cases where you cannot use an installer
@@ -296,7 +296,7 @@
                     The example assumes the toolchain installer is located
                     in <filename>~/Downloads/</filename>.
                     <literallayout class='monospaced'>
-     $ ~/Downloads/poky-eglibc-x86_64-core-image-sato-i586-toolchain-&DISTRO;.sh
+     $ ~/Downloads/poky-glibc-x86_64-core-image-sato-i586-toolchain-&DISTRO;.sh
                     </literallayout>
                     The first thing the installer prompts you for is the
                     directory into which you want to install the toolchain.
@@ -656,10 +656,10 @@
             <ulink url='&YOCTO_DOCS_REF_URL;#var-IMAGE_INSTALL'><filename>IMAGE_INSTALL</filename></ulink>
             variable inside your <filename>local.conf</filename> file to
             install the appropriate library packages.
-            Following is an example using <filename>eglibc</filename> static
+            Following is an example using <filename>glibc</filename> static
             development libraries:
             <literallayout class='monospaced'>
-     IMAGE_INSTALL_append = " eglibc-staticdev"
+     IMAGE_INSTALL_append = " glibc-staticdev"
             </literallayout>
         </note>
     </para>
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 524c607855..64504299cc 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -1071,7 +1071,7 @@
                 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-IMAGE_INSTALL'>IMAGE_INSTALL</ulink></filename>
                 variable.
                 You must use the OpenEmbedded notation and not the Debian notation for the names
-                (e.g. <filename>eglibc-dev</filename> instead of <filename>libc6-dev</filename>).
+                (e.g. <filename>glibc-dev</filename> instead of <filename>libc6-dev</filename>).
             </para>
 
             <para>
@@ -3027,7 +3027,7 @@
             <note>
                 Although well within the capabilities of the Yocto Project,
                 adding a totally new architecture might require
-                changes to <filename>gcc/eglibc</filename> and to the site
+                changes to <filename>gcc/glibc</filename> and to the site
                 information, which is beyond the scope of this manual.
             </note>
         </para>
@@ -5911,10 +5911,10 @@ Gateways via their Web Interfaces</ulink>"</emphasis>
                 described here combined with experimentation and iteration.
                 Here are a couple of areas to experiment with:
                 <itemizedlist>
-                    <listitem><para><filename>eglibc</filename>:
+                    <listitem><para><filename>glibc</filename>:
                         In general, follow this process:
                         <orderedlist>
-                            <listitem><para>Remove <filename>eglibc</filename>
+                            <listitem><para>Remove <filename>glibc</filename>
                                 features from
                                 <ulink url='&YOCTO_DOCS_REF_URL;#var-DISTRO_FEATURES'><filename>DISTRO_FEATURES</filename></ulink>
                                 that you think you do not need.</para></listitem>
@@ -5928,7 +5928,7 @@ Gateways via their Web Interfaces</ulink>"</emphasis>
                                 support wide character support as is done for
                                 <filename>ncurses</filename>.
                                 Or, if support for those characters is needed,
-                                determine what <filename>eglibc</filename>
+                                determine what <filename>glibc</filename>
                                 features provide the support and restore the
                                 configuration.
                                 </para></listitem>
@@ -5937,7 +5937,7 @@ Gateways via their Web Interfaces</ulink>"</emphasis>
                         </orderedlist></para></listitem>
                     <listitem><para><filename>busybox</filename>:
                         For BusyBox, use a process similar as described for
-                        <filename>eglibc</filename>.
+                        <filename>glibc</filename>.
                         A difference is you will need to boot the resulting
                         system to see if you are able to do everything you
                         expect from the running system.
diff --git a/documentation/ref-manual/introduction.xml b/documentation/ref-manual/introduction.xml
index f986f7c28e..19e9895ee6 100644
--- a/documentation/ref-manual/introduction.xml
+++ b/documentation/ref-manual/introduction.xml
@@ -398,7 +398,7 @@
                         Execute the installation script.
                         Here is an example:
                         <literallayout class='monospaced'>
-     $ sh poky-eglibc-x86_64-buildtools-tarball-x86_64-buildtools-nativesdk-standalone-&DISTRO;.sh
+     $ sh poky-glibc-x86_64-buildtools-tarball-x86_64-buildtools-nativesdk-standalone-&DISTRO;.sh
                         </literallayout>
                         During execution, a prompt appears that allows you to
                         choose the installation directory.
@@ -484,7 +484,7 @@
                        to install the tools.
                        Here is an example:
                        <literallayout class='monospaced'>
-     $ sh poky-eglibc-x86_64-buildtools-tarball-x86_64-buildtools-nativesdk-standalone-&DISTRO;.sh
+     $ sh poky-glibc-x86_64-buildtools-tarball-x86_64-buildtools-nativesdk-standalone-&DISTRO;.sh
                        </literallayout>
                        During execution, a prompt appears that allows you to
                        choose the installation directory.
diff --git a/documentation/ref-manual/ref-bitbake.xml b/documentation/ref-manual/ref-bitbake.xml
index 28496dec9a..30aff6431f 100644
--- a/documentation/ref-manual/ref-bitbake.xml
+++ b/documentation/ref-manual/ref-bitbake.xml
@@ -169,7 +169,7 @@
             <filename>packagegroup-core-x11-sato</filename>,
             which in turn leads to recipes like <filename>matchbox-terminal</filename>,
             <filename>pcmanfm</filename> and <filename>gthumb</filename>.
-            These recipes in turn depend on <filename>eglibc</filename> and the toolchain.
+            These recipes in turn depend on <filename>glibc</filename> and the toolchain.
         </para>
 
         <para>
diff --git a/documentation/ref-manual/ref-classes.xml b/documentation/ref-manual/ref-classes.xml
index fed25b25e6..2096f2cb53 100644
--- a/documentation/ref-manual/ref-classes.xml
+++ b/documentation/ref-manual/ref-classes.xml
@@ -580,8 +580,8 @@
 
     <para>
         The <filename>debian</filename> class renames output packages so that
-        they follow the Debian naming policy (i.e. <filename>eglibc</filename>
-        becomes <filename>libc6</filename> and <filename>eglibc-devel</filename>
+        they follow the Debian naming policy (i.e. <filename>glibc</filename>
+        becomes <filename>libc6</filename> and <filename>glibc-devel</filename>
         becomes <filename>libc6-dev</filename>.)
         Renaming includes the library name and version as part of the package
         name.
@@ -2797,7 +2797,7 @@
         file.
         Here is an example:
         <literallayout class='monospaced'>
-    RM_WORK_EXCLUDE += "busybox eglibc"
+    RM_WORK_EXCLUDE += "busybox glibc"
         </literallayout>
     </para>
 </section>
diff --git a/documentation/ref-manual/ref-structure.xml b/documentation/ref-manual/ref-structure.xml
index 14419d3a84..e7ca7b334b 100644
--- a/documentation/ref-manual/ref-structure.xml
+++ b/documentation/ref-manual/ref-structure.xml
@@ -695,7 +695,7 @@
         <para>
             This directory receives package licensing information.
             For example, the directory contains sub-directories for <filename>bash</filename>,
-            <filename>busybox</filename>, and <filename>eglibc</filename> (among others) that in turn
+            <filename>busybox</filename>, and <filename>glibc</filename> (among others) that in turn
             contain appropriate <filename>COPYING</filename> license files with other licensing information.
             For information on licensing, see the
             "<ulink url='&YOCTO_DOCS_DEV_URL;#maintaining-open-source-license-compliance-during-your-products-lifecycle'>Maintaining Open Source License Compliance During Your Product's Lifecycle</ulink>"
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index b22c661421..7a56ce323a 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -2290,7 +2290,7 @@
         <glossentry id='var-ENABLE_BINARY_LOCALE_GENERATION'><glossterm>ENABLE_BINARY_LOCALE_GENERATION</glossterm>
             <glossdef>
                 <para>Variable that controls which locales for
-                    <filename>eglibc</filename> are generated during the
+                    <filename>glibc</filename> are generated during the
                     build (useful if the target device has 64Mbytes
                     of RAM or less).</para>
             </glossdef>
@@ -5873,7 +5873,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     Declares the oldest version of the Linux kernel that the
                     produced binaries must support.
                     This variable is passed into the build of the Embedded
-                    GNU C Library (<filename>eglibc</filename>).
+                    GNU C Library (<filename>glibc</filename>).
                 </para>
 
                 <para>
@@ -6476,7 +6476,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
         <glossentry id='var-PF'><glossterm>PF</glossterm>
             <glossdef>
                 <para>Specifies the recipe or package name and includes all version and revision
-                    numbers (i.e. <filename>eglibc-2.13-r20+svnr15508/</filename> and
+                    numbers (i.e. <filename>glibc-2.13-r20+svnr15508/</filename> and
                     <filename>bash-4.2-r1/</filename>).
                     This variable is comprised of the following:
                     <literallayout class='monospaced'>
@@ -8967,7 +8967,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
         <glossentry id='var-TARGET_OS'><glossterm>TARGET_OS</glossterm>
             <glossdef>
                 <para>Specifies the target's operating system.
-                    The variable can be set to "linux" for <filename>eglibc</filename>-based systems and
+                    The variable can be set to "linux" for <filename>glibc</filename>-based systems and
                     to "linux-uclibc" for <filename>uclibc</filename>.
                     For ARM/EABI targets, there are also "linux-gnueabi" and
                     "linux-uclibc-gnueabi" values possible.</para>
@@ -8983,7 +8983,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     supported.
                 </para>
                 <para>
-                    You can select "eglibc" or "uclibc".
+                    You can select "glibc" or "uclibc".
                     <note>
                         This release of the Yocto Project does not support the
                         <filename>glibc</filename> implementation of <filename>libc</filename>.
@@ -9045,7 +9045,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     <link linkend='var-TCLIBC'><filename>TCLIBC</filename></link>,
                     which controls the variant of the GNU standard C library
                     (<filename>libc</filename>) used during the build process:
-                    <filename>eglibc</filename> or <filename>uclibc</filename>.
+                    <filename>glibc</filename> or <filename>uclibc</filename>.
                 </para>
             </glossdef>
         </glossentry>
diff --git a/documentation/ref-manual/technical-details.xml b/documentation/ref-manual/technical-details.xml
index 6bb3381e72..2df36521c2 100644
--- a/documentation/ref-manual/technical-details.xml
+++ b/documentation/ref-manual/technical-details.xml
@@ -107,11 +107,8 @@
         <para>
             BitBake also tries to execute any dependent tasks first.
             So for example, before building <filename>matchbox-desktop</filename>, BitBake
-            would build a cross compiler and <filename>eglibc</filename> if they had not already
+            would build a cross compiler and <filename>glibc</filename> if they had not already
             been built.
-            <note>This release of the Yocto Project does not support the <filename>glibc</filename>
-                GNU version of the Unix standard C library.  By default, the OpenEmbedded build system
-                builds with <filename>eglibc</filename>.</note>
         </para>
 
         <para>
@@ -228,7 +225,7 @@
         The chain of events that occurs when <filename>gcc-cross</filename> is
         bootstrapped is as follows:
         <literallayout class='monospaced'>
-     gcc -> binutils-cross -> gcc-cross-initial -> linux-libc-headers -> eglibc-initial -> eglibc -> gcc-cross -> gcc-runtime
+     gcc -> binutils-cross -> gcc-cross-initial -> linux-libc-headers -> glibc-initial -> glibc -> gcc-cross -> gcc-runtime
         </literallayout>
         <itemizedlist>
             <listitem><para><filename>gcc</filename>:
@@ -251,9 +248,9 @@
             <listitem><para><filename>linux-libc-headers</filename>:
                 Headers needed for the cross-compiler.
                 </para></listitem>
-            <listitem><para><filename>eglibc-initial</filename>:
+            <listitem><para><filename>glibc-initial</filename>:
                 An initial version of the Embedded GLIBC needed to bootstrap
-                <filename>eglibc</filename>.
+                <filename>glibc</filename>.
                 </para></listitem>
             <listitem><para><filename>gcc-cross</filename>:
                 The final stage of the bootstrap process for the
@@ -305,7 +302,7 @@
         Here is the bootstrap process for the relocatable toolchain:
         <literallayout class='monospaced'>
      gcc -> binutils-crosssdk -> gcc-crosssdk-initial -> linux-libc-headers ->
-        eglibc-initial -> nativesdk-eglibc -> gcc-crosssdk -> gcc-cross-canadian
+        glibc-initial -> nativesdk-glibc -> gcc-crosssdk -> gcc-cross-canadian
         </literallayout>
         <itemizedlist>
             <listitem><para><filename>gcc</filename>:
@@ -328,11 +325,11 @@
             <listitem><para><filename>linux-libc-headers</filename>:
                 Headers needed for the cross-compiler.
                 </para></listitem>
-            <listitem><para><filename>eglibc-initial</filename>:
+            <listitem><para><filename>glibc-initial</filename>:
                 An initial version of the Embedded GLIBC needed to bootstrap
-                <filename>nativesdk-eglibc</filename>.
+                <filename>nativesdk-glibc</filename>.
                 </para></listitem>
-            <listitem><para><filename>nativesdk-eglibc</filename>:
+            <listitem><para><filename>nativesdk-glibc</filename>:
                 The Embedded GLIBC needed to bootstrap the
                 <filename>gcc-crosssdk</filename>.
                 </para></listitem>
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index 7a083bc064..d0f0d113da 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -625,7 +625,7 @@
             </para>
 
             <literallayout class='monospaced'>
-     poky-eglibc-<replaceable>host_system</replaceable>-<replaceable>image_type</replaceable>-<replaceable>arch</replaceable>-toolchain-<replaceable>release_version</replaceable>.sh
+     poky-glibc-<replaceable>host_system</replaceable>-<replaceable>image_type</replaceable>-<replaceable>arch</replaceable>-toolchain-<replaceable>release_version</replaceable>.sh
 
      Where:
          <replaceable>host_system</replaceable> is a string representing your development system:
@@ -654,7 +654,7 @@
                 development host system and a i586-tuned target architecture
                 based off the SDK for <filename>core-image-sato</filename>:
                 <literallayout class='monospaced'>
-     poky-eglibc-x86_64-core-image-sato-i586-toolchain-&DISTRO;.sh
+     poky-glibc-x86_64-core-image-sato-i586-toolchain-&DISTRO;.sh
                 </literallayout>
             </para>
 
@@ -683,7 +683,7 @@
 
             <para>
                 <literallayout class='monospaced'>
-     $ ~/Downloads/poky-eglibc-x86_64-core-image-sato-i586-toolchain-&DISTRO;.sh
+     $ ~/Downloads/poky-glibc-x86_64-core-image-sato-i586-toolchain-&DISTRO;.sh
                 </literallayout>
             </para>