Index: general/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ general/sysutils/dbus.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -175,4 +175,5 @@
     </para>
 
+<!--
     <warning revision="systemd">
       <para>
@@ -189,4 +190,5 @@
 
     </warning>
+-->
 
     <para>
@@ -236,4 +238,5 @@
 <screen role="root" revision="sysv"><userinput>ln -sv /var/lib/dbus/machine-id /etc</userinput></screen>
 
+<!--
     <para revision="systemd">
       If not in chroot, at this point, you should reload the systemd daemon,
@@ -244,4 +247,5 @@
 <screen role="root" revision="systemd"><userinput>systemctl daemon-reload
 systemctl start multi-user.target</userinput></screen>
+-->
 
     <para>
Index: general/sysutils/systemd.xml
===================================================================
--- general/sysutils/systemd.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ general/sysutils/systemd.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -145,13 +145,4 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
-    <!-- 243-244 is now supported, so let's comment this for now.
-    <warning>
-      <para>
-        This version of systemd is incompatible with all previous
-        releases. The BLFS team does not recommend updating in place, and
-        suggests that you do a rebuild instead.
-      </para>
-    </warning>
-    -->
     <!--
     <para>
@@ -161,11 +152,4 @@
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-seccomp_and_cpuaffinity_fix-1.patch</userinput></screen>
     -->
-
-    <!-- The above is only needed on systems with Linux 5.4+ and libseccomp-2.4.2+
-         This fix is due to syscall changes in libseccomp+Linux 5.4+.
-         The affected syscall is shmat(), which isn't implemented properly on
-         i686, and intermittently fails on x86_64. Also, there is a problem with
-         CPU Affinity + CGroups on Linux-5.4+ that causes issues with the 
-         "test-execute" test. -->
 
     <para>
@@ -223,4 +207,5 @@
     </para>
 
+<!--
     <warning>
       <para>
@@ -237,4 +222,5 @@
 <screen role="root"><userinput>systemctl isolate rescue.target</userinput></screen>
     </warning>
+    Nobody has reported problems with this in years. Let's comment it. -->
 
    <para>
@@ -343,4 +329,5 @@
 EOF</userinput></screen>
 
+<!--
     <para>
       At this point, you should reload the systemd daemon, and reenter
@@ -353,5 +340,5 @@
 
 <screen role="root"><userinput>systemctl daemon-reexec
-systemctl start multi-user.target</userinput></screen>
+systemctl start multi-user.target</userinput></screen>-->
 
     <warning>
Index: gnome.ent
===================================================================
--- gnome.ent	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ gnome.ent	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -75,19 +75,19 @@
 <!ENTITY brasero-version                   "3.12.2">
 <!ENTITY cheese-version                    "3.34.0">
-<!ENTITY eog-version                       "3.34.2">
-<!ENTITY evince-version                    "3.34.2">
-<!ENTITY evolution-version                 "3.34.4">
-<!ENTITY file-roller-version               "3.32.4">
+<!ENTITY eog-version                       "3.36.1">
+<!ENTITY evince-version                    "3.36.0">
+<!ENTITY evolution-version                 "3.36.1">
+<!ENTITY file-roller-version               "3.36.1">
 <!-- gedit moved to Editors, so it's now in packages.ent -->
-<!ENTITY gnome-calculator-version          "3.34.1">
+<!ENTITY gnome-calculator-version          "3.36.0">
 <!ENTITY gnome-color-manager-version       "3.36.0">
-<!ENTITY gnome-disk-utility-version        "3.34.4">
+<!ENTITY gnome-disk-utility-version        "3.36.1">
 <!ENTITY gnome-logs-version                "3.34.0">
-<!ENTITY gnome-maps-version                "3.34.3">
+<!ENTITY gnome-maps-version                "3.36.1">
 <!ENTITY gnome-nettool-version             "3.8.1">
 <!ENTITY gnome-power-manager-version       "3.32.0">
-<!ENTITY gnome-screenshot-version          "3.34.0">
-<!ENTITY gnome-system-monitor-version      "3.32.1">
-<!ENTITY gnome-terminal-version            "3.34.2">
+<!ENTITY gnome-screenshot-version          "3.36.0">
+<!ENTITY gnome-system-monitor-version      "3.36.0">
+<!ENTITY gnome-terminal-version            "3.36.1.1">
 <!ENTITY gnome-tweaks-version              "3.34.0">
 <!ENTITY gnome-weather-version             "3.34.0">
