Index: gnome/applications/evolution.xml
===================================================================
--- gnome/applications/evolution.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/applications/evolution.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-38;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-minor-38;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-md5sum        "30127e91eebbb7b38994bf715eb078f7">
+  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-40;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-40;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-md5sum        "913ced26496c3a5876d2c8ab488f9073">
   <!ENTITY evolution-size          "12 MB">
-  <!ENTITY evolution-buildsize     "346 MB">
+  <!ENTITY evolution-buildsize     "347 MB">
   <!ENTITY evolution-time          "1.1 SBU (Using parallelism=4)">
 ]>
Index: gnome/applications/gnome-tweaks.xml
===================================================================
--- gnome/applications/gnome-tweaks.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/applications/gnome-tweaks.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-tweaks-download-http
-           "&gnome-download-http;/gnome-tweaks/&gnome-minor-34;/gnome-tweaks-&gnome-tweaks-version;.tar.xz">
+           "&gnome-download-http;/gnome-tweaks/&gnome-40;/gnome-tweaks-&gnome-tweaks-version;.tar.xz">
   <!ENTITY gnome-tweaks-download-ftp
-           "&gnome-download-ftp;/gnome-tweaks/&gnome-minor-34;/gnome-tweaks-&gnome-tweaks-version;.tar.xz">
-  <!ENTITY gnome-tweaks-md5sum        "34136ab30594546889d7c32ed8b13aba">
-  <!ENTITY gnome-tweaks-size          "244 KB">
-  <!ENTITY gnome-tweaks-buildsize     "5.2 MB">
+           "&gnome-download-ftp;/gnome-tweaks/&gnome-40;/gnome-tweaks-&gnome-tweaks-version;.tar.xz">
+  <!ENTITY gnome-tweaks-md5sum        "81b5883a6f0046f1b63cc998829d83e4">
+  <!ENTITY gnome-tweaks-size          "248 KB">
+  <!ENTITY gnome-tweaks-buildsize     "5.3 MB">
   <!ENTITY gnome-tweaks-time          "less than 0.1 SBU">
 ]>
@@ -73,4 +73,5 @@
     </itemizedlist>
 
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -82,4 +83,5 @@
       </listitem>
     </itemizedlist>
+-->
 
     <bridgehead renderas="sect3">GNOME Tweaks Dependencies</bridgehead>
@@ -102,4 +104,5 @@
     <title>Installation of GNOME Tweaks</title>
 
+<!--
     <para>
       First, port gnome-tweaks to libhandy-1.x:
@@ -107,4 +110,13 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../gnome-tweaks-&gnome-tweaks-version;-port_to_libhandy1-1.patch</userinput></screen>
+-->
+
+    <para>
+      First, if you are upgrading from gnome-tweaks-3.34.x, remove some
+      incompatible files as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
+
+<screen role="root"><userinput remap="pre">rm -rf /usr/lib/python3.9/site-packages/gtweak</userinput></screen>
 
     <para>
Index: gnome/platform/dconf.xml
===================================================================
--- gnome/platform/dconf.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/dconf.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -16,6 +16,6 @@
   <!ENTITY dconf-editor-download-http "&gnome-download-http;/dconf-editor/&gnome-minor-38;/dconf-editor-&dconf-editor-version;.tar.xz">
   <!ENTITY dconf-editor-download-ftp  "&gnome-download-ftp;/dconf-editor/&gnome-minor-38;/dconf-editor-&dconf-editor-version;.tar.xz">
-  <!ENTITY dconf-editor-md5sum        "1e03d07187ef2121d75fadd5f53dc1ef">
-  <!ENTITY dconf-editor-size          "580 KB">
+  <!ENTITY dconf-editor-md5sum        "06d64abca0673761cf320145e9977b9c">
+  <!ENTITY dconf-editor-size          "584 KB">
   <!ENTITY dconf-editor-buildsize     "37 MB">
   <!ENTITY dconf-editor-time          "0.2 SBU">
@@ -125,4 +125,5 @@
     </itemizedlist>
 
+    <!-- Applied in 3.38.3
     <itemizedlist spacing="compact">
       <listitem>
@@ -133,4 +134,5 @@
       </listitem>
     </itemizedlist>
+    -->
 
     <bridgehead renderas="sect3">DConf Dependencies</bridgehead>
@@ -200,6 +202,4 @@
 tar -xf ../dconf-editor-&dconf-editor-version;.tar.xz &amp;&amp;
 cd dconf-editor-&dconf-editor-version;                &amp;&amp;
-
-patch -p1 -i ../../dconf-editor-&dconf-editor-version;-vala_fix-1.patch &amp;&amp;
 
 mkdir build &amp;&amp;
