Index: general/sysutils/systemd.xml
===================================================================
--- general/sysutils/systemd.xml	(revision 8a916a3f635317674a347ffdd55b025963f722ab)
+++ general/sysutils/systemd.xml	(revision ae0944a3cae36ab3ffd3360a1cbe68dcd1a4f6cf)
@@ -8,8 +8,8 @@
   <!ENTITY systemd-download-http "https://github.com/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
   <!ENTITY systemd-download-ftp  " ">
-  <!ENTITY systemd-md5sum        "a3e9efa72d0309dd26513a221cdff31b">
-  <!ENTITY systemd-size          "9.1 MB">
-  <!ENTITY systemd-buildsize     "256 MB (with tests)">
-  <!ENTITY systemd-time          "2.4 SBU (with tests)">
+  <!ENTITY systemd-md5sum        "b0d6e603b814908acc69db29bbfb023c">
+  <!ENTITY systemd-size          "9.4 MB">
+  <!ENTITY systemd-buildsize     "273 MB (with tests)">
+  <!ENTITY systemd-time          "2.1 SBU (with tests)">
 
 ]>
@@ -79,5 +79,4 @@
     </itemizedlist>
 
-<!-- Saving for the next time that we need a patch
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -85,9 +84,8 @@
         <para>
          Required patch:
-         <ulink url="&patch-root;/systemd-&systemd-version;-gcc_10-fixes-2.patch"/>
+         <ulink url="&patch-root;/systemd-&systemd-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">systemd Dependencies</bridgehead>
@@ -123,4 +121,5 @@
       <ulink url="http://sourceforge.net/projects/gnu-efi/">gnu-efi</ulink>,
       <ulink url="https://www.kernel.org/pub/linux/utils/kernel/kexec/">kexec-tools</ulink>,
+      <ulink url="https://developers.yubico.com/libfido2/">libfido2</ulink>,
       <ulink url="https://www.gnu.org/software/libmicrohttpd/">libmicrohttpd</ulink>,
       <ulink url="http://lz4.github.io/lz4/">lz4</ulink>,
@@ -146,12 +145,10 @@
     <title>Installation of systemd</title>
 
-<!--
-    <para>
-      Apply a patch to fix a build failure when building with GCC-10 as well as
-      a segmentation fault in systemd-udevd on some platforms:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-2.patch</userinput></screen>
--->
+    <para>
+      Apply a patch to fix regressions in systemd-networkd and segmentation 
+      faults in systemctl:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
 
     <para>
@@ -187,4 +184,6 @@
       -Dhomed=false                 \
       -Duserdb=false                \
+      -Dmode=release                \
+      -Dpamconfdir=/etc/pam.d       \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..                            &amp;&amp;
@@ -251,4 +250,9 @@
     </para>
 -->
+
+    <para>
+      <parameter>-Dpamconfdir=/etc/pam.d</parameter>: Forces the PAM files to
+      be installed in /etc/pam.d rather than /usr/lib/pam.d.
+    </para>
 
     <para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 8a916a3f635317674a347ffdd55b025963f722ab)
+++ introduction/welcome/changelog.xml	(revision ae0944a3cae36ab3ffd3360a1cbe68dcd1a4f6cf)
@@ -46,4 +46,27 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Update to xorg-server-1.20.10 (Security Update).
+          Fixes <ulink url="&blfs-ticket-root;14322">#14322</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to systemd-247. Fixes
+          <ulink url="&blfs-ticket-root;14176">#14176</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to nano-5.4. Fixes
+          <ulink url="&blfs-ticket-root;14330">#14330</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libtirpc-1.3.1. Fixes
+          <ulink url="&blfs-ticket-root;14331">#14331</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to GnuTLS-3.7.0. Fixes
+          <ulink url="&blfs-ticket-root;14332">#14332</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Adapt xf86-input-wacom to changes in udev.</para>
+        </listitem>
+        <listitem>
           <para>[pierre] - Update to unbound-1.13.0. Fixes 
           <ulink url="&blfs-ticket-root;14338">#14338</ulink>.</para>
Index: networking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision 8a916a3f635317674a347ffdd55b025963f722ab)
+++ networking/netlibs/libtirpc.xml	(revision ae0944a3cae36ab3ffd3360a1cbe68dcd1a4f6cf)
@@ -7,7 +7,7 @@
   <!ENTITY libtirpc-download-http "&sourceforge-dl;/libtirpc/libtirpc-&libtirpc-version;.tar.bz2">
   <!ENTITY libtirpc-download-ftp  " ">
-  <!ENTITY libtirpc-md5sum        "b25f9cc18bfad50f7c446c77f4ae00bb">
+  <!ENTITY libtirpc-md5sum        "f222e258c129c6da2f8f9cfe7f1ed745">
   <!ENTITY libtirpc-size          "504 KB">
-  <!ENTITY libtirpc-buildsize     "8.2 MB">
+  <!ENTITY libtirpc-buildsize     "8.0 MB">
   <!ENTITY libtirpc-time          "0.1 SBU">
 ]>
Index: packages.ent
===================================================================
--- packages.ent	(revision 8a916a3f635317674a347ffdd55b025963f722ab)
+++ packages.ent	(revision ae0944a3cae36ab3ffd3360a1cbe68dcd1a4f6cf)
@@ -13,5 +13,5 @@
 <!ENTITY gnupg2-version               "2.2.25">
 <!ENTITY firewalld-version            "0.8.1">
-<!ENTITY gnutls-version               "3.6.15">
+<!ENTITY gnutls-version               "3.7.0">
 <!ENTITY gpgme-version                "1.15.0">
 <!ENTITY haveged-version              "1.9.13">
