diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 1b0bd8f69..7afd3f475 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -57,6 +57,11 @@
     <listitem>
       <para>2019-06-16</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Properly initialize a data structure in
+          OpenSSL to avoid valgrind uninitialized value errors. Fixes
+          <ulink url="&lfs-ticket-root;4491">#4491</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to meson-0.51.0. Fixes
           <ulink url="&lfs-ticket-root;4483">#4483</ulink>.</para>
diff --git a/chapter06/openssl.xml b/chapter06/openssl.xml
index 34e4ade29..0bb65387a 100644
--- a/chapter06/openssl.xml
+++ b/chapter06/openssl.xml
@@ -43,6 +43,11 @@
   <sect2 role="installation">
     <title>Installation of OpenSSL</title>
 
+    <para>First, fix a problem identified upstream:</para>
+
+<screen><userinput remap="pre">sed -i '/\} data/s/ =.*$/;\n    memset(\&amp;data, 0, sizeof(data));/' \
+  crypto/rand/rand_lib.c</userinput></screen>
+
     <para>Prepare OpenSSL for compilation:</para>
 
 <screen><userinput remap="configure">./config --prefix=/usr         \