Index: gnome/platform/gdm.xml
===================================================================
--- gnome/platform/gdm.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/gdm.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gdm-download-http "&gnome-download-http;/gdm/&gnome-minor-38;/gdm-&gdm-version;.tar.xz">
-  <!ENTITY gdm-download-ftp  "&gnome-download-ftp;/gdm/&gnome-minor-38;/gdm-&gdm-version;.tar.xz">
-  <!ENTITY gdm-md5sum        "ddc782eaf0b0345ee34fb396f67bd44d">
-  <!ENTITY gdm-size          "772 KB">
+  <!ENTITY gdm-download-http "&gnome-download-http;/gdm/&gnome-40;/gdm-&gdm-version;.tar.xz">
+  <!ENTITY gdm-download-ftp  "&gnome-download-ftp;/gdm/&gnome-40;/gdm-&gdm-version;.tar.xz">
+  <!ENTITY gdm-md5sum        "85e6a306f1d0c88c276938a0519d8332">
+  <!ENTITY gdm-size          "784 KB">
   <!ENTITY gdm-buildsize     "35 MB">
-  <!ENTITY gdm-time          "0.2 SBU">
+  <!ENTITY gdm-time          "0.1 SBU">
 ]>
 
Index: gnome/platform/gnome-bluetooth.xml
===================================================================
--- gnome/platform/gnome-bluetooth.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/gnome-bluetooth.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -9,5 +9,5 @@
   <!ENTITY gnome-bluetooth-download-ftp
            "&gnome-download-ftp;/gnome-bluetooth/&gnome-minor-34;/gnome-bluetooth-&gnome-bluetooth-version;.tar.xz">
-  <!ENTITY gnome-bluetooth-md5sum        "c82f7df6a411c897d4d59337d5d9a789">
+  <!ENTITY gnome-bluetooth-md5sum        "d83faa54abaf64bb40b5313bc233e74e">
   <!ENTITY gnome-bluetooth-size          "348 KB">
   <!ENTITY gnome-bluetooth-buildsize     "17 MB">
@@ -91,5 +91,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/>
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="python-dbusmock"/>
     </para>
 
@@ -111,5 +112,5 @@
     <para>
       Install <application>GNOME Bluetooth</application> by running the
-      following  commands:
+      following commands:
     </para>
 
@@ -121,5 +122,5 @@
 
     <para>
-      This package does not come with a test suite.
+      To test the results, issue: <command>ninja test</command>.
     </para>
 
Index: gnome/platform/gnome-control-center.xml
===================================================================
--- gnome/platform/gnome-control-center.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/gnome-control-center.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-control-center-download-http
-           "&gnome-download-http;/gnome-control-center/&gnome-minor-38;/gnome-control-center-&gnome-control-center-version;.tar.xz">
+           "&gnome-download-http;/gnome-control-center/&gnome-40;/gnome-control-center-&gnome-control-center-version;.tar.xz">
   <!ENTITY gnome-control-center-download-ftp
-           "&gnome-download-ftp;/gnome-control-center/&gnome-minor-38;/gnome-control-center-&gnome-control-center-version;.tar.xz">
-  <!ENTITY gnome-control-center-md5sum        "147d0d5f53992b2c8fdaa695070367b4">
-  <!ENTITY gnome-control-center-size          "6.1 MB">
-  <!ENTITY gnome-control-center-buildsize     "183 MB (with tests)">
+           "&gnome-download-ftp;/gnome-control-center/&gnome-40;/gnome-control-center-&gnome-control-center-version;.tar.xz">
+  <!ENTITY gnome-control-center-md5sum        "d704e59afe2df9c24ed876841adb3e0a">
+  <!ENTITY gnome-control-center-size          "6.2 MB">
+  <!ENTITY gnome-control-center-buildsize     "187 MB (with tests)">
   <!ENTITY gnome-control-center-time          "0.4 SBU (Using parallelism=4; with tests)">
 ]>
Index: gnome/platform/gnome-keyring.xml
===================================================================
--- gnome/platform/gnome-keyring.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/gnome-keyring.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-keyring-download-http
-           "&gnome-download-http;/gnome-keyring/&gnome-minor-36;/gnome-keyring-&gnome-keyring-version;.tar.xz">
+           "&gnome-download-http;/gnome-keyring/&gnome-40;/gnome-keyring-&gnome-keyring-version;.tar.xz">
   <!ENTITY gnome-keyring-download-ftp
