diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 3f2ae8e29..aba69a0de 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,10 @@
     <listitem>
       <para>2024-01-21</para>
       <itemizedlist>
+        <listitem>
+          <para>[xry111] - Apply upstream fix for pkgconf-2.1.0 regression.
+          Fixes <ulink url='&lfs-ticket-root;5414'>#5414</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[xry111] - Update to jinja2-3.1.3 (security fix).  Fixes
           <ulink url='&lfs-ticket-root;5411'>#5411</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 918bc0f0b..2dd0a8d02 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -298,6 +298,10 @@
       <para>&glibc-upstream-fixes-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&pkgconf-upstream-fix-patch;</para>
+    </listitem>
+
     <listitem>
       <para>&readline-fixes-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 263f3ec1b..50ff56a6f 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -117,15 +117,14 @@
       </listitem>
     </varlistentry>
 -->
-<!--
+
     <varlistentry>
-      <term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
+      <term>Pkgconf Upstream Fix Patch - <token>&pkgconf-upstream-fix-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&perl-fix-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&pkgconf-upstream-fix-patch;"/></para>
+        <para>MD5 sum: <literal>&pkgconf-upstream-fix-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
 
     <varlistentry>
       <term>Readline Upstream Fix Patch - <token>&readline-fixes-patch-size;</token>:</term>
diff --git a/chapter08/pkgconf.xml b/chapter08/pkgconf.xml
index 0155356aa..139e0c810 100644
--- a/chapter08/pkgconf.xml
+++ b/chapter08/pkgconf.xml
@@ -45,9 +45,9 @@
     <title>Installation of Pkgconf</title>
 
     <!-- https://github.com/pkgconf/pkgconf/issues/317 -->
-    <para>Fix a regression in pkgconf-2.0.3 breaking BLFS packages:</para>
+    <para>Fix a regression in pkgconf-2.1.0 breaking BLFS packages:</para>
 
-    <screen><userinput remap="pre">sed -i 's/str\(cmp.*package\)/strn\1, strlen(pkg-&gt;why)/' cli/main.c</userinput></screen>
+    <screen><userinput remap="pre">patch -Np1 -i ../&pkgconf-upstream-fix-patch;</userinput></screen>
 
     <para>Prepare Pkgconf for compilation:</para>
 
diff --git a/patches.ent b/patches.ent
index 1bcd45dc3..d27c717de 100644
--- a/patches.ent
+++ b/patches.ent
@@ -22,6 +22,10 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
+<!ENTITY pkgconf-upstream-fix-patch "pkgconf-&pkgconf-version;-upstream_fix-1.patch">
+<!ENTITY pkgconf-upstream-fix-patch-md5 "77d5bb10840724a0e3dc08efee548363">
+<!ENTITY pkgconf-upstream-fix-patch-size "4 KB">
+
 <!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-2.patch">
 <!ENTITY readline-fixes-patch-md5 "d2477ebe908cc99763d90dde7fd9549a">
 <!ENTITY readline-fixes-patch-size "5.7 KB">