diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 80a6f0fb7..f5a0f964a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2020-05-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Fix a crash at early boot when using
+          CONFIG_STACK_PROTECTOR_STRONG=y in kernel configuration.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2020-05-16</para>
       <itemizedlist>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 0033028cf..5bacd11a1 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -54,6 +54,16 @@
     kernel compilation. Do not rely on the source tree being clean after
     un-tarring.</para>
 
+    <!-- The following paragraph and sed should be only necessary on the 5.6
+         series, but check when 5.7 is out. -->
+    <para>When using <envar>CONFIG_STACKPROTECTOR_STRONG=y</envar>, and
+    compiling with GCC 10 and later, the default optimization is too
+    aggressive, and generates a kernel panic when booting. This can be
+    fixed with:</para>
+
+<screen><userinput remap="pre">sed -e '/cpu_startup/a asm("");' \
+    -i arch/x86/{kernel/smpboot.c,xen/smp_pv.c}</userinput></screen>
+
     <!-- Support for compiling a keymap into the kernel is deliberately removed -->
 
     <para>Configure the kernel via a menu-driven interface. For general
diff --git a/general.ent b/general.ent
index 37dfee90c..604b3139b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "20200516-cross-chap5">
+<!ENTITY version         "20200521-cross-chap5">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "cross-chap5"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20200516-cross-cp5-systemd">
+<!ENTITY versiond        "20200521-cross-cp5-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "May 16th, 2020">
+<!ENTITY releasedate     "May 21st, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->