Index: gnome/applications/eog.xml
===================================================================
--- gnome/applications/eog.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ gnome/applications/eog.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-minor-34;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-minor-34;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-md5sum        "a0a8577d3d337cfa908fa202ce0ecce0">
-  <!ENTITY eog-size          "3.4 MB">
-  <!ENTITY eog-buildsize     "32 MB">
-  <!ENTITY eog-time          "0.2 SBU">
+  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-minor-36;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-minor-36;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-md5sum        "74586323edb723952f32593e8cfc22a0">
+  <!ENTITY eog-size          "3.5 MB">
+  <!ENTITY eog-buildsize     "48 MB">
+  <!ENTITY eog-time          "0.3 SBU">
 ]>
 
Index: gnome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ gnome/applications/evince.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -6,10 +6,10 @@
 
   <!ENTITY evince-download-http
-     "&gnome-download-http;/evince/&gnome-minor-34;/evince-&evince-version;.tar.xz">
+     "&gnome-download-http;/evince/&gnome-minor-36;/evince-&evince-version;.tar.xz">
   <!ENTITY evince-download-ftp
-     "&gnome-download-ftp;/evince/&gnome-minor-34;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-md5sum        "9e9e82fa8f6045ad7817157d9335d185">
-  <!ENTITY evince-size          "2.4 MB">
-  <!ENTITY evince-buildsize     "71 MB">
+     "&gnome-download-ftp;/evince/&gnome-minor-36;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-md5sum        "06c8078b31616bed3ad1d8c014f066a0">
+  <!ENTITY evince-size          "2.5 MB">
+  <!ENTITY evince-buildsize     "75 MB">
   <!ENTITY evince-time          "0.4 SBU (Using parallelism=4)">
 ]>
Index: gnome/applications/evolution.xml
===================================================================
--- gnome/applications/evolution.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ gnome/applications/evolution.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-34;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-minor-34;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-md5sum        "a39f2f35113618870d30f65e57f9701b">
+  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-36;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-minor-36;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-md5sum        "d1a3795130d415f7f0ed7b6a436c7d5c">
   <!ENTITY evolution-size          "11 MB">
-  <!ENTITY evolution-buildsize     "336 MB">
-  <!ENTITY evolution-time          "1.2 SBU (Using parallelism=4)">
+  <!ENTITY evolution-buildsize     "338 MB">
+  <!ENTITY evolution-time          "1.1 SBU (Using parallelism=4)">
 ]>
 
@@ -200,5 +200,5 @@
           libecontactlisteditor.so,
           libecontactprint.so,
-          libedomutils.so,
+     <!-- libedomutils.so, -->
           libemail-engine.so,
           libessmime.so,
Index: gnome/applications/file-roller.xml
===================================================================
--- gnome/applications/file-roller.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ gnome/applications/file-roller.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -6,9 +6,9 @@
 
   <!ENTITY file-roller-download-http
-           "&gnome-download-http;/file-roller/&gnome-minor-32;/file-roller-&file-roller-version;.tar.xz">
+           "&gnome-download-http;/file-roller/&gnome-minor-36;/file-roller-&file-roller-version;.tar.xz">
   <!ENTITY file-roller-download-ftp
-           "&gnome-download-ftp;/file-roller/&gnome-minor-32;/file-roller-&file-roller-version;.tar.xz">
-  <!ENTITY file-roller-md5sum        "21982b8d298cb2994a99494399dcb2d5">
-  <!ENTITY file-roller-size          "836 KB">
+           "&gnome-download-ftp;/file-roller/&gnome-minor-36;/file-roller-&file-roller-version;.tar.xz">
+  <!ENTITY file-roller-md5sum        "d48b00634f7fdb87a1c4cf7c781772c3">
+  <!ENTITY file-roller-size          "844 KB">
   <!ENTITY file-roller-buildsize     "25 MB">
   <!ENTITY file-roller-time          "0.1 SBU (Using parallelism=4)">
@@ -35,5 +35,5 @@
       <application>File Roller</application> is an archive manager for
       <application>GNOME</application> with support for tar, bzip2, gzip, zip,
-      jar, compress, lzop and many other archive formats.
+      jar, compress, lzop, zstd, and many other archive formats.
     </para>
 
