Index: general/genlib/nodejs.xml
===================================================================
--- general/genlib/nodejs.xml	(revision 2f50f72cec5cb9f9f26805bc5e4f119e493029fe)
+++ general/genlib/nodejs.xml	(revision 8c71f6e25ecb6ef37defd0f1ae4b491d38ec55e7)
@@ -7,8 +7,8 @@
   <!ENTITY nodejs-download-http "https://nodejs.org/dist/v&nodejs-version;/node-v&nodejs-version;.tar.xz">
   <!ENTITY nodejs-download-ftp  " ">
-  <!ENTITY nodejs-md5sum        "aeeb772ea8b14a52fd8f709d774f8fcd">
+  <!ENTITY nodejs-md5sum        "80667c769fd7d12da24d203585cead11">
   <!ENTITY nodejs-size          "32 MB">
-  <!ENTITY nodejs-buildsize     "798 MB (add 26 MB for tests)">
-  <!ENTITY nodejs-time          "18 SBU (add 2.9 SBU for tests: both using parallelism=4 and 4 CPUs online, parts of the tests will use all online CPUs)">
+  <!ENTITY nodejs-buildsize     "746 MB (add 26 MB for tests)">
+  <!ENTITY nodejs-time          "14 SBU (add 2.3 SBU for tests: both using parallelism=4 and 4 CPUs online, parts of the tests will use all online CPUs)">
 ]>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2f50f72cec5cb9f9f26805bc5e4f119e493029fe)
+++ introduction/welcome/changelog.xml	(revision 8c71f6e25ecb6ef37defd0f1ae4b491d38ec55e7)
@@ -43,4 +43,18 @@
     -->
     <listitem>
+      <para>December 6th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to node-16.13.1. Fixes
+          <ulink url="&blfs-ticket-root;15804">#15804</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cups-2.4.0. Fixes
+          <ulink url="&blfs-ticket-root;15801">#15801</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 3rd, 2021</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision 2f50f72cec5cb9f9f26805bc5e4f119e493029fe)
+++ packages.ent	(revision 8c71f6e25ecb6ef37defd0f1ae4b491d38ec55e7)
@@ -180,5 +180,5 @@
 <!ENTITY lzo-version                  "2.10">
 <!ENTITY mtdev-version                "1.1.6">
-<!ENTITY nodejs-version               "16.13.0">
+<!ENTITY nodejs-version               "16.13.1">
 <!ENTITY npth-version                 "1.6">
 <!ENTITY nspr-version                 "4.32">
@@ -1069,5 +1069,5 @@
 <!-- Part XII -->
 <!-- Chapter 46 -->
-<!ENTITY cups-version                 "2.3.3op2">
+<!ENTITY cups-version                 "2.4.0">
 <!ENTITY cups-filters-version         "1.28.10">
 <!ENTITY gs-version                   "9.55.0">
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 2f50f72cec5cb9f9f26805bc5e4f119e493029fe)
+++ pst/printing/cups.xml	(revision 8c71f6e25ecb6ef37defd0f1ae4b491d38ec55e7)
@@ -7,8 +7,8 @@
   <!ENTITY cups-download-http "https://github.com/OpenPrinting/cups/releases/download/v&cups-version;/cups-&cups-version;-source.tar.gz">
   <!ENTITY cups-download-ftp  " ">
-  <!ENTITY cups-md5sum        "524266752cf243c968921547b18ee594">
-  <!ENTITY cups-size          "7.6 MB">
-  <!ENTITY cups-buildsize     "80 MB (Add 89 MB for tests)">
-  <!ENTITY cups-time          "0.5 SBU (Add 0.9 SBU for tests)">
+  <!ENTITY cups-md5sum        "6ce9d3f4f0f79b414f35ab28d185d9f9">
+  <!ENTITY cups-size          "7.7 MB">
+  <!ENTITY cups-buildsize     "60 MB (Add 25 MB for tests)">
+  <!ENTITY cups-time          "0.2 SBU (Add 0.1 SBU for tests)">
 ]>
 
@@ -209,7 +209,7 @@
     </para>
 
-<screen><userinput>sed -e "s/-Wno-format-truncation//" \
+<screen><userinput>sed -e "s/format-truncation//" \
     -i configure \
-    -i config-scripts/cups-compiler.m4</userinput></screen>
+       config-scripts/cups-compiler.m4</userinput></screen>
 
     <para>
@@ -217,12 +217,4 @@
     </para>
 
-
-<!-- This seems to be no longer required with OpenPrinting-cups.
-     Remove this comment when switch to OP is settled.
-
-<screen revision="sysv"><userinput>sed -i '/stat.h/a #include &lt;asm-generic/ioctls.h&gt;' tools/ipptool.c  &amp;&amp;
-
-CC=gcc CXX=g++ \
--->
 <screen revision="sysv"><userinput>./configure --libdir=/usr/lib            \
             --disable-systemd            \
@@ -232,10 +224,4 @@
 make</userinput></screen>
 
-<!-- same apply here:
-
-<screen revision="systemd"><userinput>sed -i '/stat.h/a #include &lt;asm-generic/ioctls.h&gt;' tools/ipptool.c   &amp;&amp;
-
-CC=gcc CXX=g++ \
--->
 <screen revision="systemd"><userinput>./configure --libdir=/usr/lib            \
             --with-system-groups=lpadmin \
@@ -248,5 +234,5 @@
       Make sure that there is not other instance of <application>Cups</application>
       running, otherwise at least 4 tests will fail with "address in use".
-      <!--One test, <filename>httpAddrGetList</filename>, is known to fail.-->
+      One test, <filename>httpAddrGetList</filename>, is known to fail.
     </para>
 
