Index: gnome/platform/gdm.xml
===================================================================
--- gnome/platform/gdm.xml	(revision c8635a005666789f9ff9414bc8f450b84ab3c422)
+++ gnome/platform/gdm.xml	(revision c339779ba62e1a4ca67361c19af26aeaa2448344)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gdm-download-http "&gnome-download-http;/gdm/&gnome-minor-36;/gdm-&gdm-version;.tar.xz">
-  <!ENTITY gdm-download-ftp  "&gnome-download-ftp;/gdm/&gnome-minor-36;/gdm-&gdm-version;.tar.xz">
-  <!ENTITY gdm-md5sum        "2fb78422269f5e75067024ce5386521c">
-  <!ENTITY gdm-size          "1.2 MB">
-  <!ENTITY gdm-buildsize     "42 MB">
-  <!ENTITY gdm-time          "0.3 SBU">
+  <!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        "948dec80099d9d3a2adacc5788964043">
+  <!ENTITY gdm-size          "772 KB">
+  <!ENTITY gdm-buildsize     "34 MB">
+  <!ENTITY gdm-time          "0.1 SBU">
 ]>
 
@@ -128,4 +128,10 @@
 passwd -ql gdm</userinput></screen>
 
+    <para revision="sysv">
+      First, adapt GDM to build without systemd present:
+    </para>
+
+<screen revision="sysv"><userinput remap="pre">sed -i -r '/(^| )systemd_dep/d' meson.build</userinput></screen>
+
     <para>
       Install <application>GDM</application> by running the following
@@ -135,22 +141,29 @@
 <screen revision="sysv"><userinput>sed 's@systemd@elogind@' -i data/pam-lfs/gdm-launch-environment.pam &amp;&amp;
 
-./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --localstatedir=/var  \
-            --without-plymouth    \
-            --disable-static      \
-	    --enable-gdm-xsession \
-            --with-systemdsystemunitdir=no \
-            --with-pam-mod-dir=/lib/security &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --localstatedir=/var  \
-            --without-plymouth    \
-            --disable-static      \
-            --enable-gdm-xsession \
-            --with-pam-mod-dir=/lib/security &amp;&amp;
-make</userinput></screen>
+mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr               \
+      --sysconfdir=/etc           \
+      --localstatedir=/var        \
+      -Dplymouth=disabled         \
+      -Dgdm-xsession=true         \
+      -Dpam-mod-dir=/lib/security \
+      -Dsystemd-journal=false     \
+      -Dsystemdsystemunitdir=/tmp \
+      -Dsystemduserunitdir=/tmp   .. &amp;&amp;
+ninja</userinput></screen>
+
+<screen revision="systemd"><userinput>
+mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr               \
+      --sysconfdir=/etc           \
+      --localstatedir=/var        \
+      -Dplymouth=disabled         \
+      -Dgdm-xsession=true         \
+      -Dpam-mod-dir=/lib/security .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
@@ -162,8 +175,8 @@
     </para>
 