Index: gnome/applications/gnome-calculator.xml
===================================================================
--- gnome/applications/gnome-calculator.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ gnome/applications/gnome-calculator.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-calculator-download-http
-           "&gnome-download-http;/gnome-calculator/&gnome-minor-34;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+           "&gnome-download-http;/gnome-calculator/&gnome-minor-36;/gnome-calculator-&gnome-calculator-version;.tar.xz">
   <!ENTITY gnome-calculator-download-ftp
-           "&gnome-download-ftp;/gnome-calculator/&gnome-minor-34;/gnome-calculator-&gnome-calculator-version;.tar.xz">
-  <!ENTITY gnome-calculator-md5sum        "9157b93a3f41fdad80df26c062b95c7b">
-  <!ENTITY gnome-calculator-size          "944 KB">
-  <!ENTITY gnome-calculator-buildsize     "40 MB (with tests)">
-  <!ENTITY gnome-calculator-time          "0.2 SBU (with tests)">
+           "&gnome-download-ftp;/gnome-calculator/&gnome-minor-36;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+  <!ENTITY gnome-calculator-md5sum        "71854fb58671b4a88ac990e2f2439e4f">
+  <!ENTITY gnome-calculator-size          "964 KB">
+  <!ENTITY gnome-calculator-buildsize     "53 MB (with tests)">
+  <!ENTITY gnome-calculator-time          "0.3 SBU (with tests)">
 ]>
 
@@ -144,7 +144,9 @@
         </seg>
         <seg>
-          None
+          libgcalc-2.so and libgci-1.so
         </seg>
         <seg>