@@ -67,5 +67,5 @@
 <!ENTITY joe-version                  "4.6">
 <!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
-<!ENTITY nano-version                 "5.3">
+<!ENTITY nano-version                 "5.4">
 <!ENTITY vim-version                  "8.2.2070">
 <!ENTITY vim-majmin                   "82">
@@ -308,5 +308,5 @@
 <!ENTITY strigi-version               "0.7.8">
 <!ENTITY sysstat-version              "12.5.1">
-<!ENTITY systemd-version              "246">
+<!ENTITY systemd-version              "247">
 <!--<!ENTITY systemd-stable               "6b4878d"> Unused for now -->
 <!ENTITY udisks-version               "1.0.5">    <!-- stable lt .90 micro version -->
@@ -626,5 +626,5 @@
 <!ENTITY libproxy-version             "0.4.7">
 <!ENTITY libsoup-version              "2.72.0">
-<!ENTITY libtirpc-version             "1.2.6">
+<!ENTITY libtirpc-version             "1.3.1">
 <!ENTITY neon-version                 "0.31.2">
 <!ENTITY nghttp2-version              "1.42.0">
@@ -698,5 +698,5 @@
 <!ENTITY xcb-util-wm-version          "0.4.1">
 <!ENTITY xcb-util-cursor-version      "0.1.3">
-<!ENTITY xorg-server-version          "1.20.9">
+<!ENTITY xorg-server-version          "1.20.10">
 <!ENTITY twm-version                  "1.0.11">
 <!ENTITY xterm-version                "362">
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision 8a916a3f635317674a347ffdd55b025963f722ab)
+++ postlfs/editors/nano.xml	(revision ae0944a3cae36ab3ffd3360a1cbe68dcd1a4f6cf)
@@ -8,7 +8,7 @@
   <!ENTITY nano-download-http "https://www.nano-editor.org/dist/v5/nano-&nano-version;.tar.xz">
   <!ENTITY nano-download-ftp  " ">
-  <!ENTITY nano-md5sum        "0ff50c2d3068c6ce9e77b1f6a485eb19">
+  <!ENTITY nano-md5sum        "703d9b5317486c6f49918e27c435fbc9">
   <!ENTITY nano-size          "1.3 MB">
-  <!ENTITY nano-buildsize     "19 MB">
+  <!ENTITY nano-buildsize     "23 MB">
   <!ENTITY nano-time          "0.2 SBU">
 ]>
Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision 8a916a3f635317674a347ffdd55b025963f722ab)
+++ postlfs/security/gnutls.xml	(revision ae0944a3cae36ab3ffd3360a1cbe68dcd1a4f6cf)
@@ -5,11 +5,11 @@
   %general-entities;
 
-  <!ENTITY gnutls-download-http "&gnupg-http;/gnutls/v3.6/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-download-ftp  "&gnupg-ftp;/gnutls/v3.6/gnutls-&gnutls-version;.tar.xz">
+  <!ENTITY gnutls-download-http "&gnupg-http;/gnutls/v3.7/gnutls-&gnutls-version;.tar.xz">
+  <!ENTITY gnutls-download-ftp  "&gnupg-ftp;/gnutls/v3.7/gnutls-&gnutls-version;.tar.xz">
   <!ENTITY gnutls-download-ftp  " ">
-  <!ENTITY gnutls-md5sum        "e80e0d20a8bb337a15fa63caa7f67006">
+  <!ENTITY gnutls-md5sum        "1123a7bcc2fafd703e5a811bc1beb179">
   <!ENTITY gnutls-size          "5.8 MB">
-  <!ENTITY gnutls-buildsize     "161 MB (add 107 MB for tests)">
-  <!ENTITY gnutls-time          "0.8 SBU (using parallelism=4; add 2.5 SBU for tests)">
+  <!ENTITY gnutls-buildsize     "163 MB (add 112 MB for tests)">
+  <!ENTITY gnutls-time          "0.9 SBU (using parallelism=4; add 7.7 SBU for tests)">
 ]>
 
Index: x/installing/x7driver-wacom.xml
===================================================================
--- x/installing/x7driver-wacom.xml	(revision 8a916a3f635317674a347ffdd55b025963f722ab)
+++ x/installing/x7driver-wacom.xml	(revision ae0944a3cae36ab3ffd3360a1cbe68dcd1a4f6cf)
@@ -117,4 +117,11 @@
     <sect3 role="installation">
       <title>Installation of Xorg Wacom Driver</title>
+
+      <para>
+        First, adapt the <application>Xorg Wacom Driver</application> to
+        changes in udev:
+      </para>
+
+<screen><userinput remap="pre">sed -i 's/ACTION!="add|change"/ACTION=="remove"/' conf/wacom.rules</userinput></screen>
 
       <para>
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision 8a916a3f635317674a347ffdd55b025963f722ab)
+++ x/installing/xorg-server.xml	(revision ae0944a3cae36ab3ffd3360a1cbe68dcd1a4f6cf)
@@ -7,5 +7,5 @@
   <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "afcae2f46d47c33863cab7fd9db7279a">
+  <!ENTITY xorg-server-md5sum        "8cf8bd1f33e3736bc8dd279b20a32399">
   <!ENTITY xorg-server-size          "6.0 MB">
   <!ENTITY xorg-server-buildsize     "350 MB (with tests)">
@@ -231,5 +231,5 @@
           dmxaddscreen, dmxinfo, dmxreconfig, dmxresize, dmxrminput,
           dmxrmscreen, dmxtodmx, dmxwininfo, vdltodmx, Xdmx, xdmxconfig, Xephyr,
-          Xfbdev and Xwayland
+          <!--Xfbdev--> and Xwayland
         </seg>
         <seg>
