diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 23029b540..70bfd3966 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -486,6 +486,24 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>LLVM Clang (&llvm-version;) - <token>&llvm-clang-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&llvm-home;"/></para>
+        <para>Download: <ulink url="&llvm-clang-url;"/></para>
+        <para>MD5 sum: <literal>&llvm-clang-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>LLVM Compiler (&llvm-version;) - <token>&llvm-comp-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&llvm-home;"/></para>
+        <para>Download: <ulink url="&llvm-comp-url;"/></para>
+        <para>MD5 sum: <literal>&llvm-comp-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>LLVM CMake Modules (&llvm-version;) - <token>&llvm-cmake-size;</token>:</term>
       <listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 2bba9c16d..629bd1096 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -109,6 +109,13 @@
       </listitem>
     </varlistentry>
 -->
+    <varlistentry>
+      <term>LLVM Default SSP Patch - <token>&llvm-dftssp-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&llvm-dftssp-patch;"/></para>
+        <para>MD5 sum: <literal>&llvm-dftssp-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 <!--
     <varlistentry>
       <term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
diff --git a/packages.ent b/packages.ent
index 49a789ec6..2cb3c16a8 100644
--- a/packages.ent
+++ b/packages.ent
@@ -466,6 +466,14 @@
 <!ENTITY llvm-final-sbu "20 SBU">
 <!ENTITY llvm-final-du "3,800 MB">
 
+<!ENTITY llvm-clang-url "https://github.com/llvm/llvm-project/releases/download/llvmorg-&llvm-version;/clang-&llvm-version;.src.tar.xz">
+<!ENTITY llvm-clang-md5 "abb7f1286b084b7c149fd83c7b1d8564">
+<!ENTITY llvm-clang-size "18 MB">
+
+<!ENTITY llvm-comp-url "https://github.com/llvm/llvm-project/releases/download/llvmorg-&llvm-version;/compiler-rt-&llvm-version;.src.tar.xz">
+<!ENTITY llvm-comp-md5 "6dd59ad1f511915e4d70872c91014ddc">
+<!ENTITY llvm-comp-size "2.2 MB">
+
 <!-- TODO: if we merge Rust into trunk, create a symlink on anduin and
            use &anduin-sources; instead -->
 <!ENTITY llvm-cmake-url "https://anduin.linuxfromscratch.org/BLFS/llvm/llvm-cmake-15.0.1.src.tar.xz">
diff --git a/patches.ent b/patches.ent
index 54c0c11fa..11803c9e0 100644
--- a/patches.ent
+++ b/patches.ent
@@ -64,7 +64,11 @@
 <!ENTITY libpipeline-checks-patch "libpipeline-&libpipeline-version;-check_fixes-3.patch">
 <!ENTITY libpipeline-checks-patch-md5 "0cd71f98eadaee07647d021d2e4c8621">
 <!ENTITY libpipeline-checks-patch-size "22 KB">
-
+-->
+<!ENTITY llvm-dftssp-patch "clang-&llvm-version;-enable_default_ssp-1.patch">
+<!ENTITY llvm-dftssp-patch-md5 "a16b457669702bd5e1e7bee2cfabe6af">
+<!ENTITY llvm-dftssp-patch-size "3.9 KB">
+<!--
 <!ENTITY meson-fix-patch "meson-&meson-version;-upstream_fix-2.patch">
 <!ENTITY meson-fix-patch-md5 "dd0b2187d287abcb41c3dd7e497b7df3">
 <!ENTITY meson-fix-patch-size "5.5 KB">