+          /usr/include/gcalc-2,
+          /usr/include/gci-2, and
           /usr/share/help/*/gnome-calculator
         </seg>
Index: gnome/applications/gnome-disk-utility.xml
===================================================================
--- gnome/applications/gnome-disk-utility.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ gnome/applications/gnome-disk-utility.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-disk-utility-download-http
-           "&gnome-download-http;/gnome-disk-utility/&gnome-minor-34;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+           "&gnome-download-http;/gnome-disk-utility/&gnome-minor-36;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
   <!ENTITY gnome-disk-utility-download-ftp
-           "&gnome-download-ftp;/gnome-disk-utility/&gnome-minor-34;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
-  <!ENTITY gnome-disk-utility-md5sum        "c0b7fe540957d90d5c88dba33127bbcb">
+           "&gnome-download-ftp;/gnome-disk-utility/&gnome-minor-36;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+  <!ENTITY gnome-disk-utility-md5sum        "0c35cb9758f2471c6941a0ec833972c4">
   <!ENTITY gnome-disk-utility-size          "1.3 MB">
   <!ENTITY gnome-disk-utility-buildsize     "37 MB">
-  <!ENTITY gnome-disk-utility-time          "less than 0.1 SBU (Using parallelism=4)">
+  <!ENTITY gnome-disk-utility-time          "0.1 SBU (Using parallelism=4)">
 ]>
 
Index: gnome/applications/gnome-maps.xml
===================================================================
--- gnome/applications/gnome-maps.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ gnome/applications/gnome-maps.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-maps-download-http
-           "&gnome-download-http;/gnome-maps/&gnome-minor-34;/gnome-maps-&gnome-maps-version;.tar.xz">
+           "&gnome-download-http;/gnome-maps/&gnome-minor-36;/gnome-maps-&gnome-maps-version;.tar.xz">
   <!ENTITY gnome-maps-download-ftp
-           "&gnome-download-ftp;/gnome-maps/&gnome-minor-34;/gnome-maps-&gnome-maps-version;.tar.xz">
-  <!ENTITY gnome-maps-md5sum        "51b549242e30886865004093f9081652">
+           "&gnome-download-ftp;/gnome-maps/&gnome-minor-36;/gnome-maps-&gnome-maps-version;.tar.xz">
+  <!ENTITY gnome-maps-md5sum        "7b8b11748e358115e3e50437207951b4">
   <!ENTITY gnome-maps-size          "3.8 MB">
-  <!ENTITY gnome-maps-buildsize     "12 MB">
+  <!ENTITY gnome-maps-buildsize     "16 MB">
   <!ENTITY gnome-maps-time          "less than 0.1 SBU">
 ]>
Index: gnome/applications/gnome-screenshot.xml
===================================================================
--- gnome/applications/gnome-screenshot.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ gnome/applications/gnome-screenshot.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-screenshot-download-http
-           "&gnome-download-http;/gnome-screenshot/&gnome-minor-34;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+           "&gnome-download-http;/gnome-screenshot/&gnome-minor-36;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
   <!ENTITY gnome-screenshot-download-ftp
-           "&gnome-download-ftp;/gnome-screenshot/&gnome-minor-34;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
-  <!ENTITY gnome-screenshot-md5sum        "779f12548d72d12a5275d5e8563d9855">
+           "&gnome-download-ftp;/gnome-screenshot/&gnome-minor-36;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+  <!ENTITY gnome-screenshot-md5sum        "27fb11f693fa7bd2d10df636f5ba1c5e">
   <!ENTITY gnome-screenshot-size          "228 KB">
-  <!ENTITY gnome-screenshot-buildsize     "4.2 MB">
+  <!ENTITY gnome-screenshot-buildsize     "6.5 MB">
   <!ENTITY gnome-screenshot-time          "less than 0.1 SBU">
 ]>
Index: gnome/applications/gnome-system-monitor.xml
===================================================================
--- gnome/applications/gnome-system-monitor.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ gnome/applications/gnome-system-monitor.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-system-monitor-download-http
-      "&gnome-download-http;/gnome-system-monitor/&gnome-minor-32;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+      "&gnome-download-http;/gnome-system-monitor/&gnome-minor-36;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
   <!ENTITY gnome-system-monitor-download-ftp
-           "&gnome-download-ftp;/gnome-system-monitor/&gnome-minor-32;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
-  <!ENTITY gnome-system-monitor-md5sum        "37356a1b8c20939adc6f47f739d2e49a">
-  <!ENTITY gnome-system-monitor-size          "664 KB">
-  <!ENTITY gnome-system-monitor-buildsize     "32 MB">
+           "&gnome-download-ftp;/gnome-system-monitor/&gnome-minor-36;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+  <!ENTITY gnome-system-monitor-md5sum        "99f0d46ff2bc45ec407d383c93213acb">
+  <!ENTITY gnome-system-monitor-size          "680 KB">
+  <!ENTITY gnome-system-monitor-buildsize     "33 MB">
   <!ENTITY gnome-system-monitor-time          "0.5 SBU">
 ]>
Index: gnome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ gnome/applications/gnome-terminal.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-terminal-download-http
-           "&gnome-download-http;/gnome-terminal/&gnome-minor-34;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+           "&gnome-download-http;/gnome-terminal/&gnome-minor-36;/gnome-terminal-&gnome-terminal-version;.tar.xz">
   <!ENTITY gnome-terminal-download-ftp
-           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-34;/gnome-terminal-&gnome-terminal-version;.tar.xz">
-  <!ENTITY gnome-terminal-md5sum        "13fa9f5f459481c7f05b6964c470ef16">
-  <!ENTITY gnome-terminal-size          "2.0 MB">
-  <!ENTITY gnome-terminal-buildsize     "37 MB">
+           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-36;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+  <!ENTITY gnome-terminal-md5sum        "31381c96bf67279c61cec0a4e2473cfa">
+  <!ENTITY gnome-terminal-size          "2.4 MB">
+  <!ENTITY gnome-terminal-buildsize     "46 MB">
   <!ENTITY gnome-terminal-time          "0.1 SBU (using parallelism=4)">
 ]>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ed6715ef4c57f065756f85a95ccf1f34ca9bc299)
+++ introduction/welcome/changelog.xml	(revision a761478344f0af148395cfa23e8bf1a25178ed52)
@@ -46,4 +46,48 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Update to gnome-terminal-3.36.1.1. Finishes
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-system-monitor-3.36.0. Part of
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-screenshot-3.36.0. Part of
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-maps-3.36.1. Part of
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-disk-utility-3.36.1. Part of
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-calculator-3.36.0. Part of
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to file-roller-3.36.1. Part of
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to evolution-3.36.1. Part of
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Evince-3.36.0. Part of
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to EOG-3.36.1. Part of
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Remove the systemctl instructions from systemd and
+          dbus. Nobody has reported problems with them in years.</para>
+        </listitem>
+        <listitem>
           <para>[thomas] - Update to qt-5.14.2, qtwebengine-5.14.2. Fixes
           <ulink url="&blfs-ticket-root;13342">#13342</ulink>.</para>
