diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 39973d6d1..eaa4add22 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,17 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-06-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - If installing individual locales, add 9 more
+          used by libstdc++-v3 tests. Fixes
+          <ulink url="&lfs-ticket-root;4877">#4877</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2021-06-27</para>
       <itemizedlist>
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index d47590436..28a39a770 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -121,10 +121,15 @@ su tester -c "PATH=$PATH make -k check"</userinput></screen>
     url="&test-results;"/> and
     <ulink url="https://gcc.gnu.org/ml/gcc-testresults/"/>.</para>
 
-    <para>Six tests related to get_time are known to fail.  These are
-    apparently related to the en_HK locale.</para>
+    <para>In g++, three tests in constexpr-52830 are known to fail and
+    also to be treated as unexpected successes (XPASS) even though they
+    report 'internal compiler error'.</para>
 
-    <para>Additionally, three tests in constexpr-52830 are known to fail.</para>
+    <!--  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96322
+          https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71367 -->
+    <para>In libstdc++, one numpunct test and six tests related to get_time are
+    known to fail.  These are all because the locale definitions in glibc have
+    changed and the tests do not currently support those changes.</para>
 
 <!--<para>Additionally the following tests related to the following files
     are known to fail with glibc-2.33: asan_test.C, co-ret-17-void-ret-coro.C, 
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 5beb709c9..9a3c45a04 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -258,26 +258,35 @@ localedef -i de_DE -f ISO-8859-1 de_DE
 localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
 localedef -i de_DE -f UTF-8 de_DE.UTF-8
 localedef -i el_GR -f ISO-8859-7 el_GR
+localedef -i en_GB -f ISO-8859-1 en_GB
 localedef -i en_GB -f UTF-8 en_GB.UTF-8
 localedef -i en_HK -f ISO-8859-1 en_HK
 localedef -i en_PH -f ISO-8859-1 en_PH
 localedef -i en_US -f ISO-8859-1 en_US
 localedef -i en_US -f UTF-8 en_US.UTF-8
+localedef -i es_ES -f ISO-8859-15 es_ES@euro
 localedef -i es_MX -f ISO-8859-1 es_MX
 localedef -i fa_IR -f UTF-8 fa_IR
 localedef -i fr_FR -f ISO-8859-1 fr_FR
 localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
 localedef -i fr_FR -f UTF-8 fr_FR.UTF-8
+localedef -i is_IS -f ISO-8859-1 is_IS
+localedef -i is_IS -f UTF-8 is_IS.UTF-8
 localedef -i it_IT -f ISO-8859-1 it_IT
+localedef -i it_IT -f ISO-8859-15 it_IT@euro
 localedef -i it_IT -f UTF-8 it_IT.UTF-8
 localedef -i ja_JP -f EUC-JP ja_JP
 localedef -i ja_JP -f SHIFT_JIS ja_JP.SIJS 2> /dev/null || true
 localedef -i ja_JP -f UTF-8 ja_JP.UTF-8
+localedef -i nl_NL@euro -f ISO-8859-15 nl_NL@euro
 localedef -i ru_RU -f KOI8-R ru_RU.KOI8-R
 localedef -i ru_RU -f UTF-8 ru_RU.UTF-8
+localedef -i se_NO -f UTF-8 se_NO.UTF-8
+localedef -i ta_IN -f UTF-8 ta_IN.UTF-8
 localedef -i tr_TR -f UTF-8 tr_TR.UTF-8
 localedef -i zh_CN -f GB18030 zh_CN.GB18030
-localedef -i zh_HK -f BIG5-HKSCS zh_HK.BIG5-HKSCS</userinput></screen>
+localedef -i zh_HK -f BIG5-HKSCS zh_HK.BIG5-HKSCS
+localedef -i zh_TW -f UTF-8 zh_TW.UTF-8</userinput></screen>
 
     <para>In addition, install the locale for your own country, language and
     character set.</para>