-           "&gnome-download-ftp;/gnome-keyring/&gnome-minor-36;/gnome-keyring-&gnome-keyring-version;.tar.xz">
-  <!ENTITY gnome-keyring-md5sum        "38f0732845a510a8dff4f154c3406f65">
+           "&gnome-download-ftp;/gnome-keyring/&gnome-40;/gnome-keyring-&gnome-keyring-version;.tar.xz">
+  <!ENTITY gnome-keyring-md5sum        "f404b61683a0ff54fb264b337772cff2">
   <!ENTITY gnome-keyring-size          "1.3 MB">
-  <!ENTITY gnome-keyring-buildsize     "164 MB">
-  <!ENTITY gnome-keyring-time          "0.3 SBU (Using parallelism=4; add 0.3 SBU for tests)">
+  <!ENTITY gnome-keyring-buildsize     "155 MB">
+  <!ENTITY gnome-keyring-time          "0.2 SBU (Using parallelism=4; add 0.3 SBU for tests)">
 ]>
 
Index: gnome/platform/gnome-settings-daemon.xml
===================================================================
--- gnome/platform/gnome-settings-daemon.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/gnome-settings-daemon.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-settings-daemon-download-http
-           "&gnome-download-http;/gnome-settings-daemon/&gnome-minor-38;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
+           "&gnome-download-http;/gnome-settings-daemon/&gnome-40;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
   <!ENTITY gnome-settings-daemon-download-ftp
-           "&gnome-download-ftp;/gnome-settings-daemon/&gnome-minor-38;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
-  <!ENTITY gnome-settings-daemon-md5sum        "ac40a03be99379de432b822c0001904e">
+           "&gnome-download-ftp;/gnome-settings-daemon/&gnome-40;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
+  <!ENTITY gnome-settings-daemon-md5sum        "9866c0995b0d74ed168198e5af421e7b">
   <!ENTITY gnome-settings-daemon-size          "1.4 MB">
-  <!ENTITY gnome-settings-daemon-buildsize     "46 MB">
-  <!ENTITY gnome-settings-daemon-time          "1.1 SBU (Using parallelism=4)">
+  <!ENTITY gnome-settings-daemon-buildsize     "48 MB">
+  <!ENTITY gnome-settings-daemon-time          "1.0 SBU (Using parallelism=4)">
 ]>
 
@@ -210,6 +210,7 @@
         </seg>
         <seg>
-          /usr/include/gnome-settings-daemon-3.0,
-          /usr/lib/gnome-settings-daemon-3.0, and
+          /etc/xdg/Xwayland-session.d,
+          /usr/include/gnome-settings-daemon-40,
+          /usr/lib/gnome-settings-daemon-40, and
           /usr/share/gnome-settings-daemon
         </seg>
Index: gnome/platform/gnome-shell-extensions.xml
===================================================================
--- gnome/platform/gnome-shell-extensions.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/gnome-shell-extensions.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-shell-extensions-download-http
-           "&gnome-download-http;/gnome-shell-extensions/&gnome-minor-38;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
+           "&gnome-download-http;/gnome-shell-extensions/&gnome-40;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
   <!ENTITY gnome-shell-extensions-download-ftp
-           "&gnome-download-ftp;/gnome-shell-extensions/&gnome-minor-38;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
-  <!ENTITY gnome-shell-extensions-md5sum        "527017400c2a22748f97f0603f070dda">
-  <!ENTITY gnome-shell-extensions-size          "208 KB">
+           "&gnome-download-ftp;/gnome-shell-extensions/&gnome-40;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
+  <!ENTITY gnome-shell-extensions-md5sum        "1b53635d2f6bcb07e7008032313e3e8a">
+  <!ENTITY gnome-shell-extensions-size          "216 KB">
   <!ENTITY gnome-shell-extensions-buildsize     "4.4 MB">
   <!ENTITY gnome-shell-extensions-time          "less than 0.1 SBU">
@@ -94,4 +94,14 @@
     <title>Installation of GNOME Shell Extensions</title>
 
+    <!-- https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/302 -->
+    <warning>
+      <para>
+        If you have the windowsNavigator extension enabled and you are upgrading
+        from a previous version of GNOME, disable it before continuing.
+        This extension is known to cause the Overview menu to lockup after
+        an application is opened.
+      </para>
+    </warning>
+
     <para>
       Install <application>GNOME Shell Extensions</application> by running the
Index: gnome/platform/gnome-shell.xml
===================================================================
--- gnome/platform/gnome-shell.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/gnome-shell.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-shell-download-http
-           "&gnome-download-http;/gnome-shell/&gnome-minor-38;/gnome-shell-&gnome-shell-version;.tar.xz">
+           "&gnome-download-http;/gnome-shell/&gnome-40;/gnome-shell-&gnome-shell-version;.tar.xz">
   <!ENTITY gnome-shell-download-ftp
