Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision c9629e0347e07b757b2cf7e1fb51cb6c19c00c56)
+++ chapter01/changelog.xml	(revision 102a7f64c074baa465314620e2798d4031419fae)
@@ -40,4 +40,19 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
+    <listitem>
+      <para>2022-03-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Stop changing the owner of
+          <filename class='directory'>$LFS/source</filename> to
+          <systemitem class='username'>lfs</systemitem>. Fixes
+          <ulink url="&lfs-ticket-root;5018">#5018</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Add zstd-1.5.2 upstream fixes patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision c9629e0347e07b757b2cf7e1fb51cb6c19c00c56)
+++ chapter01/whatsnew.xml	(revision 102a7f64c074baa465314620e2798d4031419fae)
@@ -281,12 +281,7 @@
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
-    <!--
-    <listitem>
-      <para>binutils-2.37-upstream_fix-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>gcc-11.1.0-upstream_fixes-1.patch</para>
-    </listitem>
-    -->
+    <listitem>
+      <para>&zstd-upstream-fixes-patch;</para>
+    </listitem>
   </itemizedlist>
 
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision c9629e0347e07b757b2cf7e1fb51cb6c19c00c56)
+++ chapter03/patches.xml	(revision 102a7f64c074baa465314620e2798d4031419fae)
@@ -142,4 +142,11 @@
     </varlistentry>
 
+    <varlistentry>
+      <term>Zstd Upstream Fixes Patch - <token>&zstd-upstream-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&zstd-upstream-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&zstd-upstream-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
   </variablelist>
 
Index: chapter04/addinguser.xml
===================================================================
--- chapter04/addinguser.xml	(revision c9629e0347e07b757b2cf7e1fb51cb6c19c00c56)
+++ chapter04/addinguser.xml	(revision 102a7f64c074baa465314620e2798d4031419fae)
@@ -86,10 +86,4 @@
 esac</userinput></screen>
 
-  <para>If a separate working directory was created as suggested, give
-  user <systemitem class="username">lfs</systemitem> ownership of this
-  directory:</para>
-
-<screen><userinput>chown -v lfs $LFS/sources</userinput></screen>
-
   <note><para>In some host systems, the following command does not complete
   properly and suspends the login to the lfs user to the background.  If the
Index: chapter08/gcc.xml
===================================================================
--- chapter08/gcc.xml	(revision c9629e0347e07b757b2cf7e1fb51cb6c19c00c56)
+++ chapter08/gcc.xml	(revision 102a7f64c074baa465314620e2798d4031419fae)
@@ -175,5 +175,5 @@
 
 <screen><userinput remap="install">chown -v -R root:root \
-    /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed}</userinput></screen>
+    /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include{,-fixed}</userinput></screen>
 
     <para>Create a symlink required by the <ulink
Index: chapter08/zstd.xml
===================================================================
--- chapter08/zstd.xml	(revision c9629e0347e07b757b2cf7e1fb51cb6c19c00c56)
+++ chapter08/zstd.xml	(revision 102a7f64c074baa465314620e2798d4031419fae)
@@ -42,4 +42,8 @@
   <sect2 role="installation">
     <title>Installation of Zstd</title>
+
+    <para>Apply a patch to fix some issues identified by upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&zstd-upstream-fixes-patch;</userinput></screen>
 
     <para>Compile the package:</para>
Index: patches.ent
===================================================================
--- patches.ent	(revision c9629e0347e07b757b2cf7e1fb51cb6c19c00c56)
+++ patches.ent	(revision 102a7f64c074baa465314620e2798d4031419fae)
@@ -88,2 +88,6 @@
 <!ENTITY systemd-upstream-fixes-patch-md5 "71eac6abdad5fba2039dcd011a9ae5b3">
 <!ENTITY systemd-upstream-fixes-patch-size "20 KB">
+
+<!ENTITY zstd-upstream-fixes-patch "zstd-&zstd-version;-upstream_fixes-1.patch">
+<!ENTITY zstd-upstream-fixes-patch-md5 "a7e576e3f87415fdf388392b257cdcf3">
+<!ENTITY zstd-upstream-fixes-patch-size "4 KB">