-<screen role="root" revision="sysv"><userinput>make install</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>make install &amp;&amp;
-install -v -m644 data/gdm.service /lib/systemd/system/gdm.service</userinput></screen>    
+<screen role="root" revision="sysv"><userinput>ninja install &amp;&amp;
+rm -rv /tmp/*.{service,target.d}</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>ninja install</userinput></screen>
 
   </sect2>
@@ -172,9 +185,6 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-initial-vt=7</option>: Use this switch
+    <para>
+      <option>-Dinitial-vt=7</option>: Use this switch
       to make <application>GDM</application> start on VT7
       instead of the first free VT.
@@ -182,10 +192,10 @@
 
     <para>
-      <parameter>--without-plymouth</parameter>: GDM now explicitly requires 
+      <parameter>-Dplymouth=disabled</parameter>: GDM now explicitly requires 
       plymouth to be installed. Use this switch to disable this dependency.
     </para>
 
     <para>
-      <option>--with-default-pam-config=lfs</option>: Use this
+      <option>-Ddefault-pam-config=lfs</option>: Use this
       switch if you did not create the
       <filename>/etc/lfs-release</filename> file or distribution
@@ -195,5 +205,5 @@
 
     <para>
-      <parameter>--enable-gdm-xsession</parameter>: This enables the
+      <parameter>-Dgdm-xsession=true</parameter>: This enables the
       installation of the <application>GDM</application> Xsession file.
     </para>
Index: gnome/platform/gnome-bluetooth.xml
===================================================================
--- gnome/platform/gnome-bluetooth.xml	(revision c8635a005666789f9ff9414bc8f450b84ab3c422)
+++ gnome/platform/gnome-bluetooth.xml	(revision c339779ba62e1a4ca67361c19af26aeaa2448344)
@@ -9,8 +9,8 @@
   <!ENTITY gnome-bluetooth-download-ftp
            "&gnome-download-ftp;/gnome-bluetooth/&gnome-minor-34;/gnome-bluetooth-&gnome-bluetooth-version;.tar.xz">
-  <!ENTITY gnome-bluetooth-md5sum        "09b6bab7ceaafb35da766a5476fbc466">
+  <!ENTITY gnome-bluetooth-md5sum        "c82f7df6a411c897d4d59337d5d9a789">
   <!ENTITY gnome-bluetooth-size          "348 KB">
   <!ENTITY gnome-bluetooth-buildsize     "17 MB">
-  <!ENTITY gnome-bluetooth-time          "less than 0.1 SBU (Using parallelism=4)">
+  <!ENTITY gnome-bluetooth-time          "0.2 SBU (Using parallelism=4)">
 ]>
 
Index: gnome/platform/gnome-control-center.xml
===================================================================
--- gnome/platform/gnome-control-center.xml	(revision c8635a005666789f9ff9414bc8f450b84ab3c422)
+++ gnome/platform/gnome-control-center.xml	(revision c339779ba62e1a4ca67361c19af26aeaa2448344)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-control-center-download-http
-           "&gnome-download-http;/gnome-control-center/&gnome-minor-36;/gnome-control-center-&gnome-control-center-version;.tar.xz">
+           "&gnome-download-http;/gnome-control-center/&gnome-minor-38;/gnome-control-center-&gnome-control-center-version;.tar.xz">
   <!ENTITY gnome-control-center-download-ftp
-           "&gnome-download-ftp;/gnome-control-center/&gnome-minor-36;/gnome-control-center-&gnome-control-center-version;.tar.xz">
-  <!ENTITY gnome-control-center-md5sum        "16c228d7de4e9d2d57550791fbca3390">
-  <!ENTITY gnome-control-center-size          "6.0 MB">
-  <!ENTITY gnome-control-center-buildsize     "169 MB (with tests)">
+           "&gnome-download-ftp;/gnome-control-center/&gnome-minor-38;/gnome-control-center-&gnome-control-center-version;.tar.xz">
+  <!ENTITY gnome-control-center-md5sum        "19ab78acfb6142974921bd8b5bf66937">
+  <!ENTITY gnome-control-center-size          "6.1 MB">
+  <!ENTITY gnome-control-center-buildsize     "182 MB (with tests)">
   <!ENTITY gnome-control-center-time          "0.5 SBU (Using parallelism=4; with tests)">
 ]>
@@ -98,5 +98,5 @@
       <xref linkend="gnome-bluetooth"/>,
       <xref linkend="ibus"/>, 
-      <xref linkend="libhandy"/>, and
+      <xref linkend="libhandy1"/>, and
       <xref linkend="ModemManager"/> and
       <xref linkend="libnma"/> (for the Network Panel)
Index: gnome/platform/gnome-session.xml
===================================================================
--- gnome/platform/gnome-session.xml	(revision c8635a005666789f9ff9414bc8f450b84ab3c422)
+++ gnome/platform/gnome-session.xml	(revision c339779ba62e1a4ca67361c19af26aeaa2448344)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-session-download-http
-           "&gnome-download-http;/gnome-session/&gnome-minor-36;/gnome-session-&gnome-session-version;.tar.xz">
+           "&gnome-download-http;/gnome-session/&gnome-minor-38;/gnome-session-&gnome-session-version;.tar.xz">
   <!ENTITY gnome-session-download-ftp
-           "&gnome-download-ftp;/gnome-session/&gnome-minor-36;/gnome-session-&gnome-session-version;.tar.xz">
-  <!ENTITY gnome-session-md5sum        "cd23e30c4991ca1f477020c67ea3a540">
-  <!ENTITY gnome-session-size          "468 KB">
-  <!ENTITY gnome-session-buildsize     "16 MB">
+           "&gnome-download-ftp;/gnome-session/&gnome-minor-38;/gnome-session-&gnome-session-version;.tar.xz">
+  <!ENTITY gnome-session-md5sum        "736024b46e2542b9b68adaa43f754f49">
+  <!ENTITY gnome-session-size          "472 KB">
+  <!ENTITY gnome-session-buildsize     "15 MB">
   <!ENTITY gnome-session-time          "0.1 SBU">
 ]>
@@ -104,5 +104,5 @@
 
     <para>
-      When running Gnome under <xref linkend="wayland"/>, environment settings
+      When running GNOME under <xref linkend="wayland"/>, environment settings
       are not imported for the user using the system profile. The Wayland
       developers are currently undecided on a standard method to provide system
@@ -114,4 +114,10 @@
 <screen><userinput>sed 's@/bin/sh@/bin/sh -l@' -i gnome-session/gnome-session.in</userinput></screen>
 
+    <para revision="sysv">
+      Adapt meson.build so that gnome-session can build without systemd:
+    </para>
+
+<screen revision="sysv"><userinput remap="pre">sed -i "/  systemd_dep/,+3d;/if enable_systemd/a \    systemd_userunitdir = '/tmp\'" meson.build</userinput></screen>
+
     <para>
       Install <application>GNOME Session</application> by
@@ -150,5 +156,5 @@
     </para>
 
-<screen role="root" revision="sysv"><userinput>rm -v /usr/lib/systemd/user/gnome-session*</userinput></screen>
+<screen role="root" revision="sysv"><userinput>rm -rv /tmp/{*.d,*.target,*.service}</userinput></screen>
 
   </sect2>
Index: gnome/platform/gnome-settings-daemon.xml
===================================================================
--- gnome/platform/gnome-settings-daemon.xml	(revision c8635a005666789f9ff9414bc8f450b84ab3c422)
+++ gnome/platform/gnome-settings-daemon.xml	(revision c339779ba62e1a4ca67361c19af26aeaa2448344)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-settings-daemon-download-http
-           "&gnome-download-http;/gnome-settings-daemon/&gnome-minor-36;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
+           "&gnome-download-http;/gnome-settings-daemon/&gnome-minor-38;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
   <!ENTITY gnome-settings-daemon-download-ftp
-           "&gnome-download-ftp;/gnome-settings-daemon/&gnome-minor-36;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
-  <!ENTITY gnome-settings-daemon-md5sum        "102dc488a6a726e4050cf5ab7e967e8d">
+           "&gnome-download-ftp;/gnome-settings-daemon/&gnome-minor-38;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
+  <!ENTITY gnome-settings-daemon-md5sum        "ac40a03be99379de432b822c0001904e">
   <!ENTITY gnome-settings-daemon-size          "1.4 MB">
-  <!ENTITY gnome-settings-daemon-buildsize     "70 MB">
+  <!ENTITY gnome-settings-daemon-buildsize     "46 MB">
   <!ENTITY gnome-settings-daemon-time          "1.1 SBU (Using parallelism=4)">
 ]>
@@ -136,5 +136,5 @@
 
     <para revision="sysv">
-      First fix libelogind detection for tests:
+      First, fix libelogind detection for tests:
     </para>
 
@@ -148,4 +148,10 @@
 <screen revision="sysv"><userinput>sed -i 's/(backlight->logind_proxy)/(0)/' \
     -i plugins/power/gsd-backlight.c</userinput></screen>
+
+    <para revision="systemd">
+      First, remove older versions of the systemd units:
+    </para>
+
+<screen revision="sysv" role="root"><userinput remap="pre">rm -v /usr/lib/systemd/user/gsd-*</userinput></screen>
 
     <para>
Index: gnome/platform/gnome-shell-extensions.xml
===================================================================
--- gnome/platform/gnome-shell-extensions.xml	(revision c8635a005666789f9ff9414bc8f450b84ab3c422)
+++ gnome/platform/gnome-shell-extensions.xml	(revision c339779ba62e1a4ca67361c19af26aeaa2448344)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-shell-extensions-download-http
-           "&gnome-download-http;/gnome-shell-extensions/&gnome-minor-36;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
+           "&gnome-download-http;/gnome-shell-extensions/&gnome-minor-38;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
   <!ENTITY gnome-shell-extensions-download-ftp
-           "&gnome-download-ftp;/gnome-shell-extensions/&gnome-minor-36;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
-  <!ENTITY gnome-shell-extensions-md5sum        "b7771b4851fc3f16dcada5e16ceb53ab">
-  <!ENTITY gnome-shell-extensions-size          "204 KB">
-  <!ENTITY gnome-shell-extensions-buildsize     "2.9 MB">
+           "&gnome-download-ftp;/gnome-shell-extensions/&gnome-minor-38;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
+  <!ENTITY gnome-shell-extensions-md5sum        "717e1b7f04cdb0bac27fd509c3128801">
+  <!ENTITY gnome-shell-extensions-size          "208 KB">
+  <!ENTITY gnome-shell-extensions-buildsize     "4.4 MB">
   <!ENTITY gnome-shell-extensions-time          "less than 0.1 SBU">
 ]>
@@ -78,5 +78,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="js68"/> and
       <xref linkend="libgtop"/>
     </para>
Index: gnome/platform/gnome-shell.xml
===================================================================
--- gnome/platform/gnome-shell.xml	(revision c8635a005666789f9ff9414bc8f450b84ab3c422)
+++ gnome/platform/gnome-shell.xml	(revision c339779ba62e1a4ca67361c19af26aeaa2448344)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-shell-download-http
-           "&gnome-download-http;/gnome-shell/&gnome-minor-36;/gnome-shell-&gnome-shell-version;.tar.xz">
+           "&gnome-download-http;/gnome-shell/&gnome-minor-38;/gnome-shell-&gnome-shell-version;.tar.xz">
   <!ENTITY gnome-shell-download-ftp
-           "&gnome-download-ftp;/gnome-shell/&gnome-minor-36;/gnome-shell-&gnome-shell-version;.tar.xz">
-  <!ENTITY gnome-shell-md5sum        "60103fd2370e7f1cc9e7ba8c7a711379">
+           "&gnome-download-ftp;/gnome-shell/&gnome-minor-38;/gnome-shell-&gnome-shell-version;.tar.xz">
+  <!ENTITY gnome-shell-md5sum        "a12f98e36f4cfc4b4f968c35edc6f778">
   <!ENTITY gnome-shell-size          "1.7 MB">
-  <!ENTITY gnome-shell-buildsize     "70 MB (including tests)">
+  <!ENTITY gnome-shell-buildsize     "72 MB (including tests)">
   <!ENTITY gnome-shell-time          "0.2 SBU (Using parallelism=4, with tests)">
 ]>
@@ -167,5 +167,5 @@
 
     <para>
-      <option>-Dextensions=false</option>: Do not build the
+      <option>-Dextensions=false</option>: This option disables building the 
       <command>gnome-extensions</command> CLI tool. Using this option removes
       the need for <xref linkend="asciidoc"/>.
Index: gnome/platform/gnome-user-docs.xml
===================================================================
--- gnome/platform/gnome-user-docs.xml	(revision c8635a005666789f9ff9414bc8f450b84ab3c422)
+++ gnome/platform/gnome-user-docs.xml	(revision c339779ba62e1a4ca67361c19af26aeaa2448344)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-user-docs-download-http
-           "&gnome-download-http;/gnome-user-docs/&gnome-minor-36;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
+           "&gnome-download-http;/gnome-user-docs/&gnome-minor-38;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
   <!ENTITY gnome-user-docs-download-ftp
-           "&gnome-download-ftp;/gnome-user-docs/&gnome-minor-36;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
-  <!ENTITY gnome-user-docs-md5sum        "92cdb382830cadcb4958d920c6ec46ad">
-  <!ENTITY gnome-user-docs-size          "10 MB">
-  <!ENTITY gnome-user-docs-buildsize     "215 MB">
+           "&gnome-download-ftp;/gnome-user-docs/&gnome-minor-38;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
+  <!ENTITY gnome-user-docs-md5sum        "c2550b6d51c81480486f881727eb25dc">
+  <!ENTITY gnome-user-docs-size          "11 MB">
+  <!ENTITY gnome-user-docs-buildsize     "216 MB">
   <!ENTITY gnome-user-docs-time          "0.6 SBU (using parallelism=4)">
 ]>
Index: gnome/platform/mutter.xml
===================================================================
--- gnome/platform/mutter.xml	(revision c8635a005666789f9ff9414bc8f450b84ab3c422)
+++ gnome/platform/mutter.xml	(revision c339779ba62e1a4ca67361c19af26aeaa2448344)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-minor-36;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-minor-36;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-md5sum        "c841bbcc1a73ce632371172ee04730ae">
-  <!ENTITY mutter-size          "2.6 MB">
-  <!ENTITY mutter-buildsize     "248 MB">
-  <!ENTITY mutter-time          "1.0 SBU (Using parallelism=4)">
+  <!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        "df053c03ed2264e7b6dfd453ed5103ea">
+  <!ENTITY mutter-size          "2.5 MB">
+  <!ENTITY mutter-buildsize     "139 MB">
+  <!ENTITY mutter-time          "1.3 SBU (Using parallelism=4)">
 ]>
 
@@ -72,6 +72,5 @@
       </listitem>
     </itemizedlist>
-
-    <!--
+    
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -79,9 +78,8 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/mutter-&mutter-version;-mesa_20_fixes-1.patch"/>
+          <ulink url="&patch-root;/mutter-&mutter-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
-    -->
 
     <bridgehead renderas="sect3">Mutter Dependencies</bridgehead>
@@ -140,11 +138,9 @@
     <title>Installation of Mutter</title>
 
-    <!-- Not needed anymore with 3.36.1
-    <para>
-      First, apply a patch to Mutter to fix building with mesa-20.x and later:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../mutter-&mutter-version;-mesa_20_fixes-1.patch</userinput></screen>
-    -->
+    <para>
+      First, fix a problem with the build system and bugs with wayland sessions:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../mutter-&mutter-version;-upstream_fixes-1.patch</userinput></screen>
 
     <para>
@@ -156,5 +152,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr -Dprofiler=false .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -188,8 +184,8 @@
         </seg>
         <seg>
-          libmutter-6.so
+          libmutter-7.so
         </seg>
         <seg>
-          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-6
+          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-7
         </seg>
       </seglistitem>
@@ -215,5 +211,5 @@
 
       <varlistentry id="libmutter">
-        <term><filename class="libraryfile">libmutter-6.so</filename></term>
+        <term><filename class="libraryfile">libmutter-7.so</filename></term>
         <listitem>
           <para>
@@ -221,5 +217,5 @@
           </para>
           <indexterm zone="mutter libmutter">
-            <primary sortas="c-libmutter">libmutter-6.so</primary>
+            <primary sortas="c-libmutter">libmutter-7.so</primary>
           </indexterm>
         </listitem>
Index: gnome/platform/yelp.xml
===================================================================
--- gnome/platform/yelp.xml	(revision c8635a005666789f9ff9414bc8f450b84ab3c422)
+++ gnome/platform/yelp.xml	(revision c339779ba62e1a4ca67361c19af26aeaa2448344)
@@ -5,7 +5,7 @@
   %general-entities;
 
-  <!ENTITY yelp-download-http "&gnome-download-http;/yelp/&gnome-minor-36;/yelp-&yelp-version;.tar.xz">
-  <!ENTITY yelp-download-ftp  "&gnome-download-ftp;/yelp/&gnome-minor-36;/yelp-&yelp-version;.tar.xz">
-  <!ENTITY yelp-md5sum        "32f879293f79b4042edc46aa13d82c71">
+  <!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        "e1bf7d21dd2b27f7b40b15e25fdf7a89">
   <!ENTITY yelp-size          "1.5 MB">
   <!ENTITY yelp-buildsize     "22 MB">