-           "&gnome-download-ftp;/gnome-shell/&gnome-minor-38;/gnome-shell-&gnome-shell-version;.tar.xz">
-  <!ENTITY gnome-shell-md5sum        "e6c891c430016ced449e38661ddf6dec">
-  <!ENTITY gnome-shell-size          "1.7 MB">
-  <!ENTITY gnome-shell-buildsize     "72 MB (including tests)">
+           "&gnome-download-ftp;/gnome-shell/&gnome-40;/gnome-shell-&gnome-shell-version;.tar.xz">
+  <!ENTITY gnome-shell-md5sum        "e5f8d7af0965417969cb9da0b4495090">
+  <!ENTITY gnome-shell-size          "1.8 MB">
+  <!ENTITY gnome-shell-buildsize     "74 MB (including tests)">
   <!ENTITY gnome-shell-time          "0.2 SBU (Using parallelism=4, with tests)">
 ]>
@@ -81,4 +81,5 @@
       <xref linkend="gnome-autoar"/>,
       <xref linkend="gnome-control-center"/>,
+      <xref linkend="gtk4"/>,
       <xref linkend="mutter"/>,
       <xref linkend="sassc"/>,
Index: gnome/platform/gnome-user-docs.xml
===================================================================
--- gnome/platform/gnome-user-docs.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/gnome-user-docs.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-user-docs-download-http
-           "&gnome-download-http;/gnome-user-docs/&gnome-minor-38;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
+           "&gnome-download-http;/gnome-user-docs/&gnome-40;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
   <!ENTITY gnome-user-docs-download-ftp
-           "&gnome-download-ftp;/gnome-user-docs/&gnome-minor-38;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
-  <!ENTITY gnome-user-docs-md5sum        "3656475c1ac4f0c6cf64af76d79e34b7">
-  <!ENTITY gnome-user-docs-size          "11 MB">
-  <!ENTITY gnome-user-docs-buildsize     "217 MB">
+           "&gnome-download-ftp;/gnome-user-docs/&gnome-40;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
+  <!ENTITY gnome-user-docs-md5sum        "ce706da345f1afa5a6d755e9c5852c52">
+  <!ENTITY gnome-user-docs-size          "8.6 MB">
+  <!ENTITY gnome-user-docs-buildsize     "223 MB">
   <!ENTITY gnome-user-docs-time          "0.6 SBU (using parallelism=4)">
 ]>
Index: gnome/platform/gvfs.xml
===================================================================
--- gnome/platform/gvfs.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/gvfs.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -5,7 +5,7 @@
   %general-entities;
 
-  <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.46/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.46/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-md5sum        "852fff7ae3215012f3e143d0b13a81ff">
+  <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.48/gvfs-&gvfs-version;.tar.xz">
+  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.48/gvfs-&gvfs-version;.tar.xz">
+  <!ENTITY gvfs-md5sum        "fd4dda373f4c316c731a05e0255434bc">
   <!ENTITY gvfs-size          "1.2 MB">
   <!ENTITY gvfs-buildsize     "56 MB">
Index: gnome/platform/mutter.xml
===================================================================
--- gnome/platform/mutter.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/mutter.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-minor-38;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-minor-38;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-md5sum        "7a72928143cd8f84e6ff43de6a408b77">
-  <!ENTITY mutter-size          "2.5 MB">
-  <!ENTITY mutter-buildsize     "139 MB">
-  <!ENTITY mutter-time          "1.3 SBU (Using parallelism=4)">
+  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-40;/mutter-&mutter-version;.tar.xz">
+  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-40;/mutter-&mutter-version;.tar.xz">
+  <!ENTITY mutter-md5sum        "64ec45c43427fa9794fc3a6e287689bd">
+  <!ENTITY mutter-size          "2.6 MB">
+  <!ENTITY mutter-buildsize     "240 MB">
+  <!ENTITY mutter-time          "1.6 SBU (Using parallelism=4)">
 ]>
 
@@ -147,4 +147,11 @@
 
     <para>
+      First, fix a race condition that sometimes occurs due to meson dependency
+      ordering:
+    </para>
+
+<screen><userinput remap="pre">sed -i '/libmutter_dep = declare_dependency(/a sources: mutter_built_sources,' src/meson.build</userinput></screen>
+
+    <para>
       Install <application>Mutter</application> by running the following
       commands:
@@ -162,5 +169,6 @@
       require an active X session to run correctly. It is not necessary to
       run a  separate D-bus session if not in a GNOME session, but it
-      provides a clean environment in any case.
+      provides a clean environment in any case. One test,
+      <filename>native-headless</filename>, is known to fail.
     </para>
 
@@ -186,8 +194,8 @@
         </seg>
         <seg>
-          libmutter-7.so
+          libmutter-8.so
         </seg>
         <seg>
-          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-7
+          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-8
         </seg>
       </seglistitem>
@@ -213,5 +221,5 @@
 
       <varlistentry id="libmutter">
-        <term><filename class="libraryfile">libmutter-7.so</filename></term>
+        <term><filename class="libraryfile">libmutter-8.so</filename></term>
         <listitem>
           <para>
@@ -219,5 +227,5 @@
           </para>
           <indexterm zone="mutter libmutter">
-            <primary sortas="c-libmutter">libmutter-7.so</primary>
+            <primary sortas="c-libmutter">libmutter-8.so</primary>
           </indexterm>
         </listitem>
Index: gnome/platform/nautilus.xml
===================================================================
--- gnome/platform/nautilus.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/nautilus.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -6,11 +6,11 @@
 
   <!ENTITY nautilus-download-http
-           "&gnome-download-http;/nautilus/&gnome-minor-38;/nautilus-&nautilus-version;.tar.xz">
+           "&gnome-download-http;/nautilus/&gnome-40;/nautilus-&nautilus-version;.tar.xz">
   <!ENTITY nautilus-download-ftp
-           "&gnome-download-ftp;/nautilus/&gnome-minor-38;/nautilus-&nautilus-version;.tar.xz">
-  <!ENTITY nautilus-md5sum        "a94c730fe79104859035ae51e0ba0bd7">
+           "&gnome-download-ftp;/nautilus/&gnome-40;/nautilus-&nautilus-version;.tar.xz">
+  <!ENTITY nautilus-md5sum        "319404aeb542ecbdfd249053878bdca2">
   <!ENTITY nautilus-size          "3.1 MB">
   <!ENTITY nautilus-buildsize     "154 MB (with tests)">
-  <!ENTITY nautilus-time          "0.3 SBU (with tests, at -j4)">
+  <!ENTITY nautilus-time          "1.0 SBU (with tests, at -j4)">
 ]>
 
@@ -81,4 +81,5 @@
       <xref linkend="gnome-autoar"/>,
       <xref linkend="gnome-desktop"/>,
+      <xref linkend="libhandy1"/>,
       <xref linkend="libnotify"/>,
       <xref linkend="libseccomp"/>, and
@@ -91,6 +92,7 @@
       <xref linkend="exempi"/>,
       <xref linkend="gobject-introspection"/>,
-      <xref linkend="gst10-plugins-base"/>, and
-      <xref linkend="libexif"/>
+      <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="libexif"/>, and
+      <xref linkend="libportal"/>
     </para>
 
@@ -157,4 +159,9 @@
       <parameter>-Dpackagekit=false</parameter>: This switch disables the use
       of PackageKit which isn't suitable for BLFS.
+    </para>
+
+    <para>
+      <option>-Dlibportal=false</option>: Use this switch if you do not
+      have <xref linkend="libportal"/> installed.
     </para>
 
Index: gnome/platform/yelp.xml
===================================================================
--- gnome/platform/yelp.xml	(revision 3f41de0ebba86db7005237fa60baaaf4c3860346)
+++ gnome/platform/yelp.xml	(revision fd55434c178c6cd0eada3e33fa3b9a9827c335cb)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY yelp-download-http "&gnome-download-http;/yelp/&gnome-minor-38;/yelp-&yelp-version;.tar.xz">
-  <!ENTITY yelp-download-ftp  "&gnome-download-ftp;/yelp/&gnome-minor-38;/yelp-&yelp-version;.tar.xz">
-  <!ENTITY yelp-md5sum        "33c319da0f332b535758a5d7b7a138ad">
-  <!ENTITY yelp-size          "1.4 MB">
-  <!ENTITY yelp-buildsize     "21 MB">
+  <!ENTITY yelp-download-http "&gnome-download-http;/yelp/&gnome-40;/yelp-&yelp-version;.tar.xz">
+  <!ENTITY yelp-download-ftp  "&gnome-download-ftp;/yelp/&gnome-40;/yelp-&yelp-version;.tar.xz">
+  <!ENTITY yelp-md5sum        "d1fdb55c624a419877c2a2abfc8479a1">
+  <!ENTITY yelp-size          "1.5 MB">
+  <!ENTITY yelp-buildsize     "22 MB">
   <!ENTITY yelp-time          "0.1 SBU">
 ]>
